Compiler warning elimination

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / editor / Plant3DEditor.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
index 53a0ed2c78ed1298bca72e551986d2fe2f3cd8fc..b11cf90e98e2ea1dc35b116c20f1e5b1d8371db9 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -82,7 +82,6 @@ import vtk.vtkRenderer;
 import vtk.vtkSSAAPass;
 import vtk.vtkSequencePass;
 import vtk.vtkSimpleMotionBlurPass;
-import vtk.vtkSobelGradientMagnitudePass;
 
 
 public class Plant3DEditor extends ResourceEditorPart {
@@ -230,12 +229,12 @@ public class Plant3DEditor extends ResourceEditorPart {
            return new NodeSelectionProvider2<Resource,INode>(this,mapping,nodeMap);
        }
        
-       protected HoverHighlighter createHoverHighlhighter() {
-           return new HoverHighlighter(panel,nodeMap);
+       protected HoverHighlighter<Resource> createHoverHighlhighter() {
+           return new HoverHighlighter<>(panel,nodeMap);
        }
        
-       protected SelectionHighlighter<Resource,INode> createSelectionHighlighter() {
-           return new SelectionHighlighter<Resource,INode>(panel,nodeMap);
+       protected SelectionHighlighter<Resource> createSelectionHighlighter() {
+           return new SelectionHighlighter<Resource>(panel,nodeMap);
        }
        
        protected String getLibraryUri() {
@@ -491,30 +490,29 @@ public class Plant3DEditor extends ResourceEditorPart {
                return outlinePage;
        }
 
-       @SuppressWarnings("rawtypes")
        @Override
-       public Object getAdapter(Class adapter) {
-               if (IPropertyPage.class.equals(adapter))
-                       return new StandardPropertyPage(getSite(),getPropertyContexts());
-               if (IContentOutlinePage.class.equals(adapter)) {
-                       return createOutline();
+       public <T> T getAdapter(Class<T> adapter) {
+               if (adapter.isAssignableFrom(IPropertyPage.class))
+                       return adapter.cast(new StandardPropertyPage(getSite(),getPropertyContexts()));
+               if (adapter.isAssignableFrom(ISelectionProvider.class))
+                       return adapter.cast(selectionProvider);
+               if (adapter.isAssignableFrom(IContentOutlinePage.class)) {
+                       return adapter.cast(createOutline());
                }
-               if (NodeMap.class.equals(adapter)) {
-                       return nodeMap;
+               if (adapter.isAssignableFrom(NodeMap.class)) {
+                       return adapter.cast(nodeMap);
                }
-               if (INode.class.equals(adapter)) {
-                       return rootNode;
+               if (adapter.isAssignableFrom(INode.class)) {
+                       return adapter.cast(rootNode);
                }
-               if (IMapping.class.equals(adapter)) {
-                       return mapping;
+               if (adapter.isAssignableFrom(IMapping.class)) {
+                       return adapter.cast(mapping);
                }
-//             if (InteractiveVtkPanel.class.equals(adapter)) {
-//                     return panel;
+//             if (adapter.isAssignableFrom(InteractiveVtkPanel.class)) {
+//                     return adapter.cast(panel);
 //             }
-               if (VtkView.class.equals(adapter))
-                       return panel;
-               if (ISelectionProvider.class.equals(adapter))
-                       return selectionProvider;
+               if (adapter.isAssignableFrom(VtkView.class))
+                       return adapter.cast(panel);
                return super.getAdapter(adapter);
        }