From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 2 May 2011 06:11:06 +0000 (+0000)
Subject: Added splash.bmp and modified build to include the new OpenModelica
X-Git-Tag: simantics-1.4RC1~27
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=6bfb8bdc1b1af839d82b8af68a370b1f3839a3f6;p=simantics%2Fsysdyn.git

Added splash.bmp and modified build to include the new OpenModelica

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

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index 02b406c4..7b51cef1 100644
--- a/org.simantics.sysdyn.feature/feature.xml
+++ b/org.simantics.sysdyn.feature/feature.xml
@@ -93,20 +93,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.diagram.ontology"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.simantics.structural.ontology"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.simantics.sysdyn.ontology"
          download-size="0"
diff --git a/org.simantics.sysdyn.ui/splash.bmp b/org.simantics.sysdyn.ui/splash.bmp
new file mode 100644
index 00000000..cb932ea1
Binary files /dev/null and b/org.simantics.sysdyn.ui/splash.bmp differ
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java
index 392676a8..b13a6fa2 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java
@@ -26,6 +26,7 @@ import org.simantics.db.management.ISessionContext;
 import org.simantics.db.procedure.AsyncListener;
 import org.simantics.db.request.Read;
 import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.utils.AdaptionUtils;
 import org.simantics.utils.datastructures.Callback;
@@ -50,8 +51,8 @@ public abstract class LabelPropertyTabContributor extends PropertyTabContributor
 	
 	@Override
     public void updatePartName(ISelection forSelection, final Callback<String> updateCallback) {
-    	final Resource r = AdaptionUtils.adaptToSingle(forSelection, Resource.class);
-    	if(r == null) {
+    	final Resource resource = AdaptionUtils.adaptToSingle(forSelection, Resource.class);
+    	if(resource == null) {
     		updateCallback.run("Selection properties");
     		return;
     	}
@@ -62,6 +63,11 @@ public abstract class LabelPropertyTabContributor extends PropertyTabContributor
 				@Override
 				public String perform(ReadGraph graph) throws DatabaseException {
 					Layer0 l0 = Layer0.getInstance(graph);
+					ModelingResources mr = ModelingResources.getInstance(graph);
+					Resource r = resource;
+					if(graph.hasStatement(r, mr.ElementToComponent)) {
+						r = graph.getSingleObject(r, mr.ElementToComponent);
+					}
 					String label = graph.getPossibleRelatedValue(r, l0.HasLabel);
 					if(label != null)
 						return label;
diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product
index 9b282a0c..a9588186 100644
--- a/org.simantics.sysdyn.ui/sysdyn.product
+++ b/org.simantics.sysdyn.ui/sysdyn.product
@@ -14,6 +14,8 @@
 
    <windowImages/>
 
+   <splash
+      location="org.simantics.sysdyn.ui" />
    <launcher name="Simantics-Sysdyn">
       <solaris/>
       <win useIco="false">