Bug 457867 - [Tests] Update org.eclipse.ui.tests.navigator to Java 1.6
Adds missing @Override annotations for tests
Change-Id: I2f01599bc2a4b44d3eef68ae3e87b7993ffa3a47
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/DnDTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/DnDTest.java
index 5d407f2..3e05db0 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/DnDTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/DnDTest.java
@@ -29,10 +29,12 @@
_navigatorInstanceId = TEST_VIEWER;
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
index 535681c..5eb2c35 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
@@ -196,6 +196,7 @@
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
file2.delete(true, new NullProgressMonitor());
file2.create(null, true, null);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
index a40c555..80d1dc5 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
@@ -163,6 +163,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception {
if (_navigatorInstanceId == null) {
@@ -234,6 +235,7 @@
_viewer = (CommonViewer) _commonNavigator.getAdapter(CommonViewer.class);
}
+ @Override
protected void tearDown() throws Exception {
clearAll();
// Hide it, we want a new one each time
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NonCommonViewerView.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NonCommonViewerView.java
index 4934128..6acc5dc 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NonCommonViewerView.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NonCommonViewerView.java
@@ -27,6 +27,7 @@
private TreeViewer _viewer;
+ @Override
public void createPartControl(Composite parent) {
_viewer = new TreeViewer(parent);
@@ -48,6 +49,7 @@
}
+ @Override
public void setFocus() {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PerformanceTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PerformanceTest.java
index a0ecd98..5b3cd0b 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PerformanceTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PerformanceTest.java
@@ -43,10 +43,12 @@
_initTestData = false;
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
@@ -54,6 +56,7 @@
protected void createProjects() throws Exception {
Job createJob = new Job("Create projects") {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
for (int i = 0; i < _numProjects; i++) {
@@ -94,6 +97,7 @@
protected void deleteProjects() throws Exception {
Job deleteJob = new Job("Delete Projects") {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
for (int i = 0; i < _numProjects; i++) {
@@ -123,6 +127,7 @@
throws Exception {
Job createJob = new Job("Create Files") {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
for (int i = startNumber; i < _numFiles; i++) {
@@ -148,6 +153,7 @@
protected void touchFiles(final IProject p1) throws Exception {
Job touchJob = new Job("Touch Files") {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
for (int i = 0; i < _numFiles; i++) {
@@ -218,6 +224,7 @@
Job touchJob = new Job("Touch Files") {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
for (int i = 0; i < _numFiles; i++) {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java
index e68d21f..c7e3397 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java
@@ -188,6 +188,7 @@
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
file2.delete(true, new NullProgressMonitor());
file2.create(null, true, null);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/SorterTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/SorterTest.java
index 7887a00..41f155d 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/SorterTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/SorterTest.java
@@ -51,6 +51,7 @@
refreshViewer();
ILogListener ll = new ILogListener() {
+ @Override
public void logging(IStatus status, String plugin) {
_statusCount++;
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java
index ec71077..c622ce5 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java
@@ -85,12 +85,14 @@
_children.add(child);
}
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == IResource.class)
return _resource;
return null;
}
+ @Override
public String toString() {
return getClass().getName() + ": " + _resource;
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElementSorter.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElementSorter.java
index 4fe10f0..7fe3d8e 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElementSorter.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElementSorter.java
@@ -84,6 +84,7 @@
public CElementSorter() {
}
+ @Override
public int category(Object element) {
if (element instanceof CElement) {
if (element instanceof CRoot)
@@ -110,6 +111,7 @@
return OTHERS;
}
+ @Override
public int compare(Viewer viewer, Object e1, Object e2) {
int cat1 = category(e1);
int cat2 = category(e2);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java
index 05035f5..637c03f 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java
@@ -60,18 +60,22 @@
protected CRoot _root;
protected Object _realInput;
+ @Override
public void init(ICommonContentExtensionSite commonContentExtensionSite) {
IMemento memento = commonContentExtensionSite.getMemento();
restoreState(memento);
}
+ @Override
public void restoreState(IMemento memento) {
}
+ @Override
public void saveState(IMemento memento) {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
_realInput = newInput;
if (newInput instanceof IWorkspaceRoot) {
@@ -100,6 +104,7 @@
final CommonNavigator cn = ((CommonNavigator) viewPart);
viewPart.getSite().getShell().getDisplay().asyncExec(
new Runnable() {
+ @Override
public void run() {
cn.setLinkingEnabled(true);
}
@@ -110,6 +115,7 @@
}
}
+ @Override
public Object getParent(Object element) {
Object parent;
if (element instanceof CElement)
@@ -123,6 +129,7 @@
return parent;
}
+ @Override
public Object[] getElements(Object parent) {
if (parent instanceof IWorkspaceRoot) {
IProject[] projects = ((IWorkspaceRoot) parent).getProjects();
@@ -137,10 +144,12 @@
return cElement.getChildren().toArray();
}
+ @Override
public Object[] getChildren(Object element) {
return getElements(element);
}
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof IProject) {
IProject project = (IProject) element;
@@ -149,10 +158,12 @@
return getChildren(element).length > 0;
}
+ @Override
public void getPipelinedChildren(Object parent, Set currentChildren) {
customizeCElements(getChildren(parent), currentChildren);
}
+ @Override
public void getPipelinedElements(Object input, Set currentElements) {
// only replace plain resource elements with custom elements
// and avoid duplicating elements already customized
@@ -192,10 +203,12 @@
}
}
+ @Override
public Object getPipelinedParent(Object object, Object suggestedParent) {
return getParent(object);
}
+ @Override
public PipelinedShapeModification interceptAdd(
PipelinedShapeModification addModification) {
Object parent = addModification.getParent();
@@ -226,11 +239,13 @@
return addModification;
}
+ @Override
public boolean interceptRefresh(PipelinedViewerUpdate refreshSynchronization) {
final Set refreshTargets = refreshSynchronization.getRefreshTargets();
return convertToCElements(refreshTargets);
}
+ @Override
public PipelinedShapeModification interceptRemove(
PipelinedShapeModification removeModification) {
final Set children = removeModification.getChildren();
@@ -238,6 +253,7 @@
return removeModification;
}
+ @Override
public boolean interceptUpdate(PipelinedViewerUpdate updateSynchronization) {
final Set refreshTargets = updateSynchronization.getRefreshTargets();
return convertToCElements(refreshTargets);
@@ -323,6 +339,7 @@
return project.getName().startsWith("C");
}
+ @Override
public void dispose() {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorLabelProvider.java
index f60d2c4..e1fa792 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorLabelProvider.java
@@ -30,19 +30,24 @@
public CNavigatorLabelProvider() {
}
+ @Override
public void init(ICommonContentExtensionSite extensionSite) {
}
+ @Override
public void restoreState(IMemento memento) {
}
+ @Override
public void saveState(IMemento memento) {
}
+ @Override
public String getText(Object element) {
return getDescription(element);
}
+ @Override
public String getDescription(Object element) {
String desc = "<notfound>";
if (element instanceof IResource) {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/dndtest/PR263695.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/dndtest/PR263695.java
index ea960ef..e4cfd37 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/dndtest/PR263695.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/dndtest/PR263695.java
@@ -31,7 +31,8 @@
final Display display = new Display();
Listener listener = new Listener() {
- public void handleEvent(Event event) {
+ @Override
+ public void handleEvent(Event event) {
switch (event.type) {
case SWT.MouseDown:
System.out.println("down");
@@ -72,7 +73,8 @@
display.setCursorLocation(downX, downY);
Thread t = new Thread(new Runnable(){
- public void run() {
+ @Override
+ public void run() {
try { Thread.sleep(2000); } catch
(InterruptedException e) {}
int sleep = 50;
@@ -138,16 +140,19 @@
final DragSource source = new DragSource(label, operations);
source.setTransfer(types);
source.addDragListener(new DragSourceListener() {
- public void dragStart(DragSourceEvent event) {
+ @Override
+ public void dragStart(DragSourceEvent event) {
event.doit = (label.getText().length() != 0);
System.out.println("dragStart: " + event);
}
- public void dragSetData(DragSourceEvent event) {
+ @Override
+ public void dragSetData(DragSourceEvent event) {
event.data = label.getText();
}
- public void dragFinished(DragSourceEvent event) {
+ @Override
+ public void dragFinished(DragSourceEvent event) {
if (event.detail == DND.DROP_MOVE)
label.setText("");
}
@@ -156,7 +161,8 @@
DropTarget target = new DropTarget(label, operations);
target.setTransfer(types);
target.addDropListener(new DropTargetAdapter() {
- public void drop(DropTargetEvent event) {
+ @Override
+ public void drop(DropTargetEvent event) {
System.out.println("got event");
if (event.data == null) {
event.detail = DND.DROP_NONE;
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestAction.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestAction.java
index 2d4ba86..2752f20 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestAction.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestAction.java
@@ -29,6 +29,7 @@
shell = aShell;
}
+ @Override
public void run() {
MessageDialog.openInformation(shell, "Shell", "The " + getText()
+ " ran!");
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionDependent.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionDependent.java
index 99b1bc6..a343575 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionDependent.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionDependent.java
@@ -25,6 +25,7 @@
}
+ @Override
public void run() {
MessageDialog.openInformation(shell, "TestActionDependent", "The dependent action ran!");
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderBasic.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderBasic.java
index d59cb39..276f56b 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderBasic.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderBasic.java
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite)
*/
+ @Override
public void init(ICommonActionExtensionSite site) {
super.init(site);
@@ -40,6 +41,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager menu) {
menu.add(action);
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java
index 6938782..6b49918 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java
@@ -23,10 +23,12 @@
private IAction action = null;
+ @Override
public void init(ICommonActionExtensionSite aConfig) {
action = new TestActionDependent(aConfig.getViewSite().getShell(), aConfig.getExtensionId());
}
+ @Override
public void fillContextMenu(IMenuManager menu) {
IMenuManager submenu = menu.findMenuUsingPath(TestActionProviderMenu.GROUP_TEST_MENU);
Assert.assertNotNull("The submenu should have been added by TestActionProviderMenu!", submenu);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderFiltered.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderFiltered.java
index 6fbf180..0a88aa4 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderFiltered.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderFiltered.java
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite)
*/
+ @Override
public void init(ICommonActionExtensionSite site) {
super.init(site);
@@ -40,6 +41,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager menu) {
if (!filterAction(action)) {
menu.add(action);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderMenu.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderMenu.java
index b075c18..1958caf 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderMenu.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderMenu.java
@@ -26,11 +26,13 @@
private IAction action = null;
+ @Override
public void init(ICommonActionExtensionSite aSite) {
super.init(aSite);
action = new TestAction(aSite.getViewSite().getShell());
}
+ @Override
public void fillContextMenu(IMenuManager menu) {
IMenuManager submenu = new MenuManager("CN Test Menu", GROUP_TEST_MENU);
submenu.add(action);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderNested.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderNested.java
index acba94c..87d0bbd 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderNested.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderNested.java
@@ -36,6 +36,7 @@
private ICommonActionExtensionSite site;
+ @Override
public void init(ICommonActionExtensionSite aSite) {
super.init(aSite);
site = aSite;
@@ -50,6 +51,7 @@
*
* @see org.eclipse.jface.action.Action#run()
*/
+ @Override
public void run() {
IStructuredSelection selection = (IStructuredSelection) getContext()
@@ -72,6 +74,7 @@
};
}
+ @Override
public void fillContextMenu(IMenuManager menu) {
menu.insertAfter(ICommonMenuConstants.GROUP_ADDITIONS, action);
}
@@ -81,6 +84,7 @@
*
* @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProvider.java
index 6305ec5..c37789d 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProvider.java
@@ -61,10 +61,12 @@
_diedOnSetInput = false;
}
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof TestExtensionTreeData) {
TestExtensionTreeData data = (TestExtensionTreeData) parentElement;
@@ -126,6 +128,7 @@
}
+ @Override
public Object getParent(Object element) {
if (element instanceof TestExtensionTreeData) {
TestExtensionTreeData data = (TestExtensionTreeData) element;
@@ -134,6 +137,7 @@
return null;
}
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof TestExtensionTreeData) {
TestExtensionTreeData data = (TestExtensionTreeData) element;
@@ -142,12 +146,14 @@
return false;
}
+ @Override
public void dispose() {
rootElements.clear();
ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
}
+ @Override
public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
if (_dieOnSetInput)
_diedOnSetInput = true;
@@ -162,6 +168,7 @@
*
* @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
*/
+ @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
@@ -178,6 +185,7 @@
*
* @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
*/
+ @Override
public boolean visit(IResourceDelta delta) throws CoreException {
IResource source = delta.getResource();
@@ -191,6 +199,7 @@
if ("model.properties".equals(file.getName())) {
updateModel(file);
new UIJob("Update Test Model in CommonViewer") {
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
if (viewer != null && !viewer.getControl().isDisposed())
viewer.refresh(file.getParent());
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderDat.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderDat.java
index 885cb8d..55fed00 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderDat.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderDat.java
@@ -23,25 +23,31 @@
private TestExtensionTreeData child = new TestExtensionTreeData(null, "Child", null, null);
+ @Override
public Object[] getChildren(Object parentElement) {
return new Object[] { child } ;
}
+ @Override
public Object getParent(Object element) {
return null;
}
+ @Override
public boolean hasChildren(Object element) {
return getChildren(element).length > 0;
}
+ @Override
public Object[] getElements(Object inputElement) {
return null;
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderNoChildren.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderNoChildren.java
index 99c9494..4c7eedd 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderNoChildren.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderNoChildren.java
@@ -24,68 +24,85 @@
public static boolean _hasChildrenTrue;
+ @Override
public Object[] getChildren(Object parentElement) {
return new Object[] {};
}
+ @Override
public Object getParent(Object element) {
return null;
}
+ @Override
public boolean hasChildren(Object element) {
throw new RuntimeException("Should not be called");
}
+ @Override
public Object[] getElements(Object inputElement) {
return null;
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
+ @Override
public void init(ICommonContentExtensionSite config) {
}
+ @Override
public void restoreState(IMemento memento) {
}
+ @Override
public void saveState(IMemento memento) {
}
+ @Override
public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
theCurrentChildren.clear();
}
+ @Override
public void getPipelinedElements(Object anInput, Set theCurrentElements) {
theCurrentElements.clear();
}
+ @Override
public Object getPipelinedParent(Object anObject, Object aSuggestedParent) {
return null;
}
+ @Override
public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) {
return null;
}
+ @Override
public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) {
return null;
}
+ @Override
public boolean interceptRefresh(PipelinedViewerUpdate aRefreshSynchronization) {
return false;
}
+ @Override
public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) {
return false;
}
+ @Override
public boolean hasPipelinedChildren(Object anInput, boolean currentHasChildren) {
if (_hasChildrenTrue)
return true;
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderPipelined.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderPipelined.java
index e7c99bd..376cf35 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderPipelined.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderPipelined.java
@@ -38,6 +38,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedChildren
* (java.lang.Object, java.util.Set)
*/
+ @Override
public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
if (_throw)
throw new RuntimeException("did not work out");
@@ -53,6 +54,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedElements
* (java.lang.Object, java.util.Set)
*/
+ @Override
public void getPipelinedElements(Object anInput, Set theCurrentElements) {
if (_throw)
throw new RuntimeException("did not work out");
@@ -62,6 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IPipelinedTreeContentProviderHasChildren#hasPipelinedChildren(java.lang.Object, boolean)
*/
+ @Override
public boolean hasPipelinedChildren(Object anInput, boolean currentHasChildren) {
if (_throw)
throw new RuntimeException("did not work out");
@@ -75,6 +78,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedParent
* (java.lang.Object, java.lang.Object)
*/
+ @Override
public Object getPipelinedParent(Object anObject, Object aSuggestedParent) {
if (_throw)
throw new RuntimeException("did not work out");
@@ -88,6 +92,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptAdd(org
* .eclipse.ui.navigator.PipelinedShapeModification)
*/
+ @Override
public PipelinedShapeModification interceptAdd(
PipelinedShapeModification anAddModification) {
if (_throw)
@@ -102,6 +107,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRefresh
* (org.eclipse.ui.navigator.PipelinedViewerUpdate)
*/
+ @Override
public boolean interceptRefresh(
PipelinedViewerUpdate aRefreshSynchronization) {
if (_throw)
@@ -116,6 +122,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRemove
* (org.eclipse.ui.navigator.PipelinedShapeModification)
*/
+ @Override
public PipelinedShapeModification interceptRemove(
PipelinedShapeModification aRemoveModification) {
if (_throw)
@@ -130,6 +137,7 @@
* org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptUpdate
* (org.eclipse.ui.navigator.PipelinedViewerUpdate)
*/
+ @Override
public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) {
if (_throw)
throw new RuntimeException("did not work out");
@@ -143,6 +151,7 @@
* org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator
* .ICommonContentExtensionSite)
*/
+ @Override
public void init(ICommonContentExtensionSite aConfig) {
}
@@ -154,6 +163,7 @@
* org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento
* )
*/
+ @Override
public void restoreState(IMemento aMemento) {
}
@@ -164,6 +174,7 @@
* @see
* org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento aMemento) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderResource.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderResource.java
index ef1954d..14e9f27 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderResource.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestContentProviderResource.java
@@ -23,6 +23,7 @@
_returnBadObject = false;
}
+ @Override
public Object[] getChildren(Object parentElement) {
if (_returnBadObject && parentElement instanceof IProject)
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestCopyDropAssistant.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestCopyDropAssistant.java
index cc6e671..7bcfde7 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestCopyDropAssistant.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestCopyDropAssistant.java
@@ -21,11 +21,13 @@
public class TestCopyDropAssistant extends ResourceDropAdapterAssistant {
+ @Override
public IStatus handleDrop(CommonDropAdapter aDropAdapter,
DropTargetEvent aDropTargetEvent, Object aTarget) {
return super.handleDrop(aDropAdapter, aDropTargetEvent, aTarget);
}
+ @Override
public IStatus validateDrop(Object target, int operation,
TransferData transferType) {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestDragAssistant.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestDragAssistant.java
index d3d549e..2f3045a 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestDragAssistant.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestDragAssistant.java
@@ -33,12 +33,14 @@
_finishedSelection = null;
}
+ @Override
public void dragStart(DragSourceEvent anEvent,
IStructuredSelection aSelection) {
super.dragStart(anEvent, aSelection);
anEvent.doit = _doit;
}
+ @Override
public boolean setDragData(DragSourceEvent anEvent,
IStructuredSelection aSelection) {
super.setDragData(anEvent, aSelection);
@@ -46,6 +48,7 @@
return true;
}
+ @Override
public void dragFinished(DragSourceEvent anEvent,
IStructuredSelection aSelection) {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestEmptyContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestEmptyContentProvider.java
index fa87c16..c5154a3 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestEmptyContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestEmptyContentProvider.java
@@ -27,6 +27,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parentElement) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -36,6 +37,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -45,6 +47,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
*/
+ @Override
public boolean hasChildren(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -54,13 +57,16 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
if (_throw)
throw new RuntimeException("Throwing...");
return NO_CHILDREN;
}
+ @Override
public void dispose() {}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionAdapterFactory.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionAdapterFactory.java
index 56109bd..e54b4ab 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionAdapterFactory.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionAdapterFactory.java
@@ -21,6 +21,7 @@
private static final Class[] ADAPTED_TYPES = new Class[] { IRESOURCE_TYPE, IFILE_TYPE };
+ @Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
if(IRESOURCE_TYPE == adapterType || IFILE_TYPE == adapterType) {
TestExtensionTreeData data = (TestExtensionTreeData) adaptableObject;
@@ -29,6 +30,7 @@
return null;
}
+ @Override
public Class[] getAdapterList() {
return ADAPTED_TYPES;
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java
index 22234c8..f69c1fa 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java
@@ -69,15 +69,18 @@
return name;
}
+ @Override
public int hashCode() {
return name.hashCode();
}
+ @Override
public boolean equals(Object obj) {
return obj instanceof TestExtensionTreeData
&& ((TestExtensionTreeData) obj).getName().equals(name);
}
+ @Override
public String toString() {
StringBuffer toString = new StringBuffer(getName()).append(":");
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestFilterItemsThatEndIn3.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestFilterItemsThatEndIn3.java
index 66016bb..7e2cf81 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestFilterItemsThatEndIn3.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestFilterItemsThatEndIn3.java
@@ -23,6 +23,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public boolean select(Viewer viewer, Object parentElement, Object element) {
if(element instanceof TestExtensionTreeData) {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelDecorator.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelDecorator.java
index 1ea6c01..2ea182b 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelDecorator.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelDecorator.java
@@ -25,6 +25,7 @@
}
+ @Override
public Image decorateImage(Image image, Object element) {
if(element != null && element instanceof TestExtensionTreeData) {
TestExtensionTreeData data = (TestExtensionTreeData) element;
@@ -36,6 +37,7 @@
return null;
}
+ @Override
public String decorateText(String text, Object element) {
if(element instanceof TestExtensionTreeData) {
@@ -46,20 +48,24 @@
return null;
}
+ @Override
public void addListener(ILabelProviderListener listener) {
// no-op
}
+ @Override
public void dispose() {
// no-op
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return true;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
// no-op
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java
index e88f972..7fbb8ec 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java
@@ -56,6 +56,7 @@
boldFontData.setStyle(SWT.BOLD);
}
+ @Override
public void init(ICommonContentExtensionSite aSite) {
boldFont = new Font(Display.getDefault(), boldFontData);
initSubclass();
@@ -79,6 +80,7 @@
return backgroundColorName;
}
+ @Override
public Image getImage(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -88,6 +90,7 @@
return image;
}
+ @Override
public String getText(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -106,6 +109,7 @@
return element.toString();
}
+ @Override
public String getDescription(Object anElement) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -116,30 +120,35 @@
return null;
}
+ @Override
public void restoreState(IMemento aMemento) {
if (_throw)
throw new RuntimeException("Throwing...");
}
+ @Override
public void saveState(IMemento aMemento) {
if (_throw)
throw new RuntimeException("Throwing...");
}
+ @Override
public Color getForeground(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
return toForegroundColor(getTestColor());
}
+ @Override
public Color getBackground(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
return getTestColor();
}
+ @Override
public Font getFont(Object element) {
if (_throw)
throw new RuntimeException("Throwing...");
@@ -152,6 +161,7 @@
return font;
}
+ @Override
public void dispose() {
if (_throw)
throw new RuntimeException("Throwing...");
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java
index 743ec8c..7ed0f61 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java
@@ -26,6 +26,7 @@
public static TestLabelProviderBlank instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(SWT.COLOR_RED);
backgroundColorName = "Red";
@@ -35,6 +36,7 @@
instance = this;
}
+ @Override
public void init(ICommonContentExtensionSite aSite) {
super.init(aSite);
_blank = true;
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java
index ab6de0b..0a14aef 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java
@@ -25,6 +25,7 @@
public static TestLabelProviderBlue instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(
SWT.COLOR_BLUE);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java
index b636f0d..c63ca0b 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java
@@ -25,6 +25,7 @@
public static TestLabelProviderCyan instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(
SWT.COLOR_CYAN);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java
index 6cdcffd..631cb0c 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java
@@ -24,6 +24,7 @@
public class TestLabelProviderPlainGreen extends TestLabelProvider {
public static TestLabelProviderPlainGreen instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(
SWT.COLOR_GREEN);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java
index db37c97..3380e03 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java
@@ -24,6 +24,7 @@
public class TestLabelProviderPlainRed extends TestLabelProvider {
public static TestLabelProviderPlainRed instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(
SWT.COLOR_RED);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java
index 33ceac1..71afb72 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java
@@ -24,6 +24,7 @@
public class TestLabelProviderStyledGreen extends TestStyledLabelProvider {
public static TestLabelProviderStyledGreen instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(
SWT.COLOR_GREEN);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java
index 7a748cf..248d65b 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java
@@ -24,6 +24,7 @@
public class TestLabelProviderStyledRed extends TestStyledLabelProvider {
public static TestLabelProviderStyledRed instance;
+ @Override
protected void initSubclass() {
backgroundColor = Display.getCurrent().getSystemColor(
SWT.COLOR_RED);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLinkHelper.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLinkHelper.java
index 86d6e50..25f6630 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLinkHelper.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLinkHelper.java
@@ -46,6 +46,7 @@
activateEditorCount = 0;
}
+ @Override
public IStructuredSelection findSelection(IEditorInput anInput) {
findSelectionEditorInput = anInput;
findSelectionCount++;
@@ -57,6 +58,7 @@
return StructuredSelection.EMPTY;
}
+ @Override
public void activateEditor(IWorkbenchPage aPage,
IStructuredSelection aSelection) {
activateEditorCount++;
@@ -72,6 +74,7 @@
}
}
+ @Override
public String toString() {
return "findSel: " + findSelectionEditorInput + " (" + findSelectionCount + ") activate: " + activateEditorSelection + " (" + activateEditorCount + ")";
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java
index 1ac4fbb..8e812e5 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java
@@ -46,6 +46,7 @@
private String _id;
+ @Override
public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
_track(CHILDREN, aParent, _id);
}
@@ -53,6 +54,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedElements(java.lang.Object, java.util.Set)
*/
+ @Override
public void getPipelinedElements(Object anInput, Set currentElements) {
List newElements = new ArrayList();
for (Iterator it = currentElements.iterator(); it.hasNext();) {
@@ -69,6 +71,7 @@
}
+ @Override
public boolean hasPipelinedChildren(Object anInput, boolean currentHasChildren) {
return currentHasChildren;
}
@@ -104,6 +107,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptAdd(org.eclipse.ui.navigator.PipelinedShapeModification)
*/
+ @Override
public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) {
Set children = anAddModification.getChildren();
for (Iterator it = children.iterator(); it.hasNext(); ) {
@@ -115,6 +119,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRefresh(org.eclipse.ui.navigator.PipelinedViewerUpdate)
*/
+ @Override
public boolean interceptRefresh(PipelinedViewerUpdate update) {
Set targets = update.getRefreshTargets();
for (Iterator it = targets.iterator(); it.hasNext(); ) {
@@ -126,6 +131,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRemove(org.eclipse.ui.navigator.PipelinedShapeModification)
*/
+ @Override
public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) {
Set children = aRemoveModification.getChildren();
for (Iterator it = children.iterator(); it.hasNext(); ) {
@@ -137,6 +143,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptUpdate(org.eclipse.ui.navigator.PipelinedViewerUpdate)
*/
+ @Override
public boolean interceptUpdate(PipelinedViewerUpdate update) {
Set targets = update.getRefreshTargets();
for (Iterator it = targets.iterator(); it.hasNext(); ) {
@@ -148,6 +155,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
*/
+ @Override
public void init(ICommonContentExtensionSite config) {
_id = config.getExtension().getId();
int i = _id.lastIndexOf('.');
@@ -160,6 +168,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parentElement) {
try {
_track(CHILDREN, parentElement, _id + "1");
@@ -173,6 +182,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object element) {
return null;
}
@@ -180,6 +190,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
*/
+ @Override
public boolean hasChildren(Object element) {
return false;
}
@@ -187,6 +198,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object inputElement) {
_track(ELEMENTS, inputElement, _id + "1");
return null;
@@ -195,6 +207,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
}
@@ -202,6 +215,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
@@ -209,6 +223,7 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento)
*/
+ @Override
public void restoreState(IMemento aMemento) {
}
@@ -216,10 +231,12 @@
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento aMemento) {
}
+ @Override
protected Object _convertToModelObject(Object object)
{
if (object instanceof IResource) {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java
index aa4c4c5..007809d 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java
@@ -32,6 +32,7 @@
public String _name;
public Object _parent;
+ @Override
public String toString() {
return _name;
}
@@ -40,10 +41,12 @@
public TestSimpleChildrenContentProvider() {
}
+ @Override
public Object[] getElements(Object inputElement) {
return getChildren(inputElement);
}
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof IResource) {
if (_children == null) {
@@ -61,19 +64,23 @@
return new Object[] {};
}
+ @Override
public Object getParent(Object element) {
SimpleChild child = (SimpleChild) element;
return child._parent;
}
+ @Override
public boolean hasChildren(Object element) {
return true;
}
+ @Override
public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
_children = null;
}
+ @Override
public void dispose() {
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterData.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterData.java
index 1e0ccad..7053423 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterData.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterData.java
@@ -38,6 +38,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public int compare(Viewer viewer, Object e1, Object e2) {
if(e1 instanceof TestExtensionTreeData) {
@@ -58,7 +59,8 @@
}
- public boolean isSorterProperty(Object element, String property) {
+ @Override
+ public boolean isSorterProperty(Object element, String property) {
_sorterProperty = property;
_sorterElement = element;
return false;
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterDataAndResource.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterDataAndResource.java
index f128dfa..34911c1 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterDataAndResource.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterDataAndResource.java
@@ -28,6 +28,7 @@
super(collator);
}
+ @Override
public int compare(Viewer viewer, Object e1, Object e2) {
String lname = "";
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterResource.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterResource.java
index 9821f44..774efa5 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterResource.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSorterResource.java
@@ -37,6 +37,7 @@
super(collator);
}
+ @Override
public int compare(Viewer viewer, Object e1, Object e2) {
if(e1 instanceof IResource) {
@@ -57,7 +58,8 @@
}
- public boolean isSorterProperty(Object element, String property) {
+ @Override
+ public boolean isSorterProperty(Object element, String property) {
_sorterProperty = property;
_sorterElement = element;
return false;
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestStyledLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestStyledLabelProvider.java
index 7fbc2ee..523ece0 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestStyledLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestStyledLabelProvider.java
@@ -16,6 +16,7 @@
public abstract class TestStyledLabelProvider extends TestLabelProvider implements
IStyledLabelProvider {
+ @Override
public StyledString getStyledText(Object element) {
if (_blank || _null)
return new StyledString("");
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
index 4f47f2a..f5e3d74 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
@@ -58,6 +58,7 @@
private String _id;
+ @Override
public void init(ICommonContentExtensionSite config) {
_id = config.getExtension().getId();
int i = _id.lastIndexOf('.');
@@ -66,6 +67,7 @@
}
}
+ @Override
public Image getImage(Object element) {
_track(imageQueries, element);
return null;
@@ -80,37 +82,45 @@
System.out.println(_id + ": " + element + " map: " + map);
}
+ @Override
public String getText(Object element) {
_track(textQueries, element);
return null;
}
+ @Override
public String getDescription(Object element) {
_track(descriptionQueries, element);
return null;
}
+ @Override
public Color getBackground(Object element) {
_track(backgroundQueries, element);
return null;
}
+ @Override
public Color getForeground(Object element) {
_track(foregroundQueries, element);
return null;
}
+ @Override
public Font getFont(Object element) {
_track(fontQueries, element);
return null;
}
+ @Override
public StyledString getStyledText(Object element) {
_track(styledTextQueries, element);
return null;
}
+ @Override
public void restoreState(IMemento aMemento) {}
+ @Override
public void saveState(IMemento aMemento) {}
public static void resetQueries() {
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java
index ee427c2..471e27c 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java
@@ -26,14 +26,17 @@
this.compressedProject = compressedProject;
}
+ @Override
public Image getImage() {
return null;
}
+ @Override
public String getLabel() {
return "Compressed Libraries";
}
+ @Override
public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
List classpathContainers = new ArrayList();
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java
index 6c14b1e..5b38445 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java
@@ -33,10 +33,12 @@
this.project = project;
}
+ @Override
public Image getImage() {
return null;
}
+ @Override
public String getLabel() {
return determineLabel();
}
@@ -58,6 +60,7 @@
return project;
}
+ @Override
public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
List nonExternalSourceFolders = getNonExternalSourceFolders();
@@ -97,6 +100,7 @@
}
+ @Override
public Object getAdapter(Class adapter) {
return Platform.getAdapterManager().getAdapter(this, adapter);
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
index 9bf9bcb..d316ba5 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
@@ -33,6 +33,7 @@
_navigatorInstanceId = TEST_VIEWER_PIPELINE;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaContentProvider.java
index 912dbbc..8228b87 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaContentProvider.java
@@ -76,6 +76,7 @@
return m.invoke(null, new Object[] { res });
}
+ @Override
public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
try {
if (aParent instanceof IProject) {
@@ -112,9 +113,11 @@
return result;
}
+ @Override
public void getPipelinedElements(Object anInput, Set theCurrentElements) {
}
+ @Override
public Object getPipelinedParent(Object anObject, Object aSuggestedParent) {
try {
@@ -147,29 +150,35 @@
return null;
}
+ @Override
public PipelinedShapeModification interceptAdd(
PipelinedShapeModification anAddModification) {
return anAddModification;
}
+ @Override
public PipelinedShapeModification interceptRemove(
PipelinedShapeModification aRemoveModification) {
return aRemoveModification;
}
+ @Override
public boolean interceptRefresh(
PipelinedViewerUpdate aRefreshSynchronization) {
return false;
}
+ @Override
public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) {
return false;
}
+ @Override
public void init(ICommonContentExtensionSite aSite) {
}
+ @Override
public Object[] getChildren(Object parentElement) {
if (delegateContentProvider != null) {
if (parentElement instanceof CompressedJavaProject) {
@@ -183,6 +192,7 @@
return NO_CHILDREN;
}
+ @Override
public Object getParent(Object element) {
if (element instanceof CompressedJavaProject)
return ((CompressedJavaProject) element).getProject();
@@ -191,18 +201,22 @@
return null;
}
+ @Override
public boolean hasChildren(Object element) {
return (element instanceof CompressedJavaProject || element instanceof CompressedJavaLibraries);
}
+ @Override
public Object[] getElements(Object inputElement) {
return NO_CHILDREN;
}
+ @Override
public void dispose() {
compressedNodes.clear();
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (viewer instanceof CommonViewer) {
commonViewer = (CommonViewer) viewer;
@@ -217,10 +231,12 @@
}
+ @Override
public void restoreState(IMemento aMemento) {
}
+ @Override
public void saveState(IMemento aMemento) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaLabelProvider.java
index 84f1b7b..2935241 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/WebJavaLabelProvider.java
@@ -16,6 +16,7 @@
public class WebJavaLabelProvider implements ILabelProvider {
+ @Override
public Image getImage(Object element) {
if(element instanceof ICompressedNode)
return ((ICompressedNode)element).getImage();
@@ -23,23 +24,28 @@
return null;
}
+ @Override
public String getText(Object element) {
if(element instanceof ICompressedNode)
return ((ICompressedNode)element).getLabel();
return null;
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1AdapterFactory.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1AdapterFactory.java
index 1e0a155..8462fca 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1AdapterFactory.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1AdapterFactory.java
@@ -18,6 +18,7 @@
public class M1AdapterFactory implements IAdapterFactory {
+ @Override
public Object getAdapter(Object object, Class adapterType) {
if (object instanceof M1Project
&& IProject.class.isAssignableFrom(adapterType)) {
@@ -29,6 +30,7 @@
return null;
}
+ @Override
public Class[] getAdapterList() {
return new Class[] { IProject.class };
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1ContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1ContentProvider.java
index 56ffe7f..43ddb47 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1ContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M1ContentProvider.java
@@ -28,6 +28,7 @@
* with M1Files.
*/
public class M1ContentProvider extends ResourceWrapperContentProvider {
+ @Override
public void getPipelinedElements(Object input, Set currentElements) {
List newElements = new ArrayList();
for (Iterator it = currentElements.iterator(); it.hasNext();) {
@@ -41,6 +42,7 @@
currentElements.addAll(newElements);
}
+ @Override
public Object[] getChildren(Object parentElement) {
try {
return ((ResourceWrapper) parentElement).getChildren();
@@ -50,10 +52,12 @@
}
}
+ @Override
public boolean hasPipelinedChildren(Object anInput, boolean currentHasChildren) {
return currentHasChildren;
}
+ @Override
protected Object _convertToModelObject(Object object) {
if (object instanceof IResource) {
return M1Core.getModelObject((IResource) object);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M2ContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M2ContentProvider.java
index f90cb18..7f6db5f 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M2ContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/M2ContentProvider.java
@@ -20,6 +20,7 @@
/** Replaces M1Files whose name contain the character 2 with M2Files. */
public class M2ContentProvider extends ResourceWrapperContentProvider {
+ @Override
public void getPipelinedChildren(Object aParent, Set currentChildren) {
List newElements = new ArrayList();
for (Iterator it = currentChildren.iterator(); it.hasNext();) {
@@ -33,10 +34,12 @@
currentChildren.addAll(newElements);
}
+ @Override
public boolean hasPipelinedChildren(Object anInput, boolean currentHasChildren) {
return currentHasChildren;
}
+ @Override
protected Object _convertToModelObject(Object object) {
return M2Core.getModelObject(object);
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperContentProvider.java
index e75e623..b2b283b 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperContentProvider.java
@@ -39,21 +39,25 @@
_counters = new HashMap();
}
+ @Override
public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
// Nothing to do, we replaced IProjects with ModelProjects in
// getPipelinedElements
// and from there children are provided by getChildren.
}
+ @Override
public void getPipelinedElements(Object input, Set currentElements) {
}
+ @Override
public Object getPipelinedParent(Object object, Object suggestedParent) {
return (object instanceof ResourceWrapper) ? ((ResourceWrapper) object)
.getParent() : suggestedParent;
}
+ @Override
public void init(ICommonContentExtensionSite aConfig) {
// ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
// IResourceChangeEvent.PRE_BUILD |
@@ -63,10 +67,12 @@
// IResourceChangeEvent.PRE_CLOSE);
}
+ @Override
public Object[] getChildren(Object parentElement) {
return NO_CHILDREN;
}
+ @Override
public Object getParent(Object element) {
if (element instanceof ResourceWrapper) {
return ((ResourceWrapper) element).getParent();
@@ -75,6 +81,7 @@
}
}
+ @Override
public boolean hasChildren(Object element) {
try {
return ((ResourceWrapper) element).hasChildren();
@@ -84,26 +91,32 @@
}
}
+ @Override
public Object[] getElements(Object inputElement) {
return NO_CHILDREN;
}
+ @Override
public void dispose() {
// not implemented
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// _viewer = viewer;
}
+ @Override
public void restoreState(IMemento aMemento) {
// not implemented
}
+ @Override
public void saveState(IMemento aMemento) {
// not implemented
}
+ @Override
public PipelinedShapeModification interceptAdd(
PipelinedShapeModification modification) {
_convertToModelObjects(modification);
@@ -111,6 +124,7 @@
return modification;
}
+ @Override
public PipelinedShapeModification interceptRemove(
PipelinedShapeModification modification) {
_incrementCounter(INTERCEPT_REMOVE);
@@ -118,12 +132,14 @@
return modification;
}
+ @Override
public boolean interceptRefresh(PipelinedViewerUpdate refreshSynchronization) {
_incrementCounter(INTERCEPT_REFRESH);
return _convertToModelObjects(refreshSynchronization
.getRefreshTargets());
}
+ @Override
public boolean interceptUpdate(PipelinedViewerUpdate update) {
_incrementCounter(INTERCEPT_UPDATE);
return _convertToModelObjects(update.getRefreshTargets());
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperLabelProvider.java
index 272c116..44d4802 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/ResourceWrapperLabelProvider.java
@@ -21,6 +21,7 @@
public class ResourceWrapperLabelProvider implements ILabelProvider {
+ @Override
public Image getImage(Object element) {
ISharedImages sharedImages = PlatformUI.getWorkbench()
.getSharedImages();
@@ -34,22 +35,27 @@
return null;
}
+ @Override
public String getText(Object element) {
ResourceWrapper res = (ResourceWrapper) element;
return "[" + res.getModelId() + "] " + res.getResource().getName();
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Container.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Container.java
index ceb4770..a0fd194 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Container.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Container.java
@@ -13,6 +13,7 @@
public M1Container(IContainer container) {
super(container);
}
+ @Override
public M1Resource[] getChildren() throws CoreException {
IContainer container = (IContainer) getResource();
IResource[] children = (container.isAccessible()) ? container.members()
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Project.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Project.java
index e43c355..ba60c4c 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Project.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Project.java
@@ -14,6 +14,7 @@
public M1Project(IProject project) {
super(project);
}
+ @Override
public Object getAdapter(Class adapter) {
return Platform.getAdapterManager().getAdapter(this, adapter);
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Resource.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Resource.java
index 45f47bb..2b13152 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Resource.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M1Resource.java
@@ -13,9 +13,11 @@
public M1Resource(IResource resource) {
super(resource);
}
+ @Override
protected ResourceWrapper getModelObject(IResource resource) {
return M1Core.getModelObject(resource);
}
+ @Override
public String getModelId() {
return "M1";
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M2Resource.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M2Resource.java
index 2bf4537..c99ac1c 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M2Resource.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/M2Resource.java
@@ -11,9 +11,11 @@
public M2Resource(IResource resource) {
super(resource);
}
+ @Override
protected ResourceWrapper getModelObject(IResource resource) {
return M2Core.getModelObject(resource);
}
+ @Override
public String getModelId() {
return "M2";
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/ResourceWrapper.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/ResourceWrapper.java
index 3dca191..7fc61bc 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/ResourceWrapper.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/m12/model/ResourceWrapper.java
@@ -19,6 +19,7 @@
public IResource getResource() {
return _resource;
}
+ @Override
public Object[] getChildren(Object obj) {
return NO_CHILDREN;
}
@@ -29,15 +30,18 @@
M1Resource[] children = getChildren();
return children.length > 0;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof M1Resource) {
return _resource.equals(((M1Resource) obj).getResource());
}
return false;
}
+ @Override
public int hashCode() {
return _resource.hashCode();
}
+ @Override
public Object getParent(Object obj) {
return getParent();
}
@@ -49,9 +53,11 @@
protected abstract ResourceWrapper getModelObject(IResource resource);
public abstract String getModelId();
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return null;
}
+ @Override
public String getLabel(Object o) {
return _resource.toString();
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ExportWizard1.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ExportWizard1.java
index 8f5ae87..0df9780 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ExportWizard1.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ExportWizard1.java
@@ -25,10 +25,12 @@
public ExportWizard1() {
}
+ @Override
public boolean performFinish() {
return false;
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ImportWizard1.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ImportWizard1.java
index a8f346a..54d2604 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ImportWizard1.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/ImportWizard1.java
@@ -26,10 +26,12 @@
public ImportWizard1() {
}
+ @Override
public boolean performFinish() {
return false;
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/NewWizard1.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/NewWizard1.java
index f5e6746..538e425 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/NewWizard1.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/wizards/NewWizard1.java
@@ -26,10 +26,12 @@
public NewWizard1() {
}
+ @Override
public boolean performFinish() {
return false;
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
}
