Fix Sysdyn drop operations.

refs #5170

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30066 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/AxisDropAction.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/AxisDropAction.java
index 20f79bb0276fd28c30408c5eb7e0171868a555d6..40bca222405f68e5dfa02ff6d1b54429393a14c3 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/AxisDropAction.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/AxisDropAction.java
@@ -34,7 +34,7 @@ import org.simantics.utils.ui.AdaptionUtils;
 public class AxisDropAction  implements DropActionFactory {\r
 \r
     @Override\r
-    public Runnable create(ReadGraph g, Object target, Object source) throws DatabaseException {\r
+    public Runnable create(ReadGraph g, Object target, Object source, int operation) throws DatabaseException {\r
         // Make sure that both target and source are resources\r
         Resource t = AdaptionUtils.adaptToSingle(target, Resource.class);\r
         Resource s = AdaptionUtils.adaptToSingle(source, Resource.class);\r

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/SeriesDropAction.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/SeriesDropAction.java
index 5870cd5290c528e717b594766a5c7e90b3709c99..41c6bb69cfe9443aebf9ce207f21e84dacf7939c 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/SeriesDropAction.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/ge/SeriesDropAction.java
@@ -38,7 +38,7 @@ import org.simantics.utils.ui.AdaptionUtils;
 public class SeriesDropAction implements DropActionFactory {\r
 \r
     @Override\r
-    public Runnable create(ReadGraph g, Object target, Object source) throws DatabaseException {\r
+    public Runnable create(ReadGraph g, Object target, Object source, int operation) throws DatabaseException {\r
         // Make sure that both target and source are resources\r
         Resource t = AdaptionUtils.adaptToSingle(target, Resource.class);\r
         Resource s = AdaptionUtils.adaptToSingle(source, Resource.class);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/ChartDropAction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/ChartDropAction.java
index 27c0272ce80dad29f28ad75f5948f58b1910becc..e5e308acf4d64a9c60f7a3d8989f5e1c513a3088 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/ChartDropAction.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/ChartDropAction.java
@@ -40,7 +40,7 @@ import org.simantics.utils.ui.AdaptionUtils;
 public class ChartDropAction implements DropActionFactory {\r
 \r
     @Override\r
-    public Runnable create(ReadGraph g, Object target, Object source) throws DatabaseException {\r
+    public Runnable create(ReadGraph g, Object target, Object source, int operation) throws DatabaseException {\r
 \r
         final Resource targetChart = AdaptionUtils.adaptToSingle(target, Resource.class);\r
         if(targetChart == null || source == null || !(source instanceof IStructuredSelection))\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/FunctionDropAction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/FunctionDropAction.java
index 354f25b3f0135eff9dffd7824cc1247cc3edfd15..cb3e16269837dab440726d4555e0e7e1c09e3e84 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/FunctionDropAction.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/actions/drop/FunctionDropAction.java
@@ -30,7 +30,7 @@ import org.simantics.utils.ui.AdaptionUtils;
 public class FunctionDropAction implements DropActionFactory {\r
 \r
     @Override\r
-    public Runnable create(ReadGraph g, Object target, Object source) throws DatabaseException {\r
+    public Runnable create(ReadGraph g, Object target, Object source, int operation) throws DatabaseException {\r
         Resource t = AdaptionUtils.adaptToSingle(target, Resource.class);\r
         Resource s = AdaptionUtils.adaptToSingle(source, Resource.class);\r
 \r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/ShadowStyle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/ShadowStyle.java
index 5e5f981cf29c274a6d70e3be7de432b6f5c014bc..ee0f442bcf2de267f479906a3ba5639debaccc4b 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/ShadowStyle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/ShadowStyle.java
@@ -50,6 +50,9 @@ public class ShadowStyle extends StyleBase<ShadowResult> {
         AffineTransform transform = DiagramGraphUtil.getAffineTransform(graph, element);\r
         \r
         Resource component = graph.getPossibleObject(element, MOD.ElementToComponent);\r
+        \r
+        if (component == null)\r
+               return new ShadowResult(Style.NONE, transform);\r
 \r
         Resource original = graph.getPossibleObject(component, SR.Shadow_original);\r
         Collection<Resource> shadows = graph.getObjects(component, SR.Shadow_original_Inverse);\r