summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2015-07-19 16:08:51 +0200
committerSimon Rettberg2015-07-19 16:08:51 +0200
commit60a7b5ae9113b4883a26804418ad1d1cb07cd750 (patch)
tree525e204f3520f19e7d94ebf1b83584b10d3ee15a
parent[client] Updated comments in ImageUploadPage (diff)
downloadtutor-module-60a7b5ae9113b4883a26804418ad1d1cb07cd750.tar.gz
tutor-module-60a7b5ae9113b4883a26804418ad1d1cb07cd750.tar.xz
tutor-module-60a7b5ae9113b4883a26804418ad1d1cb07cd750.zip
[client] *Listener -> *Adapter (where applicable)
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java13
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java12
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java8
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java9
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java7
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java8
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java39
7 files changed, 20 insertions, 76 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java
index 6c2202a0..efb41b0c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java
@@ -1,8 +1,8 @@
package org.openslx.dozmod.gui.control;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.PaintEvent;
import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.graphics.Color;
@@ -52,16 +52,7 @@ public class BlockProgressBar extends Canvas {
}
});
- this.addMouseListener(new MouseListener() {
-
- @Override
- public void mouseUp(MouseEvent e) {
- }
-
- @Override
- public void mouseDown(MouseEvent e) {
- }
-
+ this.addMouseListener(new MouseAdapter() {
@Override
public void mouseDoubleClick(MouseEvent e) {
me.toggleMode();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java
index c4ad4dd5..02f9a181 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/PersonLabel.java
@@ -1,8 +1,8 @@
package org.openslx.dozmod.gui.control;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.openslx.bwlp.thrift.iface.UserInfo;
@@ -25,21 +25,13 @@ public class PersonLabel {
public PersonLabel(Composite parent, int style) {
label = new Label(parent, style);
label.setForeground(Gui.display.getSystemColor(SWT.COLOR_LINK_FOREGROUND));
- label.addMouseListener(new MouseListener() {
+ label.addMouseListener(new MouseAdapter() {
@Override
public void mouseUp(MouseEvent e) {
if (user != null && callback != null && e.button == 1 && label.getBounds().contains(e.x, e.y)) {
callback.clicked(user);
}
}
-
- @Override
- public void mouseDown(MouseEvent e) {
- }
-
- @Override
- public void mouseDoubleClick(MouseEvent e) {
- }
});
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 22f3297c..377db377 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -4,8 +4,8 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Shell;
import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
import org.openslx.bwlp.thrift.iface.OperatingSystem;
@@ -35,15 +35,11 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
super(parent);
// Close button closes window
- btnClose.addSelectionListener(new SelectionListener() {
+ btnClose.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
getShell().dispose();
}
-
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
});
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index bbed4109..341748f8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Shell;
@@ -160,8 +160,7 @@ public class LoginWindow extends LoginWindowLayout {
// add a key listener to the password field to trigger login
// when the user presses the ENTER key.
- passwordText.addKeyListener(new KeyListener() {
-
+ passwordText.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
@@ -169,10 +168,6 @@ public class LoginWindow extends LoginWindowLayout {
doLogin();
}
}
-
- @Override
- public void keyPressed(KeyEvent e) {
- }
});
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index 5d9d4367..ee6db9b1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -3,8 +3,8 @@ package org.openslx.dozmod.gui.wizard.page;
import java.util.List;
import org.apache.log4j.Logger;
+import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Composite;
import org.openslx.bwlp.thrift.iface.UserInfo;
import org.openslx.dozmod.gui.helper.TableHelper;
@@ -33,14 +33,11 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
permissionTableViewer.setInput(userList);
permissionTableViewer.refresh();
- addUser.addSelectionListener(new SelectionListener() {
+ addUser.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
LOGGER.debug("addUser");
}
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
});
}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 02bbb2a4..dc234568 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -3,8 +3,8 @@ package org.openslx.dozmod.gui.wizard.page;
import java.util.List;
import org.apache.log4j.Logger;
+import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Composite;
@@ -65,11 +65,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
}
});
- descriptionText.addKeyListener(new KeyListener() {
- @Override
- public void keyPressed(KeyEvent e) {
- }
-
+ descriptionText.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
reactToUserInput();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index 1ccc187c..70e5a98d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -6,12 +6,12 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;
import org.openslx.dozmod.Config;
@@ -51,11 +51,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
public void createControl(Composite parent) {
super.createControl(parent);
imageNameTextField.setEnabled(!editExistingImage);
- imageNameTextField.addKeyListener(new KeyListener() {
- @Override
- public void keyPressed(KeyEvent e) {
- }
-
+ imageNameTextField.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
if (!imageNameTextField.getText().isEmpty()) {
@@ -68,54 +64,35 @@ public class ImageUploadPage extends ImageUploadPageLayout {
});
// Browse for *.vmx
- imageFileBrowseButton.addSelectionListener(new SelectionListener() {
+ imageFileBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
browseForVm();
}
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
});
- imageFileTextField.addMouseListener(new MouseListener() {
+ imageFileTextField.addMouseListener(new MouseAdapter() {
@Override
public void mouseUp(MouseEvent e) {
if (e.button == 1 && imageFileTextField.getClientArea().contains(e.x, e.y))
browseForVm();
}
- @Override
- public void mouseDown(MouseEvent e) {
- }
- @Override
- public void mouseDoubleClick(MouseEvent e) {
- }
});
// Start upload
- startUploadButton.addSelectionListener(new SelectionListener() {
-
+ startUploadButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
createAndUploadImage();
}
-
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
});
startUploadButton.setEnabled(false);
// Cancel upload
- cancelUpload.addSelectionListener(new SelectionListener() {
-
+ cancelUpload.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
cancelUpload();
}
-
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
});
cancelUpload.setVisible(false);
blockProgressBar.setVisible(false);