aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeanderson Candido2014-04-26 17:39:21 (EDT)
committerLars Vogel2014-04-27 15:42:30 (EDT)
commit1cc4022ce3bdef3bde83b76e725cd51b04f07d2c (patch)
tree167d33e63a4a1cb2fc77e8ff7186ae7195f81d0f
parent68348316f6ebc4bdcdf278126490d7348d049e3d (diff)
downloadeclipse.platform.ui-1cc4022ce3bdef3bde83b76e725cd51b04f07d2c.zip
eclipse.platform.ui-1cc4022ce3bdef3bde83b76e725cd51b04f07d2c.tar.gz
eclipse.platform.ui-1cc4022ce3bdef3bde83b76e725cd51b04f07d2c.tar.bz2
430873 - Cleanup JFace code in preparation for GSocrefs/changes/18/25618/2
Added @Override tag and removed non-javadoc comments. Change-Id: I8d343f18593c089c082093535a80a0f93133bb37 Signed-off-by: Jeanderson Candido <jeandersonbc@gmail.com>
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/AbstractFieldAssistWindow.java4
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistTests.java4
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistWindow.java10
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ControlDecorationTests.java6
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/FieldAssistAPITests.java7
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistTests.java4
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistWindow.java11
7 files changed, 14 insertions, 32 deletions
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/AbstractFieldAssistWindow.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/AbstractFieldAssistWindow.java
index 398c0d6..1610f73 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/AbstractFieldAssistWindow.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/AbstractFieldAssistWindow.java
@@ -46,6 +46,7 @@ public abstract class AbstractFieldAssistWindow extends Window {
return getShell().getDisplay();
}
+ @Override
protected Control createContents(Composite parent) {
Composite content = (Composite) super.createContents(parent);
content.setLayout(new FillLayout());
@@ -67,7 +68,8 @@ public abstract class AbstractFieldAssistWindow extends Window {
protected void createExtraControls(Composite parent) {
// default is to do nothing
}
-
+
+ @Override
protected Layout getLayout() {
return new FillLayout();
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistTests.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistTests.java
index 5eb4659..3f28755 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistTests.java
@@ -17,9 +17,7 @@ package org.eclipse.jface.tests.fieldassist;
*/
public class ComboFieldAssistTests extends FieldAssistTestCase {
- /* (non-Javadoc)
- * @see org.eclipse.jface.tests.fieldassist.AbstractFieldAssistTestCase#createFieldAssistWindow()
- */
+ @Override
protected AbstractFieldAssistWindow createFieldAssistWindow() {
return new ComboFieldAssistWindow();
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistWindow.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistWindow.java
index 0ad6616..33523e0 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistWindow.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ComboFieldAssistWindow.java
@@ -19,17 +19,13 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
public class ComboFieldAssistWindow extends AbstractFieldAssistWindow {
-
+
+ @Override
protected IControlContentAdapter getControlContentAdapter() {
return new ComboContentAdapter();
}
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.jface.tests.fieldassist.AbstractFieldAssistWindow#
- * createFieldAssistControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected Control createFieldAssistControl(Composite parent) {
return new Combo(parent, SWT.DROP_DOWN);
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ControlDecorationTests.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ControlDecorationTests.java
index da101aa..c364c1d 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ControlDecorationTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/ControlDecorationTests.java
@@ -89,10 +89,8 @@ public class ControlDecorationTests extends AbstractFieldAssistTestCase {
decoration.showHoverText("Show me");
assertOneShellUp();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.tests.fieldassist.AbstractFieldAssistTestCase#createFieldAssistWindow()
- */
+
+ @Override
protected AbstractFieldAssistWindow createFieldAssistWindow() {
return new TextFieldAssistWindow() {
protected void createExtraControls(Composite parent) {
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/FieldAssistAPITests.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/FieldAssistAPITests.java
index 59d1867..da5b3f7 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/FieldAssistAPITests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/FieldAssistAPITests.java
@@ -46,12 +46,9 @@ public class FieldAssistAPITests extends AbstractFieldAssistTestCase {
// expected
}
-
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.tests.fieldassist.AbstractFieldAssistTestCase#createFieldAssistWindow()
- */
+
+ @Override
protected AbstractFieldAssistWindow createFieldAssistWindow() {
return new TextFieldAssistWindow();
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistTests.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistTests.java
index 9a31e59..db3409c 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistTests.java
@@ -17,9 +17,7 @@ package org.eclipse.jface.tests.fieldassist;
*/
public class TextFieldAssistTests extends FieldAssistTestCase {
- /* (non-Javadoc)
- * @see org.eclipse.jface.tests.fieldassist.AbstractFieldAssistTestCase#createFieldAssistWindow()
- */
+ @Override
protected AbstractFieldAssistWindow createFieldAssistWindow() {
return new TextFieldAssistWindow();
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistWindow.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistWindow.java
index 6a27dc1..d5c4386 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistWindow.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/fieldassist/TextFieldAssistWindow.java
@@ -20,19 +20,12 @@ import org.eclipse.swt.widgets.Text;
public class TextFieldAssistWindow extends AbstractFieldAssistWindow {
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.jface.tests.fieldassist.AbstractFieldAssistWindow#
- * createFieldAssistControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected Control createFieldAssistControl(Composite parent) {
return new Text(parent, SWT.SINGLE);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.tests.fieldassist.AbstractFieldAssistWindow#getControlContentAdapter()
- */
+ @Override
protected IControlContentAdapter getControlContentAdapter() {
return new TextContentAdapter();
}