[245013] Server View based on Common Navigator (final drop)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerContentProvider.java
index c762480..801888d 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerContentProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerContentProvider.java
@@ -267,7 +267,6 @@
protected void refreshServer(final IServer server, final boolean resetSelection) {
Display.getDefault().asyncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
public void run() {
try {
if( viewer != null && !viewer.getControl().isDisposed()) {
@@ -277,7 +276,7 @@
ISelection sel = viewer.getSelection();
viewer.setSelection(sel);
}
- //TODO: Angel says: This doesn't seem to be needed ServerDecorator.getDefault().redecorate(server);
+ //TODO: Angel says: This doesn't seem to be needed: ServerDecorator.getDefault().redecorate(server);
}
} catch (Exception e) {
// ignore
@@ -310,7 +309,6 @@
final int SLEEP = 200;
final Runnable[] animator = new Runnable[1];
animator[0] = new Runnable() {
- @SuppressWarnings("synthetic-access")
public void run() {
if (!stopAnimation) {
try {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerLabelProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerLabelProvider.java
index da731a5..ed2295b 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerLabelProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServerLabelProvider.java
@@ -81,7 +81,6 @@
public boolean isLabelProperty(Object element, String property) {
if (element instanceof IServer){
- IServer server = (IServer)element;
if (property.equalsIgnoreCase("ICON")){
return true;
}
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServersView2.java b/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServersView2.java
index fa0304d..756c187 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServersView2.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/elcipse/wst/server/ui/internal/cnf/ServersView2.java
@@ -30,7 +30,6 @@
import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.INavigatorViewerDescriptor;
import org.eclipse.wst.server.core.*;
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.internal.UpdateServerJob;
@@ -409,8 +408,6 @@
cm.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- INavigatorViewerDescriptor viewDescriptor = getCommonViewer().getNavigatorContentService().getViewerDescriptor();
-
return super.createCommonActionGroup();
}
