git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@7316 ac1ea38d...

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
index 43a53a27517b2919e9c859f500fc8480c3b7cff4..adfcc6527cf717428885a62e490d0ba95a26c2f9 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
@@ -262,7 +262,7 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
      * @param root\r
      * @return\r
      */\r
-    protected abstract NodeTransformationQuery newTransformationListener(G3DNode root);\r
+    protected abstract NodeTransformationQuery newTransformationListener(G3DNode node);\r
     \r
     /**\r
      * Returns propertyQuery for the root node.\r

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/SelectionAdapter.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/SelectionAdapter.java
index 22b6bc6efdbdc7393b588b699cc8f3103a0b0b82..f3f9df914585e1a7f63be1a2cd93083bf4e84747 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/SelectionAdapter.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/SelectionAdapter.java
@@ -43,6 +43,8 @@ public abstract class SelectionAdapter implements ISelectionProvider{
        private Gizmo currentGizmo = null;\r
        \r
        public SelectionAdapter(ScenegraphAdapter adapter) {\r
+               if (adapter == null)\r
+                       throw new NullPointerException("Scenegraph adapter must no be null");\r
                this.adapter = adapter;\r
        }\r
        \r
@@ -393,7 +395,11 @@ public abstract class SelectionAdapter implements ISelectionProvider{
      * @param s\r
      * @return the filtered selection\r
      */\r
-    protected abstract StructuredResourceSelection filterSelection(ISelection s);\r
+    protected StructuredResourceSelection filterSelection(ISelection s) {\r
+       if (!(selection instanceof StructuredResourceSelection))\r
+                       return new StructuredResourceSelection();\r
+               return (StructuredResourceSelection) selection;\r
+    }\r
 \r
     /**\r
      * Updates visual part of selection event. Use getCurrentSelection() to get\r