Compiler warning elimination

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / common / VTKContentOutlinePage.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKContentOutlinePage.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKContentOutlinePage.java
index 7c64fec045411bbea50a668ffb437058b1e9fb2a..3a9cd997f393b8a705d704fee4a645ff84d550ee 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKContentOutlinePage.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKContentOutlinePage.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 package org.simantics.g3d.vtk.common;\r
 \r
 import java.util.ArrayList;\r
@@ -15,12 +26,12 @@ import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.g3d.tools.AdaptationUtils;\r
 import org.simantics.g3d.ui.ScenegraphOutlinePage;\r
 \r
-public class VTKContentOutlinePage<DBObject,JavaObject> extends ScenegraphOutlinePage{\r
-       private NodeSelectionProvider2<DBObject,JavaObject> provider;\r
+public class VTKContentOutlinePage<DBObject, JavaObject extends INode> extends ScenegraphOutlinePage{\r
+       private NodeSelectionProvider2<DBObject, JavaObject> provider;\r
        \r
-       public VTKContentOutlinePage(ParentNode<? extends INode> rootNode, NodeSelectionProvider2<DBObject,JavaObject> provider) {\r
+       public VTKContentOutlinePage(ParentNode<? extends JavaObject> rootNode, NodeSelectionProvider2<DBObject, JavaObject> selectionProvider) {\r
                super(rootNode);\r
-               this.provider = provider;\r
+               this.provider = selectionProvider;\r
        }\r
        \r
        private boolean outsideSelection = false;\r