Skip to content
Snippets Groups Projects
Commit 0175ead6 authored by helene ortiz's avatar helene ortiz
Browse files

Remove unused methods and one class (SWTLoginSplashDialog).

parent bbaaba27
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ChangeLog
+ 1
− 1
View file @ 0175ead6
......@@ -5,7 +5,7 @@
* Fix bug: variableNames collection in ForLoopCommandBox was not correctly updated when user changes a variable name in a for loop line.
* Fix bug: when switching from box view to text view with a non-empty launch pad, confirmation message was displayed for current client but also for main one.
* Remote access granted for staff users.
* Remove unused methods.
* Remove unused methods and one class (SWTLoginSplashDialog).
4.0.32 19/06/2020
......
src/main/java/fr/ill/ics/client/view/MainWindowPeer.java
+ 0
− 2
View file @ 0175ead6
......@@ -35,7 +35,6 @@ import fr.ill.ics.client.view.error.ServerErrorConsole;
import fr.ill.ics.client.view.error.SimulationResultsWindow;
import fr.ill.ics.client.view.log.LogWindow;
import fr.ill.ics.client.view.logger.LoggerWindow;
import fr.ill.ics.client.view.login.LoginSplashDialog;
import fr.ill.ics.client.view.menu.MenuBuilder;
import fr.ill.ics.client.view.pluginpeer.selection.SelectionPluginPeer;
import fr.ill.ics.client.view.startup.StartupSplashDialog;
......@@ -348,7 +347,6 @@ public abstract class MainWindowPeer {
public abstract void display(SelectionPlugin selectionPlugin);
public abstract PContainer getPluginAreaContainer();
public abstract StartupSplashDialog getStartupSplashDialog(Startup startup, ServerConnection login);
public abstract LoginSplashDialog getLoginSplashDialog(Startup startup);
public abstract void setCursorToWait();
public abstract void setCursorToDefault();
public abstract void addRunnable(Runnable runnable, int milli);
......
src/main/java/fr/ill/ics/client/view/login/swt/SWTLoginSplashDialog.java deleted 100644 → 0
+ 0
− 202
View file @ bbaaba27
/*
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
package fr.ill.ics.client.view.login.swt;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.PaintEvent;
import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import fr.ill.ics.client.control.startup.Startup;
import fr.ill.ics.client.view.factory.ImageFactory;
import fr.ill.ics.client.view.factory.swt.SWTColorFactory;
import fr.ill.ics.client.view.factory.swt.SWTFontFactory;
import fr.ill.ics.client.view.factory.swt.SWTImageFactory;
import fr.ill.ics.client.view.factory.swt.SWTWidgetFactory;
import fr.ill.ics.client.view.login.LoginSplashDialog;
import fr.ill.ics.client.view.startup.swt.SWTStartupKeyListener;
import fr.ill.ics.client.view.util.component.swt.TransparentImageShell;
import fr.ill.ics.util.ConfigManager;
/**
*
* @author ortizh
*
*/
public class SWTLoginSplashDialog extends LoginSplashDialog {
private final static int TEXT_LEFT = 40;
private final static int TEXT_RIGHT = -140;
private Text userText;
private Text passwordText;
private Shell splash;
private Display display;
private Image splashImage;
private Canvas imageCanvas;
public SWTLoginSplashDialog(Startup startup, Display display) {
super(startup);
this.display = display;
splash = SWTWidgetFactory.getInstance().createShell(display, SWT.SYSTEM_MODAL| SWT.NO_TRIM);
splash.setImage(SWTImageFactory.getImage(ImageFactory.NOMAD_ICON_BIG));
splash.setLayout(new FormLayout());
// Add background image
splashImage = SWTImageFactory.getImage(ImageFactory.NOMAD_ICON_EMPTY);
imageCanvas = SWTWidgetFactory.getInstance().createCanvas(splash, SWT.NO_BACKGROUND, false);
imageCanvas.addPaintListener(new PaintListener() {
public void paintControl(PaintEvent event) {
event.gc.drawImage(splashImage, 0, 0);
event.gc.setForeground(SWTColorFactory.getBackgroundColor());
event.gc.setFont(SWTFontFactory.getStandardItalicFont(11));
event.gc.drawText(ConfigManager.getInstance().getString("remoteClientMustLoginMessage"), 100, 50, SWT.DRAW_TRANSPARENT);
}
});
initTextWidgets();
initLabelsWidgets();
FormData formData = new FormData();
formData.top = new FormAttachment(0, 0);
formData.left = new FormAttachment(0, 0);
formData.width = splashImage.getBounds().width;
formData.height = splashImage.getBounds().height;
imageCanvas.setLayoutData(formData);
imageCanvas.setLayout(new FormLayout());
// Add a listener to detect ESC
SWTStartupKeyListener escapeKeyListener = new SWTStartupKeyListener(this);
splash.addKeyListener(escapeKeyListener);
imageCanvas.addKeyListener(escapeKeyListener);
// Make background image transparent
new TransparentImageShell(splash, splashImage);
splash.setSize(splashImage.getBounds().width, splashImage.getBounds().height);
splash.setText(ConfigManager.getInstance().getString("nomadMainWindowTitle"));
splash.pack(); // Pack before open to reduce flash
userText.addKeyListener(escapeKeyListener);
passwordText.addKeyListener(escapeKeyListener);
userText.setFocus();
}
public void run() {
splash.open();
while (!loginOk) {
if (!display.readAndDispatch()) {
display.sleep();
}
}
dispose();
}
/**
* Creates Text widgets to enter login and password. Text widgets are hidden and will be
* shown once the server is ready.
*/
private void initTextWidgets() {
GC gc = new GC(splashImage);
gc.setForeground(SWTColorFactory.getBackgroundColor());
gc.setFont(SWTFontFactory.getLoginFont());
// Login text
userText = SWTWidgetFactory.getInstance().createText(imageCanvas, "", 30, SWT.NONE);
FormData formData = new FormData();
formData.left = new FormAttachment(TEXT_LEFT, 0);
formData.top = new FormAttachment(35, 0);
formData.right = new FormAttachment(100, TEXT_RIGHT);
userText.setLayoutData(formData);
// Password text
passwordText = SWTWidgetFactory.getInstance().createText(imageCanvas, "", 30, SWT.PASSWORD);
formData = new FormData();
formData.left = new FormAttachment(TEXT_LEFT, 0);
formData.top = new FormAttachment(45, 0);
formData.right = new FormAttachment(100, TEXT_RIGHT);
passwordText.setLayoutData(formData);
// Set the tab order so that tab on the password field goes to the user field
Control[] tabList = new Control[3];
tabList[0] = userText;
tabList[1] = passwordText;
tabList[2] = userText;
imageCanvas.setTabList(tabList);
gc.dispose();
imageCanvas.redraw();
}
/**
* Draws login and password labels.
*/
private void initLabelsWidgets() {
GC gc = new GC(splashImage);
gc.setForeground(SWTColorFactory.getBackgroundColor());
gc.setFont(SWTFontFactory.getLoginFont());
// Login label
gc.drawText(ConfigManager.getInstance().getString("loginLabel"), 158, 110, SWT.DRAW_TRANSPARENT);
// Password label
gc.drawText(ConfigManager.getInstance().getString("passwordLabel"), 130, 138, SWT.DRAW_TRANSPARENT);
gc.dispose();
imageCanvas.redraw();
}
protected void dispose() {
splash.close();
splashImage.dispose();
}
@Override
protected String getUser() {
return userText.getText();
}
@Override
protected String getPassword() {
return passwordText.getText();
}
}
\ No newline at end of file
src/main/java/fr/ill/ics/client/view/swt/SWTMainWindowPeer.java
+ 0
− 7
View file @ 0175ead6
......@@ -56,9 +56,7 @@ import fr.ill.ics.client.view.factory.swt.SWTPWidgetFactory;
import fr.ill.ics.client.view.factory.swt.SWTWidgetFactory;
import fr.ill.ics.client.view.log.swt.SWTLogWindow;
import fr.ill.ics.client.view.logger.swt.SWTLoggerWindow;
import fr.ill.ics.client.view.login.LoginSplashDialog;
import fr.ill.ics.client.view.login.swt.SWTAuthenticationPeer;
import fr.ill.ics.client.view.login.swt.SWTLoginSplashDialog;
import fr.ill.ics.client.view.magnifier.Magnifier;
import fr.ill.ics.client.view.menu.swt.SWTMenuBuilder;
import fr.ill.ics.client.view.pluginpeer.selection.swt.SWTCommandsSelectionPluginPeer;
......@@ -396,11 +394,6 @@ public class SWTMainWindowPeer extends MainWindowPeer {
}
public LoginSplashDialog getLoginSplashDialog(Startup startup) {
return new SWTLoginSplashDialog(startup, display);
}
public void display(SelectionPlugin selectionPlugin) {
StackLayout stackLayout = (StackLayout)selectionPluginsParentComposite.getLayout();
stackLayout.topControl = ((SWTSelectionPluginPeer)(selectionPlugin.getSelectionPluginPeer())).getMainComposite();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment