From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Sun, 20 Jun 2010 10:13:44 +0000 (+0000)
Subject: Look for variable from diagram elements in sysdyn ResourceSelectionProcessor.
X-Git-Tag: simantics-1.2.0~205
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f112972d48772b7cbfc3250d03f386223721460f;p=simantics%2Fsysdyn.git

Look for variable from diagram elements in sysdyn ResourceSelectionProcessor.

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

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
index 86cfbf61..52404a86 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
@@ -9,19 +9,31 @@ import org.simantics.browsing.ui.SelectionProcessor;
 import org.simantics.browsing.ui.swt.ComparableTabContributor;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;
 import org.simantics.db.exception.ServiceException;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.modeling.ModelingResources;
 import org.simantics.sysdyn.SysdynResource;
 import org.simantics.ui.utils.AdaptionUtils;
 
 public class ResourceSelectionProcessor implements SelectionProcessor<ISelection, ReadGraph>  {
-    
+
     @Override
     public Collection<?> process(ISelection selection, ReadGraph backend) {
         Resource r = AdaptionUtils.adaptToSingle(selection, Resource.class);
-        if(r != null)
+        if(r == null)
+            return Collections.emptyList();
+
         try {
             SysdynResource sr = SysdynResource.getInstance(backend);
+            DiagramResource dr = DiagramResource.getInstance(backend);
+            ModelingResources mr = ModelingResources.getInstance(backend);
             Collection<ComparableTabContributor> tabs = new ArrayList<ComparableTabContributor>();
+            if (backend.isInstanceOf(r, dr.Element)) {
+                Resource component = backend.getPossibleObject(r, mr.ElementToComponent);
+                if (component != null)
+                    r = component;
+            }
             if (backend.isInstanceOf(r, sr.IndependentVariable)) {
                 tabs.add(new ComparableTabContributor(
                         new EquationTab(),
@@ -32,39 +44,41 @@ public class ResourceSelectionProcessor implements SelectionProcessor<ISelection
                         new VariableInformationTab(),
                         1,
                         r,
-                        "Additional Information"));                
+                "Additional Information"));
                 return tabs;
             }
             if (backend.isInstanceOf(r, sr.Configuration))
                 return Collections.singleton(
                         new ComparableTabContributor(
-                            new ConfigurationTab(),
-                            0,
-                            r,
-                            "Configuration Properties"));
+                                new ConfigurationTab(),
+                                0,
+                                r,
+                        "Configuration Properties"));
             if (backend.isInstanceOf(r, sr.Experiment))
                 return Collections.singleton(
                         new ComparableTabContributor(
-                            new ExperimentTab(),
-                            0,
-                            r,
-                            "Experiment Properties"));
+                                new ExperimentTab(),
+                                0,
+                                r,
+                        "Experiment Properties"));
             if (backend.isInstanceOf(r, sr.SysdynModel))
                 return Collections.singleton(
                         new ComparableTabContributor(
-                            new ModelTab(),
-                            0,
-                            r,
-                            "Model Properties"));
+                                new ModelTab(),
+                                0,
+                                r,
+                        "Model Properties"));
             if (backend.isInstanceOf(r, sr.Result))
                 return Collections.singleton(
                         new ComparableTabContributor(
-                            new ResultTab(),
-                            0,
-                            r,
-                            "Result Properties"));
+                                new ResultTab(),
+                                0,
+                                r,
+                        "Result Properties"));
         } catch (ServiceException e) {
             e.printStackTrace();
+        } catch (ManyObjectsForFunctionalRelationException e) {
+            e.printStackTrace();
         }
         return Collections.emptyList();
     }