aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeanderson Candido2014-03-24 12:18:28 (EDT)
committerLars Vogel2014-03-25 17:58:33 (EDT)
commitfb75e64d2e700c0d6e76b188c5c81746547dbec6 (patch)
tree3ffb42dda341f82bf0c035e55153c06ca93afe21
parent931f731ad02d4dbd13d39f288043001d04801459 (diff)
downloadeclipse.platform.ui-fb75e64d2e700c0d6e76b188c5c81746547dbec6.zip
eclipse.platform.ui-fb75e64d2e700c0d6e76b188c5c81746547dbec6.tar.gz
eclipse.platform.ui-fb75e64d2e700c0d6e76b188c5c81746547dbec6.tar.bz2
Bug 430873 - Cleanup JFace code in preparation for GSocrefs/changes/21/23821/4
Removed unnecessay comments from viewers (Non-javadoc). Keeping javadoc from overriden methods if additional/relevant information provided. Otherwise, (copy from super javadoc or meaningless comment e.g. "string representation" on toString()), the javadoc was removed. Removed some blank spaces. Change-Id: Id1faad3f1fda4074c603bd36639af41149699347 Signed-off-by: Jeanderson Candido <jeandersonbc@gmail.com>
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractComboBoxCellEditor.java5
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java34
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java73
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java40
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AcceptAllFilter.java12
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/BaseLabelProvider.java13
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java3
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java18
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTreeViewer.java21
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java12
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLabelProvider.java19
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java48
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java16
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java16
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java5
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecoratingLabelProvider.java37
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationContext.java11
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationOverlayIcon.java21
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.java5
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DialogCellEditor.java38
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java54
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java20
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java53
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledCellLabelProvider.java29
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java12
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java5
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableLayout.java6
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableTreeViewer.java114
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java5
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerRow.java57
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java6
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeColumnViewerLabelProvider.java32
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeNodeContentProvider.java32
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreePath.java10
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java91
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerRow.java101
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/Viewer.java20
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerCell.java10
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerDropAdapter.java46
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java25
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.java16
41 files changed, 75 insertions, 1116 deletions
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractComboBoxCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractComboBoxCellEditor.java
index 316fa9b..7440f26 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractComboBoxCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractComboBoxCellEditor.java
@@ -66,11 +66,6 @@ abstract class AbstractComboBoxCellEditor extends CellEditor {
AbstractComboBoxCellEditor() {
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#activate(org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent)
- */
@Override
public void activate(ColumnViewerEditorActivationEvent activationEvent) {
super.activate(activationEvent);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java
index fb98928..b7a633a 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java
@@ -209,10 +209,6 @@ public abstract class AbstractListViewer extends StructuredViewer {
add(new Object[] { element });
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- * Since SWT.List doesn't use items we always return the List itself.
- */
@Override
protected Widget doFindInputItem(Object element) {
if (element != null && equals(element, getRoot())) {
@@ -221,10 +217,6 @@ public abstract class AbstractListViewer extends StructuredViewer {
return null;
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- * Since SWT.List doesn't use items we always return the List itself.
- */
@Override
protected Widget doFindItem(Object element) {
if (element != null) {
@@ -235,9 +227,6 @@ public abstract class AbstractListViewer extends StructuredViewer {
return null;
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
protected void doUpdateItem(Widget data, Object element, boolean fullMap) {
if (element != null) {
@@ -274,12 +263,6 @@ public abstract class AbstractListViewer extends StructuredViewer {
return super.getLabelProvider();
}
- /* (non-Javadoc)
- * Method declared on Viewer.
- */
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
protected List getSelectionFromWidget() {
int[] ixs = listGetSelectionIndices();
@@ -329,9 +312,6 @@ public abstract class AbstractListViewer extends StructuredViewer {
return min;
}
- /* (non-Javadoc)
- * Method declared on Viewer.
- */
@Override
protected void inputChanged(Object input, Object oldInput) {
listMap.clear();
@@ -349,9 +329,6 @@ public abstract class AbstractListViewer extends StructuredViewer {
listSetItems(labels);
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
protected void internalRefresh(Object element) {
Control list = getControl();
@@ -485,23 +462,12 @@ public abstract class AbstractListViewer extends StructuredViewer {
remove(new Object[] { element });
}
- /**
- * The list viewer implementation of this <code>Viewer</code> framework
- * method ensures that the given label provider is an instance of
- * <code>ILabelProvider</code>.
- *
- * <b>The optional interfaces {@link IColorProvider} and
- * {@link IFontProvider} have no effect for this type of viewer</b>
- */
@Override
public void setLabelProvider(IBaseLabelProvider labelProvider) {
Assert.isTrue(labelProvider instanceof ILabelProvider);
super.setLabelProvider(labelProvider);
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
protected void setSelectionToWidget(List in, boolean reveal) {
if (in == null || in.size() == 0) { // clear selection
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java
index e9e06cf..219774f 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java
@@ -19,6 +19,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.widgets.Control;
@@ -27,8 +28,6 @@ import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;
-import org.eclipse.core.runtime.Assert;
-
/**
* This is a widget independent class implementors of
* {@link org.eclipse.swt.widgets.Table} like widgets can use to provide a
@@ -61,11 +60,7 @@ public abstract class AbstractTableViewer extends ColumnViewer {
*/
private void addTableListener() {
getControl().addListener(SWT.SetData, new Listener() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
+
@Override
public void handleEvent(Event event) {
Item item = (Item) event.item;
@@ -319,11 +314,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
add(new Object[] { element });
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#doFindInputItem(java.lang.Object)
- */
@Override
protected Widget doFindInputItem(Object element) {
if (equals(element, getRoot())) {
@@ -332,11 +322,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#doFindItem(java.lang.Object)
- */
@Override
protected Widget doFindItem(Object element) {
@@ -352,12 +337,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget,
- * java.lang.Object, boolean)
- */
@Override
protected void doUpdateItem(Widget widget, Object element, boolean fullMap) {
boolean oldBusy = isBusy();
@@ -423,11 +402,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ColumnViewer#getColumnViewerOwner(int)
- */
@Override
protected Widget getColumnViewerOwner(int columnIndex) {
int columnCount = doGetColumnCount();
@@ -480,11 +454,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
return super.getLabelProvider();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget()
- */
@Override
protected List getSelectionFromWidget() {
if (virtualManager != null) {
@@ -588,12 +557,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
return min;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object,
- * java.lang.Object)
- */
@Override
protected void inputChanged(Object input, Object oldInput) {
getControl().setRedraw(false);
@@ -639,22 +602,11 @@ public abstract class AbstractTableViewer extends ColumnViewer {
createItem(element, position);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object)
- */
@Override
protected void internalRefresh(Object element) {
internalRefresh(element, true);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object,
- * boolean)
- */
@Override
protected void internalRefresh(Object element, boolean updateLabels) {
applyEditorValue();
@@ -871,11 +823,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
remove(new Object[] { element });
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#reveal(java.lang.Object)
- */
@Override
public void reveal(Object element) {
Assert.isNotNull(element);
@@ -885,12 +832,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List,
- * boolean)
- */
@Override
protected void setSelectionToWidget(List list, boolean reveal) {
if (list == null) {
@@ -1094,11 +1035,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
doClear(index);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#getRawChildren(java.lang.Object)
- */
@Override
protected Object[] getRawChildren(Object parent) {
@@ -1108,11 +1044,6 @@ public abstract class AbstractTableViewer extends ColumnViewer {
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#assertContentProviderType(org.eclipse.jface.viewers.IContentProvider)
- */
@Override
protected void assertContentProviderType(IContentProvider provider) {
Assert.isTrue(provider instanceof IStructuredContentProvider
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java
index 855c6bc..4f75059 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java
@@ -612,11 +612,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return comparator.compare(this, e1, e2);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#getSortedChildren(java.lang.Object)
- */
@Override
protected Object[] getSortedChildren(Object parentElementOrTreePath) {
Object[] result = getFilteredChildren(parentElementOrTreePath);
@@ -706,11 +701,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
protected abstract void addTreeListener(Control control,
TreeListener listener);
- /*
- * (non-Javadoc)
- *
- * @see StructuredViewer#associate(Object, Item)
- */
@Override
protected void associate(Object element, Item item) {
Object data = item.getData();
@@ -885,7 +875,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
}
}
- /* (non-Javadoc) Method declared on StructuredViewer. */
@Override
protected Widget doFindInputItem(Object element) {
// compare with root
@@ -900,7 +889,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return null;
}
- /* (non-Javadoc) Method declared on StructuredViewer. */
@Override
protected Widget doFindItem(Object element) {
// compare with root
@@ -1017,7 +1005,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
- /* (non-Javadoc) Method declared on StructuredViewer. */
@Override
protected void doUpdateItem(Widget widget, Object element, boolean fullMap) {
boolean oldBusy = isBusy();
@@ -1343,7 +1330,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return null;
}
- /* (non-Javadoc) Method declared on StructuredViewer. */
@Override
protected Object[] getRawChildren(Object parentElementOrTreePath) {
boolean oldBusy = isBusy();
@@ -1440,11 +1426,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
*/
protected abstract Item[] getSelection(Control control);
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget()
- */
@Override
protected List getSelectionFromWidget() {
Widget[] items = getSelection(getControl());
@@ -1459,12 +1440,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return list;
}
- /*
- * Overridden in AbstractTreeViewer to fix bug 108102 (code copied from
- * StructuredViewer to avoid introducing new API) (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#handleDoubleSelect(org.eclipse.swt.events.SelectionEvent)
- */
@Override
protected void handleDoubleSelect(SelectionEvent event) {
// handle case where an earlier selection listener disposed the control.
@@ -1517,7 +1492,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
}
}
- /* (non-Javadoc) Method declared on Viewer. */
@Override
protected void hookControl(Control control) {
super.hookControl(control);
@@ -1534,10 +1508,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
});
}
- /*
- * (non-Javadoc) Method declared on StructuredViewer. Builds the initial
- * tree and handles the automatic expand feature.
- */
@Override
protected void inputChanged(Object input, Object oldInput) {
preservingSelection(new Runnable() {
@@ -1855,13 +1825,11 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return null;
}
- /* (non-Javadoc) Method declared on StructuredViewer. */
@Override
protected void internalRefresh(Object element) {
internalRefresh(element, true);
}
- /* (non-Javadoc) Method declared on StructuredViewer. */
@Override
protected void internalRefresh(Object element, boolean updateLabels) {
// If element is null, do a full refresh.
@@ -2197,7 +2165,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return isExpandable(elementOrTreePath);
}
- /* (non-Javadoc) Method declared on Viewer. */
@Override
protected void labelProviderChanged() {
// we have to walk the (visible) tree and update every item
@@ -2348,7 +2315,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return item;
}
- /* (non-Javadoc) Method declared on Viewer. */
@Override
public Item scrollDown(int x, int y) {
Item current = getItem(x, y);
@@ -2360,7 +2326,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
return null;
}
- /* (non-Javadoc) Method declared on Viewer. */
@Override
public Item scrollUp(int x, int y) {
Item current = getItem(x, y);
@@ -3109,11 +3074,6 @@ public abstract class AbstractTreeViewer extends ColumnViewer {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ColumnViewer#getColumnViewerOwner(int)
- */
@Override
protected Widget getColumnViewerOwner(int columnIndex) {
// Return null by default
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AcceptAllFilter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AcceptAllFilter.java
index 038e9f9..925f09c 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AcceptAllFilter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AcceptAllFilter.java
@@ -27,23 +27,17 @@ public final class AcceptAllFilter implements IFilter {
public static IFilter getInstance() {
return singleton;
}
-
+
/**
* The singleton instance
*/
private static IFilter singleton = new AcceptAllFilter();
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.deferred.IFilter#select(java.lang.Object)
- */
+
@Override
public boolean select(Object toTest) {
return true;
}
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
+
@Override
public boolean equals(Object other) {
return other == this || other instanceof AcceptAllFilter;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/BaseLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/BaseLabelProvider.java
index b987ec7..b933191 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/BaseLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/BaseLabelProvider.java
@@ -22,10 +22,7 @@ import org.eclipse.jface.util.SafeRunnable;
*
*/
public class BaseLabelProvider extends EventManager implements IBaseLabelProvider {
-
- /* (non-Javadoc)
- * Method declared on IBaseLabelProvider.
- */
+
@Override
public void addListener(ILabelProviderListener listener) {
addListenerObject(listener);
@@ -40,7 +37,7 @@ public class BaseLabelProvider extends EventManager implements IBaseLabelProvide
public void dispose() {
clearListeners();
}
-
+
/**
* The <code>BaseLabelProvider</code> implementation of this
* <code>IBaseLabelProvider</code> method returns <code>true</code>. Subclasses may
@@ -51,15 +48,11 @@ public class BaseLabelProvider extends EventManager implements IBaseLabelProvide
return true;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
@Override
public void removeListener(ILabelProviderListener listener) {
removeListenerObject(listener);
}
-
+
/**
* Fires a label provider changed event to all registered listeners Only
* listeners registered at the time this method is called are notified.
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java
index 355ef72..7cf3937 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxCellEditor.java
@@ -108,9 +108,6 @@ public class CheckboxCellEditor extends CellEditor {
return value ? Boolean.TRUE : Boolean.FALSE;
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
protected void doSetFocus() {
// Ignore
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java
index 38da116..c3af1ee 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTableViewer.java
@@ -143,9 +143,6 @@ public class CheckboxTableViewer extends TableViewer implements ICheckable {
super(table);
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public void addCheckStateListener(ICheckStateListener listener) {
checkStateListeners.add(listener);
@@ -220,9 +217,6 @@ public class CheckboxTableViewer extends TableViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public boolean getChecked(Object element) {
Widget widget = findItem(element);
@@ -299,9 +293,6 @@ public class CheckboxTableViewer extends TableViewer implements ICheckable {
return v.toArray();
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
public void handleSelect(SelectionEvent event) {
if (event.detail == SWT.CHECK) {
@@ -318,9 +309,6 @@ public class CheckboxTableViewer extends TableViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on Viewer.
- */
@Override
protected void preservingSelection(Runnable updateCode) {
if (!getPreserveSelection()) {
@@ -366,9 +354,6 @@ public class CheckboxTableViewer extends TableViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public void removeCheckStateListener(ICheckStateListener listener) {
checkStateListeners.remove(listener);
@@ -409,9 +394,6 @@ public class CheckboxTableViewer extends TableViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public boolean setChecked(Object element, boolean state) {
Assert.isNotNull(element);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTreeViewer.java
index e2fc5ff..23d09d1 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTreeViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CheckboxTreeViewer.java
@@ -93,9 +93,6 @@ public class CheckboxTreeViewer extends TreeViewer implements ICheckable {
super(tree);
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public void addCheckStateListener(ICheckStateListener listener) {
checkStateListeners.add(listener);
@@ -202,9 +199,6 @@ public class CheckboxTreeViewer extends TreeViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public boolean getChecked(Object element) {
Widget widget = findItem(element);
@@ -268,9 +262,6 @@ public class CheckboxTreeViewer extends TreeViewer implements ICheckable {
return result.toArray();
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
protected void handleDoubleSelect(SelectionEvent event) {
@@ -289,9 +280,6 @@ public class CheckboxTreeViewer extends TreeViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on StructuredViewer.
- */
@Override
protected void handleSelect(SelectionEvent event) {
@@ -396,9 +384,6 @@ public class CheckboxTreeViewer extends TreeViewer implements ICheckable {
}
}
- /* (non-Javadoc)
- * Method declared on Viewer.
- */
@Override
protected void preservingSelection(Runnable updateCode) {
if (!getPreserveSelection()) {
@@ -425,17 +410,11 @@ public class CheckboxTreeViewer extends TreeViewer implements ICheckable {
applyState(checkedNodes, grayedNodes, getControl());
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public void removeCheckStateListener(ICheckStateListener listener) {
checkStateListeners.remove(listener);
}
- /* (non-Javadoc)
- * Method declared on ICheckable.
- */
@Override
public boolean setChecked(Object element, boolean state) {
Assert.isNotNull(element);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java
index d7a5823..dbc3ac4 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java
@@ -184,9 +184,6 @@ public class ColorCellEditor extends DialogCellEditor {
return data;
}
- /* (non-Javadoc)
- * Method declared on DialogCellEditor.
- */
@Override
protected Control createContents(Composite cell) {
Color bg = cell.getBackground();
@@ -201,9 +198,6 @@ public class ColorCellEditor extends DialogCellEditor {
return composite;
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
public void dispose() {
if (image != null) {
@@ -213,9 +207,6 @@ public class ColorCellEditor extends DialogCellEditor {
super.dispose();
}
- /* (non-Javadoc)
- * Method declared on DialogCellEditor.
- */
@Override
protected Object openDialogBox(Control cellEditorWindow) {
ColorDialog dialog = new ColorDialog(cellEditorWindow.getShell());
@@ -227,9 +218,6 @@ public class ColorCellEditor extends DialogCellEditor {
return dialog.getRGB();
}
- /* (non-Javadoc)
- * Method declared on DialogCellEditor.
- */
@Override
protected void updateContents(Object value) {
RGB rgb = (RGB) value;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLabelProvider.java
index f0b85ba..f834aa8 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnLabelProvider.java
@@ -28,9 +28,6 @@ import org.eclipse.swt.graphics.Image;
public class ColumnLabelProvider extends CellLabelProvider implements
IFontProvider, IColorProvider, ILabelProvider {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.CellLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
- */
@Override
public void update(ViewerCell cell) {
Object element = cell.getElement();
@@ -43,42 +40,26 @@ public class ColumnLabelProvider extends CellLabelProvider implements
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
- */
@Override
public Font getFont(Object element) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
- */
@Override
public Color getBackground(Object element) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
@Override
public Color getForeground(Object element) {
return null;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
@Override
public Image getImage(Object element) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
@Override
public String getText(Object element) {
return element == null ? "" : element.toString();//$NON-NLS-1$
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java
index 161ff85..117650c 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewer.java
@@ -13,6 +13,11 @@
package org.eclipse.jface.viewers;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.internal.InternalPolicy;
+import org.eclipse.jface.util.Policy;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
@@ -22,13 +27,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Widget;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.internal.InternalPolicy;
-import org.eclipse.jface.util.Policy;
-
/**
* The ColumnViewer is the abstract superclass of viewers that have columns
* (e.g., AbstractTreeViewer and AbstractTableViewer). Concrete subclasses of
@@ -219,13 +217,6 @@ public abstract class ColumnViewer extends StructuredViewer {
if (getCellModifier() != null) {
viewer.setEditingSupport(new EditingSupport(this) {
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang
- * .Object)
- */
@Override
public boolean canEdit(Object element) {
Object[] properties = getColumnProperties();
@@ -238,13 +229,6 @@ public abstract class ColumnViewer extends StructuredViewer {
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.EditingSupport#getCellEditor(java
- * .lang.Object)
- */
@Override
public CellEditor getCellEditor(Object element) {
CellEditor[] editors = getCellEditors();
@@ -254,13 +238,6 @@ public abstract class ColumnViewer extends StructuredViewer {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.EditingSupport#getValue(java.lang
- * .Object)
- */
@Override
public Object getValue(Object element) {
Object[] properties = getColumnProperties();
@@ -273,13 +250,6 @@ public abstract class ColumnViewer extends StructuredViewer {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.EditingSupport#setValue(java.lang
- * .Object, java.lang.Object)
- */
@Override
public void setValue(Object element, Object value) {
Object[] properties = getColumnProperties();
@@ -341,11 +311,6 @@ public abstract class ColumnViewer extends StructuredViewer {
*/
protected abstract Item getItemAt(Point point);
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StructuredViewer#getItem(int, int)
- */
@Override
protected Item getItem(int x, int y) {
return getItemAt(getControl().toControl(x, y));
@@ -687,9 +652,6 @@ public abstract class ColumnViewer extends StructuredViewer {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ContentViewer#handleDispose(org.eclipse.swt.events.DisposeEvent)
- */
@Override
protected void handleDispose(DisposeEvent event) {
if (mouseListener != null && event.widget instanceof Control) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java
index e3f618e..00fa88d 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxCellEditor.java
@@ -129,9 +129,6 @@ public class ComboBoxCellEditor extends AbstractComboBoxCellEditor {
populateComboBoxItems();
}
- /*
- * (non-Javadoc) Method declared on CellEditor.
- */
@Override
protected Control createControl(Composite parent) {
@@ -192,9 +189,6 @@ public class ComboBoxCellEditor extends AbstractComboBoxCellEditor {
return new Integer(selection);
}
- /*
- * (non-Javadoc) Method declared on CellEditor.
- */
@Override
protected void doSetFocus() {
comboBox.setFocus();
@@ -284,11 +278,6 @@ public class ComboBoxCellEditor extends AbstractComboBoxCellEditor {
deactivate();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#focusLost()
- */
@Override
protected void focusLost() {
if (isActivated()) {
@@ -296,11 +285,6 @@ public class ComboBoxCellEditor extends AbstractComboBoxCellEditor {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#keyReleaseOccured(org.eclipse.swt.events.KeyEvent)
- */
@Override
protected void keyReleaseOccured(KeyEvent keyEvent) {
if (keyEvent.character == '\u001b') { // Escape character
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java
index 55397da..e5316b8 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ComboBoxViewerCellEditor.java
@@ -74,9 +74,6 @@ public class ComboBoxViewerCellEditor extends AbstractComboBoxCellEditor {
setValueValid(true);
}
- /*
- * (non-Javadoc) Method declared on CellEditor.
- */
@Override
protected Control createControl(Composite parent) {
@@ -142,9 +139,6 @@ public class ComboBoxViewerCellEditor extends AbstractComboBoxCellEditor {
return selectedValue;
}
- /*
- * (non-Javadoc) Method declared on CellEditor.
- */
@Override
protected void doSetFocus() {
viewer.getControl().setFocus();
@@ -264,11 +258,6 @@ public class ComboBoxViewerCellEditor extends AbstractComboBoxCellEditor {
deactivate();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#focusLost()
- */
@Override
protected void focusLost() {
if (isActivated()) {
@@ -276,11 +265,6 @@ public class ComboBoxViewerCellEditor extends AbstractComboBoxCellEditor {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#keyReleaseOccured(org.eclipse.swt.events.KeyEvent)
- */
@Override
protected void keyReleaseOccured(KeyEvent keyEvent) {
if (keyEvent.character == '\u001b') { // Escape character
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
index 15efc4a..99c9c25 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
@@ -406,11 +406,6 @@ import java.util.NoSuchElementException;
return elementCount;
}
- /**
- * Answers the string representation of this Hashtable.
- *
- * @return the string representation of this Hashtable
- */
@Override
public String toString() {
if (size() == 0) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecoratingLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecoratingLabelProvider.java
index c076a9a..d8ebb76 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecoratingLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecoratingLabelProvider.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.graphics.Image;
*/
public class DecoratingLabelProvider extends LabelProvider implements
ILabelProvider, IViewerLabelProvider, IColorProvider, IFontProvider, ITreePathLabelProvider {
-
+
private ILabelProvider provider;
private ILabelDecorator decorator;
@@ -211,11 +211,6 @@ public class DecoratingLabelProvider extends LabelProvider implements
}
}
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.viewers.IViewerLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel, java.lang.Object)
- */
@Override
public void updateLabel(ViewerLabel settings, Object element) {
@@ -254,7 +249,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
* @since 3.1
*/
protected void updateForDecorationReady(ViewerLabel settings, Object element) {
-
+
if(decorator instanceof IColorDecorator){
IColorDecorator colorDecorator = (IColorDecorator) decorator;
settings.setBackground(colorDecorator.decorateBackground(element));
@@ -264,12 +259,9 @@ public class DecoratingLabelProvider extends LabelProvider implements
if(decorator instanceof IFontDecorator) {
settings.setFont(((IFontDecorator) decorator).decorateFont(element));
}
-
+
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
- */
+
@Override
public Color getBackground(Object element) {
if(provider instanceof IColorProvider) {
@@ -277,10 +269,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
}
return null;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
- */
+
@Override
public Font getFont(Object element) {
if(provider instanceof IFontProvider) {
@@ -288,10 +277,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
}
return null;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
+
@Override
public Color getForeground(Object element) {
if(provider instanceof IColorProvider) {
@@ -311,7 +297,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
public IDecorationContext getDecorationContext() {
return decorationContext;
}
-
+
/**
* Set the decoration context that will be based to the decorator
* for this label provider if that decorator implements {@link LabelDecorator}.
@@ -324,9 +310,6 @@ public class DecoratingLabelProvider extends LabelProvider implements
this.decorationContext = decorationContext;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITreePathLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel, org.eclipse.jface.viewers.TreePath)
- */
@Override
public void updateLabel(ViewerLabel settings, TreePath elementPath) {
ILabelDecorator currentDecorator = getLabelDecorator();
@@ -361,7 +344,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
|| settings.getText().length() == 0) {
settings.setText(getText(element));
}
-
+
Image oldImage = settings.getImage();
if (decorationReady || oldImage == null) {
settings.setImage(getImage(element));
@@ -390,7 +373,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
Image image = labelDecorator.decorateImage(settings.getImage(), element, getDecorationContext());
if (image != null)
settings.setImage(image);
-
+
} else {
String text = decorator.decorateText(settings.getText(), element);
if (text != null && text.length() > 0)
@@ -408,7 +391,7 @@ public class DecoratingLabelProvider extends LabelProvider implements
if (foreground != null)
settings.setForeground(foreground);
}
-
+
if(decorator instanceof IFontDecorator) {
Font font = ((IFontDecorator) decorator).decorateFont(element);
if (font != null)
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationContext.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationContext.java
index 5df6c7a..a0fc947 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationContext.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationContext.java
@@ -22,13 +22,13 @@ import java.util.Map;
* @since 3.2
*/
public class DecorationContext implements IDecorationContext {
-
+
/**
* Constant that defines a default decoration context that has
* no context ids associated with it.
*/
public static final IDecorationContext DEFAULT_CONTEXT = new DecorationContext();
-
+
private Map properties = new HashMap();
/**
@@ -36,19 +36,12 @@ public class DecorationContext implements IDecorationContext {
*/
public DecorationContext() {
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IDecorationContext#getProperty(java.lang.String)
- */
@Override
public Object getProperty(String property) {
return properties.get(property);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IDecorationContext#getProperties()
- */
@Override
public String[] getProperties() {
return (String[]) properties.keySet().toArray(new String[properties.size()]);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationOverlayIcon.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationOverlayIcon.java
index c135325..408709d 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationOverlayIcon.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DecorationOverlayIcon.java
@@ -14,7 +14,9 @@ import java.util.Arrays;
import org.eclipse.jface.resource.CompositeImageDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
/**
* A <code>DecorationOverlayIcon</code> is an image descriptor that can be used
@@ -133,9 +135,6 @@ public class DecorationOverlayIcon extends CompositeImageDescriptor {
}
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object o) {
if (!(o instanceof DecorationOverlayIcon)) {
@@ -146,9 +145,6 @@ public class DecorationOverlayIcon extends CompositeImageDescriptor {
&& Arrays.equals(overlays, other.overlays);
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
int code = System.identityHashCode(base);
@@ -160,9 +156,6 @@ public class DecorationOverlayIcon extends CompositeImageDescriptor {
return code;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
- */
@Override
protected void drawCompositeImage(int width, int height) {
if (overlays.length > IDecoration.UNDERLAY) {
@@ -179,17 +172,11 @@ public class DecorationOverlayIcon extends CompositeImageDescriptor {
drawOverlays(overlays);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
- */
@Override
protected Point getSize() {
return size;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.resource.CompositeImageDescriptor#getTransparentPixel()
- */
+
@Override
protected int getTransparentPixel() {
return base.getImageData().transparentPixel;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.java
index c667a90..ac01221 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DelegatingStyledCellLabelProvider.java
@@ -99,11 +99,6 @@ public class DelegatingStyledCellLabelProvider extends StyledCellLabelProvider {
this.styledLabelProvider = labelProvider;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.StyledCellLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
- */
@Override
public void update(ViewerCell cell) {
Object element = cell.getElement();
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DialogCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DialogCellEditor.java
index 0fb3646..93155ac 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DialogCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/DialogCellEditor.java
@@ -202,9 +202,6 @@ public abstract class DialogCellEditor extends CellEditor {
return defaultLabel;
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
protected Control createControl(Composite parent) {
@@ -223,10 +220,8 @@ public abstract class DialogCellEditor extends CellEditor {
button.setFont(font);
button.addKeyListener(new KeyAdapter() {
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)
- */
- @Override
+
+ @Override
public void keyReleased(KeyEvent e) {
if (e.character == '\u001b') { // Escape
fireCancelEditor();
@@ -237,10 +232,8 @@ public abstract class DialogCellEditor extends CellEditor {
button.addFocusListener(getButtonFocusListener());
button.addSelectionListener(new SelectionAdapter() {
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- @Override
+
+ @Override
public void widgetSelected(SelectionEvent event) {
// Remove the button's focus listener since it's guaranteed
// to lose focus when the dialog opens
@@ -271,13 +264,6 @@ public abstract class DialogCellEditor extends CellEditor {
return editor;
}
- /* (non-Javadoc)
- *
- * Override in order to remove the button's focus listener if the celleditor
- * is deactivating.
- *
- * @see org.eclipse.jface.viewers.CellEditor#deactivate()
- */
@Override
public void deactivate() {
if (button != null && !button.isDisposed()) {
@@ -287,18 +273,11 @@ public abstract class DialogCellEditor extends CellEditor {
super.deactivate();
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
protected Object doGetValue() {
return value;
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- * The focus is set to the cell editor's button.
- */
@Override
protected void doSetFocus() {
button.setFocus();
@@ -315,17 +294,11 @@ public abstract class DialogCellEditor extends CellEditor {
if (buttonFocusListener == null) {
buttonFocusListener = new FocusListener() {
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
- */
@Override
public void focusGained(FocusEvent e) {
// Do nothing
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
- */
@Override
public void focusLost(FocusEvent e) {
DialogCellEditor.this.focusLost();
@@ -336,9 +309,6 @@ public abstract class DialogCellEditor extends CellEditor {
return buttonFocusListener;
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
protected void doSetValue(Object value) {
this.value = value;
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java
index ac1ff67..2d83d4c 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ListViewer.java
@@ -80,9 +80,6 @@ public class ListViewer extends AbstractListViewer {
hookControl(list);
}
- /* (non-Javadoc)
- * Method declared on Viewer.
- */
@Override
public Control getControl() {
return list;
@@ -97,10 +94,6 @@ public class ListViewer extends AbstractListViewer {
return list;
}
- /*
- * Non-Javadoc.
- * Method defined on StructuredViewer.
- */
@Override
public void reveal(Object element) {
Assert.isNotNull(element);
@@ -126,106 +119,66 @@ public class ListViewer extends AbstractListViewer {
list.setTopIndex(newTop);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listAdd(java.lang.String, int)
- */
@Override
protected void listAdd(String string, int index) {
list.add(string, index);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listSetItem(int, java.lang.String)
- */
@Override
protected void listSetItem(int index, String string) {
list.setItem(index, string);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listGetSelectionIndices()
- */
@Override
protected int[] listGetSelectionIndices() {
return list.getSelectionIndices();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listGetItemCount()
- */
@Override
protected int listGetItemCount() {
return list.getItemCount();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listSetItems(java.lang.String[])
- */
@Override
protected void listSetItems(String[] labels) {
list.setItems(labels);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listRemoveAll()
- */
@Override
protected void listRemoveAll() {
list.removeAll();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listRemove(int)
- */
@Override
protected void listRemove(int index) {
list.remove(index);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listSelectAndShow(int[])
- */
@Override
protected void listSetSelection(int[] ixs) {
list.setSelection(ixs);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listDeselectAll()
- */
@Override
protected void listDeselectAll() {
list.deselectAll();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listShowSelection()
- */
@Override
protected void listShowSelection() {
list.showSelection();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listGetTopIndex()
- */
+
@Override
protected int listGetTopIndex() {
return list.getTopIndex();
}
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#listSetTopIndex(int)
- */
+
@Override
protected void listSetTopIndex(int index) {
list.setTopIndex(index);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractListViewer#setSelectionToWidget(java.util.List, boolean)
- */
@Override
protected void setSelectionToWidget(List in, boolean reveal) {
if( reveal ) {
@@ -252,6 +205,5 @@ public class ListViewer extends AbstractListViewer {
}
}
}
-
-
+
}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java
index ec83029..f520d1a 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredSelection.java
@@ -14,8 +14,8 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.JFaceResources;
/**
* A concrete implementation of the <code>IStructuredSelection</code> interface,
@@ -150,50 +150,32 @@ public class StructuredSelection implements IStructuredSelection {
return true;
}
- /* (non-Javadoc)
- * Method declared in IStructuredSelection.
- */
@Override
public Object getFirstElement() {
return isEmpty() ? null : elements[0];
}
- /* (non-Javadoc)
- * Method declared in ISelection.
- */
@Override
public boolean isEmpty() {
return elements == null || elements.length == 0;
}
- /* (non-Javadoc)
- * Method declared in IStructuredSelection.
- */
@Override
public Iterator iterator() {
return Arrays.asList(elements == null ? new Object[0] : elements)
.iterator();
}
- /* (non-Javadoc)
- * Method declared in IStructuredSelection.
- */
@Override
public int size() {
return elements == null ? 0 : elements.length;
}
- /* (non-Javadoc)
- * Method declared in IStructuredSelection.
- */
@Override
public Object[] toArray() {
return elements == null ? new Object[0] : (Object[]) elements.clone();
}
- /* (non-Javadoc)
- * Method declared in IStructuredSelection.
- */
@Override
public List toList() {
return Arrays.asList(elements == null ? new Object[0] : elements);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
index 543fb72..e06b8dd 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
@@ -183,11 +183,7 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
fontProvider = (IFontProvider) provider;
}
}
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.StructuredViewer.ColorAndFontManager#setFontsAndColors(java.lang.Object)
- */
+
@Override
public void setFontsAndColors(Object element){
@@ -209,12 +205,7 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
foreground = colorProvider.getForeground(element);
}
}
-
- /**
- * Apply the fonts and colors to the control if
- * required.
- * @param control
- */
+
@Override
public void applyFontsAndColors(TableItem control) {
@@ -246,12 +237,7 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
clear();
}
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.StructuredViewer.ColorAndFontManager#applyFontsAndColors(org.eclipse.swt.widgets.TreeItem)
- */
@Override
public void applyFontsAndColors(TreeItem control) {
@@ -283,11 +269,7 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
clear();
}
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.StructuredViewer.ColorAndFontManager#applyFontsAndColors(org.eclipse.swt.custom.TableTreeItem)
- */
+
@Override
public void applyFontsAndColors(TableTreeItem control) {
@@ -521,9 +503,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
openListeners.add(listener);
}
- /*
- * (non-Javadoc) Method declared on IPostSelectionProvider.
- */
@Override
public void addPostSelectionChangedListener(ISelectionChangedListener listener) {
postSelectionChangedListeners.add(listener);
@@ -1238,9 +1217,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
firePostSelectionChanged(event);
}
- /*
- * (non-Javadoc) Method declared on Viewer.
- */
@Override
protected void hookControl(Control control) {
super.hookControl(control);
@@ -1474,10 +1450,7 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
}
}
}
-
- /*
- * Non-Javadoc. Method declared on Viewer.
- */
+
@Override
public void refresh() {
refresh(getRoot());
@@ -1585,9 +1558,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
openListeners.remove(listener);
}
- /*
- * (non-Javadoc) Method declared on IPostSelectionProvider.
- */
@Override
public void removePostSelectionChangedListener(ISelectionChangedListener listener) {
postSelectionChangedListeners.remove(listener);
@@ -1674,10 +1644,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
*/
public abstract void reveal(Object element);
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.viewers.ContentViewer#setContentProvider(org.eclipse.jface.viewers.IContentProvider)
- */
@Override
public void setContentProvider(IContentProvider provider) {
assertContentProviderType(provider);
@@ -1693,10 +1659,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
Assert.isTrue(provider instanceof IStructuredContentProvider);
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.viewers.Viewer#setInput(java.lang.Object)
- */
@Override
public final void setInput(Object input) {
Control control = getControl();
@@ -1717,10 +1679,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
}
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.viewers.Viewer#setSelection(org.eclipse.jface.viewers.ISelection, boolean)
- */
@Override
public void setSelection(ISelection selection, boolean reveal) {
/**
@@ -2228,9 +2186,6 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
return elementMap != null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ContentViewer#setLabelProvider(org.eclipse.jface.viewers.IBaseLabelProvider)
- */
@Override
public void setLabelProvider(IBaseLabelProvider labelProvider) {
if (labelProvider instanceof IColorProvider || labelProvider instanceof IFontProvider) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledCellLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledCellLabelProvider.java
index 4ce6a45..2ffad4a 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledCellLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledCellLabelProvider.java
@@ -152,10 +152,7 @@ public abstract class StyledCellLabelProvider extends OwnerDrawLabelProvider {
protected final ViewerColumn getColumn() {
return this.column;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#initialize(org.eclipse.jface.viewers.ColumnViewer, org.eclipse.jface.viewers.ViewerColumn)
- */
+
@Override
public void initialize(ColumnViewer viewer, ViewerColumn column) {
Assert.isTrue(this.viewer == null && this.column == null, "Label provider instance already in use"); //$NON-NLS-1$
@@ -164,12 +161,7 @@ public abstract class StyledCellLabelProvider extends OwnerDrawLabelProvider {
this.column= column;
super.initialize(viewer, column, isOwnerDrawEnabled());
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose()
- */
+
@Override
public void dispose() {
if (this.cachedTextLayout != null) {
@@ -183,11 +175,6 @@ public abstract class StyledCellLabelProvider extends OwnerDrawLabelProvider {
super.dispose();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
- */
@Override
public void update(ViewerCell cell) {
// clients must override and configure the cell and call super
@@ -263,12 +250,6 @@ public abstract class StyledCellLabelProvider extends OwnerDrawLabelProvider {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#measure(org.eclipse.swt.widgets.Event,
- * java.lang.Object)
- */
@Override
protected void measure(Event event, Object element) {
if (!isOwnerDrawEnabled())
@@ -317,12 +298,6 @@ public abstract class StyledCellLabelProvider extends OwnerDrawLabelProvider {
return textWidthDelta;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#paint(org.eclipse.swt.widgets.Event,
- * java.lang.Object)
- */
@Override
protected void paint(Event event, Object element) {
if (!isOwnerDrawEnabled())
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java
index 1a6b33c..8b308c3 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java
@@ -13,12 +13,11 @@ package org.eclipse.jface.viewers;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.TextStyle;
-
import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.graphics.TextStyle;
/**
* A mutable string with styled ranges. All ranges mark substrings of the string
@@ -141,12 +140,7 @@ public class StyledString {
public String getString() {
return fBuffer.toString();
}
-
- /**
- * Returns the string of this {@link StyledString}.
- *
- * @return the current string of this {@link StyledString}.
- */
+
@Override
public String toString() {
return getString();
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java
index 7cc98ac..f5fe981 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java
@@ -53,11 +53,6 @@ class TableColumnViewerLabelProvider extends WrappedViewerLabelProvider {
tableFontProvider = (ITableFontProvider) labelProvider;
}
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.WrappedViewerLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
- */
@Override
public void update(ViewerCell cell) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableLayout.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableLayout.java
index f27acf4..246bc95 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableLayout.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableLayout.java
@@ -94,9 +94,6 @@ public class TableLayout extends Layout {
columns.add(data);
}
- /*
- * (non-Javadoc) Method declared on Layout.
- */
@Override
public Point computeSize(Composite c, int wHint, int hHint, boolean flush) {
if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) {
@@ -133,9 +130,6 @@ public class TableLayout extends Layout {
return result;
}
- /*
- * (non-Javadoc) Method declared on Layout.
- */
@Override
public void layout(Composite c, boolean flush) {
// Only do initial layout. Trying to maintain proportions when resizing
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableTreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableTreeViewer.java
index 0b1cf9b..c7619eb 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableTreeViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableTreeViewer.java
@@ -494,26 +494,16 @@ public class TableTreeViewer extends AbstractTreeViewer {
this(new TableTree(parent, style));
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected void addTreeListener(Control c, TreeListener listener) {
((TableTree) c).addTreeListener(listener);
}
- /**
- * Cancels a currently active cell editor. All changes already done in the
- * cell editor are lost.
- */
@Override
public void cancelEditing() {
tableEditorImpl.cancelEditing();
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected void doUpdateItem(Item item, Object element) {
// update icon and label
@@ -570,42 +560,21 @@ public class TableTreeViewer extends AbstractTreeViewer {
}
- /**
- * Starts editing the given element.
- *
- * @param element
- * the element
- * @param column
- * the column number
- */
@Override
public void editElement(Object element, int column) {
tableEditorImpl.editElement(element, column);
}
- /**
- * Returns the cell editors of this viewer.
- *
- * @return the list of cell editors
- */
@Override
public CellEditor[] getCellEditors() {
return tableEditorImpl.getCellEditors();
}
- /**
- * Returns the cell modifier of this viewer.
- *
- * @return the cell modifier
- */
@Override
public ICellModifier getCellModifier() {
return tableEditorImpl.getCellModifier();
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected Item[] getChildren(Widget o) {
if (o instanceof TableTreeItem) {
@@ -617,12 +586,6 @@ public class TableTreeViewer extends AbstractTreeViewer {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#getChild(org.eclipse.swt.widgets.Widget,
- * int)
- */
@Override
protected Item getChild(Widget widget, int index) {
if (widget instanceof TableTreeItem) {
@@ -634,21 +597,11 @@ public class TableTreeViewer extends AbstractTreeViewer {
return null;
}
- /**
- * Returns the column properties of this viewer. The properties must
- * correspond with the columns of the table control. They are used to
- * identify the column in a cell modifier.
- *
- * @return the list of column properties
- */
@Override
public Object[] getColumnProperties() {
return tableEditorImpl.getColumnProperties();
}
- /*
- * (non-Javadoc) Method declared on Viewer.
- */
@Override
public Control getControl() {
return tableTree;
@@ -676,43 +629,26 @@ public class TableTreeViewer extends AbstractTreeViewer {
return null;
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected boolean getExpanded(Item item) {
return ((TableTreeItem) item).getExpanded();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ColumnViewer#getItemAt(org.eclipse.swt.graphics.Point)
- */
@Override
protected Item getItemAt(Point p) {
return getTableTree().getTable().getItem(p);
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected int getItemCount(Control widget) {
return ((TableTree) widget).getItemCount();
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected int getItemCount(Item item) {
return ((TableTreeItem) item).getItemCount();
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected org.eclipse.swt.widgets.Item[] getItems(
org.eclipse.swt.widgets.Item item) {
@@ -734,17 +670,11 @@ public class TableTreeViewer extends AbstractTreeViewer {
return super.getLabelProvider();
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected Item getParentItem(Item item) {
return ((TableTreeItem) item).getParentItem();
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected Item[] getSelection(Control widget) {
return ((TableTree) widget).getSelection();
@@ -759,9 +689,6 @@ public class TableTreeViewer extends AbstractTreeViewer {
return tableTree;
}
- /*
- * (non-Javadoc) Method declared on AbstractTreeViewer.
- */
@Override
protected void hookControl(Control control) {
super.hookControl(control);
@@ -790,20 +717,11 @@ public class TableTreeViewer extends AbstractTreeViewer {
});
}
- /**
- * Returns whether there is an active cell editor.
- *
- * @return <code>true</code> if there is an active cell editor, and
- * <code>false</code> otherwise
- */
@Override
public boolean isCellEditorActive() {
return tableEditorImpl.isCellEditorActive();
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected Item newItem(Widget parent, int flags, int ix) {
TableTreeItem item;
@@ -823,60 +741,31 @@ public class TableTreeViewer extends AbstractTreeViewer {
return item;
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void removeAll(Control widget) {
((TableTree) widget).removeAll();
}
- /**
- * Sets the cell editors of this table viewer.
- *
- * @param editors
- * the list of cell editors
- */
@Override
public void setCellEditors(CellEditor[] editors) {
tableEditorImpl.setCellEditors(editors);
}
- /**
- * Sets the cell modifier of this table viewer.
- *
- * @param modifier
- * the cell modifier
- */
@Override
public void setCellModifier(ICellModifier modifier) {
tableEditorImpl.setCellModifier(modifier);
}
- /**
- * Sets the column properties of this table viewer. The properties must
- * correspond with the columns of the table control. They are used to
- * identify the column in a cell modifier.
- *
- * @param columnProperties
- * the list of column properties
- */
@Override
public void setColumnProperties(String[] columnProperties) {
tableEditorImpl.setColumnProperties(columnProperties);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void setExpanded(Item node, boolean expand) {
((TableTreeItem) node).setExpanded(expand);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void setSelection(List items) {
TableTreeItem[] newItems = new TableTreeItem[items.size()];
@@ -884,9 +773,6 @@ public class TableTreeViewer extends AbstractTreeViewer {
getTableTree().setSelection(newItems);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void showItem(Item item) {
getTableTree().showItem((TableTreeItem) item);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java
index 4adf99a..9ae0d55 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java
@@ -399,10 +399,7 @@ public class TableViewer extends AbstractTableViewer {
public void refresh(boolean updateLabels, boolean reveal) {
refresh(getRoot(), updateLabels, reveal);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractTableViewer#remove(java.lang.Object[])
- */
+
@Override
public void remove(Object[] elements) {
assertElementsNotNull(elements);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerRow.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerRow.java
index 939e847..e0213b7 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerRow.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerRow.java
@@ -37,25 +37,16 @@ public class TableViewerRow extends ViewerRow {
this.item = item;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getBounds(int)
- */
@Override
public Rectangle getBounds(int columnIndex) {
return item.getBounds(columnIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getBounds()
- */
@Override
public Rectangle getBounds() {
return item.getBounds();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getItem()
- */
@Override
public Widget getItem() {
return item;
@@ -65,81 +56,51 @@ public class TableViewerRow extends ViewerRow {
this.item = item;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getColumnCount()
- */
@Override
public int getColumnCount() {
return item.getParent().getColumnCount();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getBackground(int)
- */
@Override
public Color getBackground(int columnIndex) {
return item.getBackground(columnIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getFont(int)
- */
@Override
public Font getFont(int columnIndex) {
return item.getFont(columnIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getForeground(int)
- */
@Override
public Color getForeground(int columnIndex) {
return item.getForeground(columnIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getImage(int)
- */
@Override
public Image getImage(int columnIndex) {
return item.getImage(columnIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getText(int)
- */
@Override
public String getText(int columnIndex) {
return item.getText(columnIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#setBackground(int, org.eclipse.swt.graphics.Color)
- */
@Override
public void setBackground(int columnIndex, Color color) {
item.setBackground(columnIndex, color);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#setFont(int, org.eclipse.swt.graphics.Font)
- */
@Override
public void setFont(int columnIndex, Font font) {
item.setFont(columnIndex, font);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#setForeground(int, org.eclipse.swt.graphics.Color)
- */
@Override
public void setForeground(int columnIndex, Color color) {
item.setForeground(columnIndex, color);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#setImage(int, org.eclipse.swt.graphics.Image)
- */
@Override
public void setImage(int columnIndex, Image image) {
Image oldImage = item.getImage(columnIndex);
@@ -148,17 +109,11 @@ public class TableViewerRow extends ViewerRow {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#setText(int, java.lang.String)
- */
@Override
public void setText(int columnIndex, String text) {
item.setText(columnIndex, text == null ? "" : text); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getControl()
- */
@Override
public Control getControl() {
return item.getParent();
@@ -236,17 +191,11 @@ public class TableViewerRow extends ViewerRow {
return super.getCreationIndex(visualIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getTextBounds(int)
- */
@Override
public Rectangle getTextBounds(int index) {
return item.getTextBounds(index);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getImageBounds(int)
- */
+
@Override
public Rectangle getImageBounds(int index) {
return item.getImageBounds(index);
@@ -259,12 +208,12 @@ public class TableViewerRow extends ViewerRow {
private boolean isValidOrderIndex(int currentIndex) {
return currentIndex < this.item.getParent().getColumnOrder().length;
}
-
+
@Override
int getWidth(int columnIndex) {
return item.getParent().getColumn(columnIndex).getWidth();
}
-
+
@Override
protected boolean scrollCellIntoView(int columnIndex) {
item.getParent().showItem(item);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java
index 2dc2d2c..5a05f82 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TextCellEditor.java
@@ -138,9 +138,6 @@ public class TextCellEditor extends CellEditor {
}
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
protected Control createControl(Composite parent) {
text = new Text(parent, getStyle());
@@ -211,9 +208,6 @@ public class TextCellEditor extends CellEditor {
return text.getText();
}
- /* (non-Javadoc)
- * Method declared on CellEditor.
- */
@Override
protected void doSetFocus() {
if (text != null) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeColumnViewerLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeColumnViewerLabelProvider.java
index d0b653e..db80b76 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeColumnViewerLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeColumnViewerLabelProvider.java
@@ -21,54 +21,31 @@ package org.eclipse.jface.viewers;
public class TreeColumnViewerLabelProvider extends
TableColumnViewerLabelProvider {
private ITreePathLabelProvider treePathProvider = new ITreePathLabelProvider() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreePathLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel,
- * org.eclipse.jface.viewers.TreePath)
- */
+
@Override
public void updateLabel(ViewerLabel label, TreePath elementPath) {
// Do nothing by default
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
@Override
public void dispose() {
// Do nothing by default
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
@Override
public void addListener(ILabelProviderListener listener) {
// Do nothing by default
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
@Override
public void removeListener(ILabelProviderListener listener) {
// Do nothing by default
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
+
@Override
public boolean isLabelProperty(Object element, String property) {
return false;
@@ -96,11 +73,6 @@ public class TreeColumnViewerLabelProvider extends
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerLabelProvider#setProviders(java.lang.Object)
- */
@Override
public void setProviders(Object provider) {
super.setProviders(provider);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeNodeContentProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeNodeContentProvider.java
index 023a2b5..7011edc 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeNodeContentProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeNodeContentProvider.java
@@ -26,32 +26,18 @@ package org.eclipse.jface.viewers;
* @see org.eclipse.jface.viewers.TreeNode
*/
public class TreeNodeContentProvider implements ITreeContentProvider {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
+
@Override
public void dispose() {
// Do nothing
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
- */
@Override
public Object[] getChildren(final Object parentElement) {
final TreeNode node = (TreeNode) parentElement;
return node.getChildren();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
@Override
public Object[] getElements(final Object inputElement) {
if (inputElement instanceof TreeNode[]) {
@@ -60,34 +46,18 @@ public class TreeNodeContentProvider implements ITreeContentProvider {
return new Object[0];
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
@Override
public Object getParent(final Object element) {
final TreeNode node = (TreeNode) element;
return node.getParent();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- */
@Override
public boolean hasChildren(final Object element) {
final TreeNode node = (TreeNode) element;
return node.hasChildren();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
@Override
public void inputChanged(final Viewer viewer, final Object oldInput,
final Object newInput) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreePath.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreePath.java
index 5987505..d486c83 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreePath.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreePath.java
@@ -94,11 +94,6 @@ public final class TreePath {
return segments[segments.length - 1];
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object other) {
if (!(other instanceof TreePath)) {
@@ -107,11 +102,6 @@ public final class TreePath {
return equals((TreePath) other, null);
}
- /**
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
if (hash == 0) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java
index 8c99c91..d0bd4dc 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java
@@ -137,19 +137,11 @@ public class TreeViewer extends AbstractTreeViewer {
hookControl(tree);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void addTreeListener(Control c, TreeListener listener) {
((Tree) c).addTreeListener(listener);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ColumnViewer#getColumnViewerOwner(int)
- */
@Override
protected Widget getColumnViewerOwner(int columnIndex) {
if (columnIndex < 0 || ( columnIndex > 0 && columnIndex >= getTree().getColumnCount() ) ) {
@@ -162,9 +154,6 @@ public class TreeViewer extends AbstractTreeViewer {
return getTree().getColumn(columnIndex);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected Item[] getChildren(Widget o) {
if (o instanceof TreeItem) {
@@ -176,27 +165,16 @@ public class TreeViewer extends AbstractTreeViewer {
return null;
}
- /*
- * (non-Javadoc) Method declared in Viewer.
- */
@Override
public Control getControl() {
return tree;
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected boolean getExpanded(Item item) {
return ((TreeItem) item).getExpanded();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ColumnViewer#getItemAt(org.eclipse.swt.graphics.Point)
- */
@Override
protected Item getItemAt(Point p) {
TreeItem[] selection = tree.getSelection();
@@ -214,25 +192,16 @@ public class TreeViewer extends AbstractTreeViewer {
return getTree().getItem(p);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected int getItemCount(Control widget) {
return ((Tree) widget).getItemCount();
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected int getItemCount(Item item) {
return ((TreeItem) item).getItemCount();
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected Item[] getItems(Item item) {
return ((TreeItem) item).getItems();
@@ -252,17 +221,11 @@ public class TreeViewer extends AbstractTreeViewer {
return super.getLabelProvider();
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected Item getParentItem(Item item) {
return ((TreeItem) item).getParentItem();
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected Item[] getSelection(Control widget) {
return ((Tree) widget).getSelection();
@@ -277,11 +240,6 @@ public class TreeViewer extends AbstractTreeViewer {
return tree;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#hookControl(org.eclipse.swt.widgets.Control)
- */
@Override
protected void hookControl(Control control) {
super.hookControl(control);
@@ -318,9 +276,6 @@ public class TreeViewer extends AbstractTreeViewer {
return new TreeViewerEditor(this,null,new ColumnViewerEditorActivationStrategy(this),ColumnViewerEditor.DEFAULT);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected Item newItem(Widget parent, int flags, int ix) {
TreeItem item;
@@ -335,17 +290,11 @@ public class TreeViewer extends AbstractTreeViewer {
return item;
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void removeAll(Control widget) {
((Tree) widget).removeAll();
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void setExpanded(Item node, boolean expand) {
((TreeItem) node).setExpanded(expand);
@@ -355,9 +304,6 @@ public class TreeViewer extends AbstractTreeViewer {
}
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void setSelection(List items) {
@@ -373,20 +319,11 @@ public class TreeViewer extends AbstractTreeViewer {
getTree().setSelection(newItems);
}
- /*
- * (non-Javadoc) Method declared in AbstractTreeViewer.
- */
@Override
protected void showItem(Item item) {
getTree().showItem((TreeItem) item);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#getChild(org.eclipse.swt.widgets.Widget,
- * int)
- */
@Override
protected Item getChild(Widget widget, int index) {
if (widget instanceof TreeItem) {
@@ -716,12 +653,6 @@ public class TreeViewer extends AbstractTreeViewer {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalRefreshStruct(org.eclipse.swt.widgets.Widget,
- * java.lang.Object, boolean)
- */
@Override
protected void internalRefreshStruct(Widget widget, Object element,
boolean updateLabels) {
@@ -811,11 +742,6 @@ public class TreeViewer extends AbstractTreeViewer {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ColumnViewer#getRowPartFromItem(org.eclipse.swt.widgets.Widget)
- */
@Override
protected ViewerRow getViewerRowFromItem(Widget item) {
if( cachedRow == null ) {
@@ -852,11 +778,6 @@ public class TreeViewer extends AbstractTreeViewer {
SWT.NONE));
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalInitializeTree(org.eclipse.swt.widgets.Control)
- */
@Override
protected void internalInitializeTree(Control widget) {
if (contentProviderIsLazy) {
@@ -868,12 +789,6 @@ public class TreeViewer extends AbstractTreeViewer {
super.internalInitializeTree(tree);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#updatePlus(org.eclipse.swt.widgets.Item,
- * java.lang.Object)
- */
@Override
protected void updatePlus(Item item, Object element) {
if (contentProviderIsLazy) {
@@ -964,9 +879,6 @@ public class TreeViewer extends AbstractTreeViewer {
});
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#handleTreeExpand(org.eclipse.swt.events.TreeEvent)
- */
@Override
protected void handleTreeExpand(TreeEvent event) {
// Fix for Bug 271744 because windows expanding doesn't fire a focus lost
@@ -1001,9 +913,6 @@ public class TreeViewer extends AbstractTreeViewer {
super.handleTreeCollapse(event);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.AbstractTreeViewer#setContentProvider(org.eclipse.jface.viewers.IContentProvider)
- */
@Override
public void setContentProvider(IContentProvider provider) {
contentProviderIsLazy = (provider instanceof ILazyTreeContentProvider)
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerRow.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerRow.java
index f428010..d282c6d 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerRow.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerRow.java
@@ -43,135 +43,66 @@ public class TreeViewerRow extends ViewerRow {
this.item = item;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getBounds(int)
- */
@Override
public Rectangle getBounds(int columnIndex) {
return item.getBounds(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getBounds()
- */
@Override
public Rectangle getBounds() {
return item.getBounds();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getColumnCount()
- */
@Override
public int getColumnCount() {
return item.getParent().getColumnCount();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getItem()
- */
@Override
public Widget getItem() {
return item;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getBackground(int)
- */
@Override
public Color getBackground(int columnIndex) {
return item.getBackground(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getFont(int)
- */
@Override
public Font getFont(int columnIndex) {
return item.getFont(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getForeground(int)
- */
@Override
public Color getForeground(int columnIndex) {
return item.getForeground(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getImage(int)
- */
@Override
public Image getImage(int columnIndex) {
return item.getImage(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getText(int)
- */
@Override
public String getText(int columnIndex) {
return item.getText(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#setBackground(int,
- * org.eclipse.swt.graphics.Color)
- */
@Override
public void setBackground(int columnIndex, Color color) {
item.setBackground(columnIndex, color);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#setFont(int,
- * org.eclipse.swt.graphics.Font)
- */
@Override
public void setFont(int columnIndex, Font font) {
item.setFont(columnIndex, font);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#setForeground(int,
- * org.eclipse.swt.graphics.Color)
- */
@Override
public void setForeground(int columnIndex, Color color) {
item.setForeground(columnIndex, color);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#setImage(int,
- * org.eclipse.swt.graphics.Image)
- */
@Override
public void setImage(int columnIndex, Image image) {
Image oldImage = item.getImage(columnIndex);
@@ -180,21 +111,11 @@ public class TreeViewerRow extends ViewerRow {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#setText(int, java.lang.String)
- */
@Override
public void setText(int columnIndex, String text) {
item.setText(columnIndex, text == null ? "" : text); //$NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerRow#getControl()
- */
@Override
public Control getControl() {
return item.getParent();
@@ -383,28 +304,23 @@ public class TreeViewerRow extends ViewerRow {
@Override
public int getCreationIndex(int visualIndex) {
- if( item != null && ! item.isDisposed() && hasColumns() && isValidOrderIndex(visualIndex) ) {
+ if (item != null && !item.isDisposed() && hasColumns()
+ && isValidOrderIndex(visualIndex)) {
return item.getParent().getColumnOrder()[visualIndex];
}
return super.getCreationIndex(visualIndex);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getTextBounds(int)
- */
@Override
public Rectangle getTextBounds(int index) {
return item.getTextBounds(index);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerRow#getImageBounds(int)
- */
+
@Override
public Rectangle getImageBounds(int index) {
return item.getImageBounds(index);
- }
-
+ }
+
private boolean hasColumns() {
return this.item.getParent().getColumnCount() != 0;
}
@@ -417,12 +333,13 @@ public class TreeViewerRow extends ViewerRow {
int getWidth(int columnIndex) {
return item.getParent().getColumn(columnIndex).getWidth();
}
-
+
@Override
protected boolean scrollCellIntoView(int columnIndex) {
item.getParent().showItem(item);
- if( hasColumns() ) {
- item.getParent().showColumn(item.getParent().getColumn(columnIndex));
+ if (hasColumns()) {
+ item.getParent()
+ .showColumn(item.getParent().getColumn(columnIndex));
}
return true;
}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/Viewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/Viewer.java
index 9307132..310ce58 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/Viewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/Viewer.java
@@ -10,16 +10,14 @@
*******************************************************************************/
package org.eclipse.jface.viewers;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.swt.events.HelpEvent;
import org.eclipse.swt.events.HelpListener;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Item;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.ListenerList;
-
-import org.eclipse.jface.util.SafeRunnable;
-
/**
* A viewer is a model-based adapter on a widget.
* <p>
@@ -126,9 +124,6 @@ public abstract class Viewer implements IInputSelectionProvider {
}
}
- /* (non-Javadoc)
- * Method declared on ISelectionProvider.
- */
@Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
@@ -205,15 +200,9 @@ public abstract class Viewer implements IInputSelectionProvider {
return null;
}
- /* (non-Javadoc)
- * Copy-down of method declared on <code>IInputProvider</code>.
- */
@Override
public abstract Object getInput();
- /* (non-Javadoc)
- * Copy-down of method declared on <code>ISelectionProvider</code>.
- */
@Override
public abstract ISelection getSelection();
@@ -270,9 +259,6 @@ public abstract class Viewer implements IInputSelectionProvider {
}
}
- /* (non-Javadoc)
- * Method declared on ISelectionProvider.
- */
@Override
public void removeSelectionChangedListener(
ISelectionChangedListener listener) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerCell.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerCell.java
index f2d4a02..6270b3b 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerCell.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerCell.java
@@ -378,11 +378,6 @@ public class ViewerCell {
return row.getFont(columnIndex);
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
final int prime = 31;
@@ -392,11 +387,6 @@ public class ViewerCell {
return result;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj) {
if (this == obj)
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerDropAdapter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerDropAdapter.java
index 319419a..5ead288 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerDropAdapter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerDropAdapter.java
@@ -83,19 +83,19 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
* someplace you can't drop).
*/
private int lastValidOperation;
-
+
/**
* This is used because we allow the operation
* to be temporarily overridden (for example a move to a copy) for a drop that
* happens immediately after the operation is overridden.
*/
private int overrideOperation = -1;
-
+
/**
* The current DropTargetEvent, used only during validateDrop()
*/
private DropTargetEvent currentEvent;
-
+
/**
* The data item currently under the mouse.
*/
@@ -125,7 +125,7 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
* expanding on or off. Default is <code>true</code>.
*/
private boolean expandEnabled = true;
-
+
/**
* A flag that allows adapter users to turn selection feedback
* on or off. Default is <code>true</code>.
@@ -192,12 +192,6 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
return event.item == null ? null : event.item.getData();
}
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * The mouse has moved over the drop target. If the
- * target item has changed, notify the action and check
- * that it is still enabled.
- */
private void doDropValidation(DropTargetEvent event) {
//always remember what was previously requested, but not if it
//was overridden
@@ -219,34 +213,18 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
currentEvent = null;
}
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * The drag has entered this widget's region. See
- * if the drop should be allowed.
- */
@Override
public void dragEnter(DropTargetEvent event) {
currentTarget = determineTarget(event);
doDropValidation(event);
}
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * The drop operation has changed, see if the action
- * should still be enabled.
- */
@Override
public void dragOperationChanged(DropTargetEvent event) {
currentTarget = determineTarget(event);
doDropValidation(event);
}
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * The mouse has moved over the drop target. If the
- * target item has changed, notify the action and check
- * that it is still enabled.
- */
@Override
public void dragOver(DropTargetEvent event) {
//use newly revealed item as target if scrolling occurs
@@ -264,10 +242,6 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
}
}
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * The user has dropped something on the desktop viewer.
- */
@Override
public void drop(DropTargetEvent event) {
currentLocation = determineLocation(event);
@@ -286,10 +260,6 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
currentEvent = null;
}
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * Last chance for the action to disable itself
- */
@Override
public void dropAccept(DropTargetEvent event) {
currentEvent = event;
@@ -454,13 +424,7 @@ public abstract class ViewerDropAdapter extends DropTargetAdapter {
protected void overrideOperation(int operation) {
overrideOperation = operation;
}
-
- /* (non-Javadoc)
- * Method declared on DropTargetAdapter.
- * The mouse has moved over the drop target. If the
- * target item has changed, notify the action and check
- * that it is still enabled.
- */
+
private void setFeedback(DropTargetEvent event, int location) {
if (feedbackEnabled) {
switch (location) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java
index 852baf8..8ad2001 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java
@@ -72,11 +72,6 @@ class WrappedViewerLabelProvider extends ColumnLabelProvider {
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
- */
@Override
public Font getFont(Object element) {
if (fontProvider == null) {
@@ -87,11 +82,6 @@ class WrappedViewerLabelProvider extends ColumnLabelProvider {
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
- */
@Override
public Color getBackground(Object element) {
if (colorProvider == null) {
@@ -101,31 +91,16 @@ class WrappedViewerLabelProvider extends ColumnLabelProvider {
return colorProvider.getBackground(element);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
@Override
public String getText(Object element) {
return getLabelProvider().getText(element);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
@Override
public Image getImage(Object element) {
return getLabelProvider().getImage(element);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
@Override
public Color getForeground(Object element) {
if (colorProvider == null) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.java
index 8d5d379..1d3f29a 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/AbstractConcurrentModel.java
@@ -23,15 +23,12 @@ public abstract class AbstractConcurrentModel implements
IConcurrentModel {
private ListenerList listeners = new ListenerList();
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.deferred.IConcurrentContentProvider#addListener(org.eclipse.jface.viewers.deferred.IConcurrentContentProviderListener)
- */
+
@Override
public void addListener(IConcurrentModelListener listener) {
listeners.add(listener);
}
-
+
/**
* Fires an add notification to all listeners
*
@@ -61,7 +58,7 @@ public abstract class AbstractConcurrentModel implements
next.remove(removed);
}
}
-
+
/**
* Fires an update notification to all listeners
*
@@ -76,7 +73,7 @@ public abstract class AbstractConcurrentModel implements
next.update(updated);
}
}
-
+
/**
* Returns the array of listeners for this model
*
@@ -92,10 +89,7 @@ public abstract class AbstractConcurrentModel implements
return result;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.deferred.IConcurrentContentProvider#removeListener(org.eclipse.jface.viewers.deferred.IConcurrentContentProviderListener)
- */
+
@Override
public void removeListener(IConcurrentModelListener listener) {
listeners.remove(listener);