(refs #6022) Moved product definition specific material into org.simantics.sysdyn...

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

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/StringChooserModifyListenerImpl.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/StringChooserModifyListenerImpl.java
index 8fa748ddb8ff3998b132fb9f520c8f071b6a266b..aa74aab79d700e3039d5de36b5c1558301a7ee92 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/StringChooserModifyListenerImpl.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/StringChooserModifyListenerImpl.java
@@ -60,6 +60,7 @@ public abstract class StringChooserModifyListenerImpl<T,T2> implements StringCho
                }\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        @Override\r
        public void setInput(ISessionContext context, Object parameter) {\r
                this.context = context;\r

diff --git a/org.simantics.sysdyn.build.feature/jenkins.buckminster.script b/org.simantics.sysdyn.build.feature/jenkins.buckminster.script
new file mode 100644 (file)
index 0000000..e53d744
--- /dev/null
+++ b/org.simantics.sysdyn.build.feature/jenkins.buckminster.script
@@ -0,0 +1,4 @@
+importtargetdefinition -A 'http://www.simantics.org/download/head/simantics.target'\r
+import 'site.cquery'\r
+build\r
+perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.build#site.p2
\ No newline at end of file

diff --git a/org.simantics.sysdyn.internal.feature/feature.xml b/org.simantics.sysdyn.internal.feature/feature.xml
index f77c6dfdd699dea6b5483cda95293de34b3ee33d..df9f51c2fc7594ca1be95a1f571dc0b2360df98a 100644 (file)
--- a/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/org.simantics.sysdyn.internal.feature/feature.xml
@@ -54,4 +54,10 @@ v1.0 which accompanies this distribution, and is available at
          id="org.simantics.sysdyn.internal.p2"\r
          version="0.0.0"/>\r
 \r
+   <plugin\r
+         id="org.simantics.sysdyn.product"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"/>\r
+\r
 </feature>\r

diff --git a/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script b/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
index e3d6ae2d222a312bd97a3a0f58c3e7d6b61a6e4d..0a1299b44520dcc8c006bb8ede1b984d7b2073a4 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
+++ b/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script
@@ -2,5 +2,7 @@ importtargetdefinition -A 'http://www.simantics.org/download/head/simantics.targ
 import 'site.cquery'\r
 build\r
 perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.product.site#site.p2\r
-perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=SimanticsSysdyn-b${BUILD_NUMBER}-r${SVN_REVISION} org.simantics.sysdyn.product.site#create.product.zip\r
-perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=SimanticsSysdyn-b${BUILD_NUMBER}-r${SVN_REVISION} org.simantics.sysdyn.product.site#create.product.zip\r
+perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=Sysdyn-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip\r
+perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=Sysdyn-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip\r
+perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.SysdynWithOpenModelica -D build.label=Sysdyn-with-om-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip\r
+perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.SysdynWithOpenModelica -D build.label=Sysdyn-with-om-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip
\ No newline at end of file

diff --git a/org.simantics.sysdyn.product/META-INF/MANIFEST.MF b/org.simantics.sysdyn.product/META-INF/MANIFEST.MF
index 9b4852df5a16c3c6db77b4d5fc00e6ea5feb9319..841e686df7f7e18f3f0273f68bcda8a112cba43c 100644 (file)
--- a/org.simantics.sysdyn.product/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.product/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Sysdyn Product
-Bundle-SymbolicName: org.simantics.sysdyn.product
+Bundle-SymbolicName: org.simantics.sysdyn.product;singleton:=true
 Bundle-Version: 1.9.1.qualifier
 Bundle-Vendor: Semantum Oy
+Bundle-Localization: plugin

diff --git a/org.simantics.sysdyn.product/build.properties b/org.simantics.sysdyn.product/build.properties
index 294333f8f0a06767d379bd58ea8ea1db6be09830..3a51bb4222efa4cf4c20a3fb0c25d41a7623a954 100644 (file)
--- a/org.simantics.sysdyn.product/build.properties
+++ b/org.simantics.sysdyn.product/build.properties
@@ -1,3 +1,6 @@
 bin.includes = META-INF/,\\r
                splash.bmp,\\r
-               plugin.properties\r
+               plugin.properties,\\r
+               icons/,\\r
+               plugin.xml,\\r
+               plugin_customization.ini\r

diff --git a/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png b/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png
similarity index 100%
rename from org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png
rename to org.simantics.sysdyn.product/icons/simantics_sysdyn128.png

diff --git a/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.xcf b/org.simantics.sysdyn.product/icons/simantics_sysdyn128.xcf
similarity index 100%
rename from org.simantics.sysdyn.ui/icons/simantics_sysdyn128.xcf
rename to org.simantics.sysdyn.product/icons/simantics_sysdyn128.xcf

diff --git a/org.simantics.sysdyn.ui/icons/simantics_sysdyn16.png b/org.simantics.sysdyn.product/icons/simantics_sysdyn16.png
similarity index 100%
rename from org.simantics.sysdyn.ui/icons/simantics_sysdyn16.png
rename to org.simantics.sysdyn.product/icons/simantics_sysdyn16.png

diff --git a/org.simantics.sysdyn.product/icons/simantics_sysdyn256.png b/org.simantics.sysdyn.product/icons/simantics_sysdyn256.png
new file mode 100644 (file)
index 0000000..e779dda
Binary files /dev/null and b/org.simantics.sysdyn.product/icons/simantics_sysdyn256.png differ

diff --git a/org.simantics.sysdyn.ui/icons/simantics_sysdyn32.png b/org.simantics.sysdyn.product/icons/simantics_sysdyn32.png
similarity index 100%
rename from org.simantics.sysdyn.ui/icons/simantics_sysdyn32.png
rename to org.simantics.sysdyn.product/icons/simantics_sysdyn32.png

diff --git a/org.simantics.sysdyn.ui/icons/simantics_sysdyn48.png b/org.simantics.sysdyn.product/icons/simantics_sysdyn48.png
similarity index 100%
rename from org.simantics.sysdyn.ui/icons/simantics_sysdyn48.png
rename to org.simantics.sysdyn.product/icons/simantics_sysdyn48.png

diff --git a/org.simantics.sysdyn.ui/icons/simantics_sysdyn64.png b/org.simantics.sysdyn.product/icons/simantics_sysdyn64.png
similarity index 100%
rename from org.simantics.sysdyn.ui/icons/simantics_sysdyn64.png
rename to org.simantics.sysdyn.product/icons/simantics_sysdyn64.png

diff --git a/org.simantics.sysdyn.product/icons/sysdyn.ico b/org.simantics.sysdyn.product/icons/sysdyn.ico
new file mode 100644 (file)
index 0000000..7813072
Binary files /dev/null and b/org.simantics.sysdyn.product/icons/sysdyn.ico differ

diff --git a/org.simantics.sysdyn.product/icons/sysdyn_ico.xcf b/org.simantics.sysdyn.product/icons/sysdyn_ico.xcf
new file mode 100644 (file)
index 0000000..a675249
Binary files /dev/null and b/org.simantics.sysdyn.product/icons/sysdyn_ico.xcf differ

diff --git a/org.simantics.sysdyn.ui/logo/Simantics_sysdyn_logo2.blend b/org.simantics.sysdyn.product/logo/Simantics_sysdyn_logo2.blend
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/Simantics_sysdyn_logo2.blend
rename to org.simantics.sysdyn.product/logo/Simantics_sysdyn_logo2.blend

diff --git a/org.simantics.sysdyn.ui/logo/Simantics_sysdyn_text.png b/org.simantics.sysdyn.product/logo/Simantics_sysdyn_text.png
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/Simantics_sysdyn_text.png
rename to org.simantics.sysdyn.product/logo/Simantics_sysdyn_text.png

diff --git a/org.simantics.sysdyn.ui/logo/Splash.xcf b/org.simantics.sysdyn.product/logo/Splash.xcf
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/Splash.xcf
rename to org.simantics.sysdyn.product/logo/Splash.xcf

diff --git a/org.simantics.sysdyn.ui/logo/sysdyn.png b/org.simantics.sysdyn.product/logo/sysdyn.png
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/sysdyn.png
rename to org.simantics.sysdyn.product/logo/sysdyn.png

diff --git a/org.simantics.sysdyn.ui/logo/sysdyn_with_arrows.png b/org.simantics.sysdyn.product/logo/sysdyn_with_arrows.png
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/sysdyn_with_arrows.png
rename to org.simantics.sysdyn.product/logo/sysdyn_with_arrows.png

diff --git a/org.simantics.sysdyn.ui/logo/sysdyn_with_arrows.xcf b/org.simantics.sysdyn.product/logo/sysdyn_with_arrows.xcf
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/sysdyn_with_arrows.xcf
rename to org.simantics.sysdyn.product/logo/sysdyn_with_arrows.xcf

diff --git a/org.simantics.sysdyn.ui/logo/sysdyn_with_arrows_and_orange_bg.xcf b/org.simantics.sysdyn.product/logo/sysdyn_with_arrows_and_orange_bg.xcf
similarity index 100%
rename from org.simantics.sysdyn.ui/logo/sysdyn_with_arrows_and_orange_bg.xcf
rename to org.simantics.sysdyn.product/logo/sysdyn_with_arrows_and_orange_bg.xcf

diff --git a/org.simantics.sysdyn.product/plugin.properties b/org.simantics.sysdyn.product/plugin.properties
new file mode 100644 (file)
index 0000000..ad16535
--- /dev/null
+++ b/org.simantics.sysdyn.product/plugin.properties
@@ -0,0 +1,9 @@
+about.text = Simantics System Dynamics\n\\r
+\n\\r
+Version 1.9\n\\r
+\n\\r
+Copyright (c) 2014 Association for Decentralized Information Management in Industry THTH ry.\n\\r
+\n\\r
+Contributors:\n\\r
+VTT Technical Research Centre of Finland\n\\r
+Semantum Oy
\ No newline at end of file

diff --git a/org.simantics.sysdyn.product/plugin.xml b/org.simantics.sysdyn.product/plugin.xml
new file mode 100644 (file)
index 0000000..cfea117
--- /dev/null
+++ b/org.simantics.sysdyn.product/plugin.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<?eclipse version="3.4"?>\r
+<!--\r
+    Copyright (c) 2016 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
+        Semantum Oy - products in separate plugin for headless builds\r
+ -->\r
+\r
+<plugin>\r
+   <extension\r
+         id="product"\r
+         point="org.eclipse.core.runtime.products">\r
+      <product\r
+            application="org.simantics.workbench.application"\r
+            description="Simantics System Dynamic Modelling Environment"\r
+            name="Simantics System Dynamic Tool">\r
+         <property\r
+               name="appName"\r
+               value="Simantics System Dynamic Tool">\r
+         </property>\r
+         <property\r
+               name="windowImages"\r
+               value="icons/simantics_sysdyn16.png,icons/simantics_sysdyn32.png,icons/simantics_sysdyn48.png,icons/simantics_sysdyn64.png,icons/simantics_sysdyn128.png">\r
+         </property>\r
+         <property\r
+               name="aboutText"\r
+               value="%about.text">\r
+         </property>\r
+         <property\r
+               name="aboutImage"\r
+               value="icons/simantics_sysdyn128.png">\r
+         </property>\r
+      </product>\r
+   </extension>\r
+</plugin>\r

diff --git a/org.simantics.sysdyn.ui/plugin_customization.ini b/org.simantics.sysdyn.product/plugin_customization.ini
similarity index 100%
rename from org.simantics.sysdyn.ui/plugin_customization.ini
rename to org.simantics.sysdyn.product/plugin_customization.ini

diff --git a/org.simantics.sysdyn.ui/splash.bmp b/org.simantics.sysdyn.product/splash.bmp
similarity index 100%
rename from org.simantics.sysdyn.ui/splash.bmp
rename to org.simantics.sysdyn.product/splash.bmp

diff --git a/org.simantics.sysdyn.ui/sysdyn-with-openmodelica.product b/org.simantics.sysdyn.product/sysdyn-with-openmodelica.product
similarity index 94%
rename from org.simantics.sysdyn.ui/sysdyn-with-openmodelica.product
rename to org.simantics.sysdyn.product/sysdyn-with-openmodelica.product
index c163639a6c3c0c62cce91ab2aa809d70bfad5bb2..c672abb79acfe664d99cc371aa731e9443193eee 100644 (file)
--- a/org.simantics.sysdyn.ui/sysdyn-with-openmodelica.product
+++ b/org.simantics.sysdyn.product/sysdyn-with-openmodelica.product
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
-<product name="Simantics System Dynamic Tool" uid="org.simantics.sysdyn.product.SysdynWithOpenModelica" id="org.simantics.sysdyn.ui.product" application="org.simantics.workbench.application" version="1.9.1" useFeatures="true" includeLaunchers="true">\r
+<product name="Simantics System Dynamic Tool" uid="org.simantics.sysdyn.product.SysdynWithOpenModelica" id="org.simantics.sysdyn.product.product" application="org.simantics.workbench.application" version="1.9.1" useFeatures="true" includeLaunchers="true">\r
 \r
    <aboutInfo>\r
-      <image path="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
+      <image path="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>\r
       <text>\r
          %about.text\r
       </text>\r
@@ -26,19 +26,21 @@
       </vmArgsWin>\r
    </launcherArgs>\r
 \r
-   <windowImages i16="/org.simantics.sysdyn.ui/icons/simantics_sysdyn16.png" i32="/org.simantics.sysdyn.ui/icons/simantics_sysdyn32.png" i48="/org.simantics.sysdyn.ui/icons/simantics_sysdyn48.png" i64="/org.simantics.sysdyn.ui/icons/simantics_sysdyn64.png" i128="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
+   <windowImages i16="/org.simantics.sysdyn.product/icons/simantics_sysdyn16.png" i32="/org.simantics.sysdyn.product/icons/simantics_sysdyn32.png" i48="/org.simantics.sysdyn.product/icons/simantics_sysdyn48.png" i64="/org.simantics.sysdyn.product/icons/simantics_sysdyn64.png" i128="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>\r
 \r
    <splash\r
-      location="org.simantics.sysdyn.ui" />\r
+      location="org.simantics.sysdyn.product" />\r
    <launcher name="Simantics-Sysdyn">\r
       <solaris/>\r
-      <win useIco="false">\r
+      <win useIco="true">\r
+         <ico path="/org.simantics.sysdyn.product/icons/sysdyn.ico"/>\r
          <bmp/>\r
       </win>\r
    </launcher>\r
 \r
+\r
    <vm>\r
-      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>\r
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>\r
    </vm>\r
 \r
    <license>\r

diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.product/sysdyn.product
similarity index 93%
rename from org.simantics.sysdyn.ui/sysdyn.product
rename to org.simantics.sysdyn.product/sysdyn.product
index daf0fd4647f2e531312a9993f7145480656cf6ad..480496731b6903e45bec4822fae0d05387aa4e90 100644 (file)
--- a/org.simantics.sysdyn.ui/sysdyn.product
+++ b/org.simantics.sysdyn.product/sysdyn.product
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
-<product name="Simantics System Dynamic Tool" uid="org.simantics.sysdyn.product.Sysdyn" id="org.simantics.sysdyn.ui.product" application="org.simantics.workbench.application" version="1.9.1" useFeatures="true" includeLaunchers="true">\r
+<product name="Simantics System Dynamic Tool" uid="org.simantics.sysdyn.product.Sysdyn" id="org.simantics.sysdyn.product.product" application="org.simantics.workbench.application" version="1.9.1" useFeatures="true" includeLaunchers="true">\r
 \r
    <aboutInfo>\r
-      <image path="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
+      <image path="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>\r
       <text>\r
          %about.text\r
       </text>\r
@@ -26,19 +26,21 @@
       </vmArgsWin>\r
    </launcherArgs>\r
 \r
-   <windowImages i16="/org.simantics.sysdyn.ui/icons/simantics_sysdyn16.png" i32="/org.simantics.sysdyn.ui/icons/simantics_sysdyn32.png" i48="/org.simantics.sysdyn.ui/icons/simantics_sysdyn48.png" i64="/org.simantics.sysdyn.ui/icons/simantics_sysdyn64.png" i128="/org.simantics.sysdyn.ui/icons/simantics_sysdyn128.png"/>\r
+   <windowImages i16="/org.simantics.sysdyn.product/icons/simantics_sysdyn16.png" i32="/org.simantics.sysdyn.product/icons/simantics_sysdyn32.png" i48="/org.simantics.sysdyn.product/icons/simantics_sysdyn48.png" i64="/org.simantics.sysdyn.product/icons/simantics_sysdyn64.png" i128="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>\r
 \r
    <splash\r
-      location="org.simantics.sysdyn.ui" />\r
+      location="org.simantics.sysdyn.product" />\r
    <launcher name="Simantics-Sysdyn">\r
       <solaris/>\r
-      <win useIco="false">\r
+      <win useIco="true">\r
+         <ico path="/org.simantics.sysdyn.product/icons/sysdyn.ico"/>\r
          <bmp/>\r
       </win>\r
    </launcher>\r
 \r
+\r
    <vm>\r
-      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>\r
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>\r
    </vm>\r
 \r
    <license>\r

diff --git a/org.simantics.sysdyn.ui/build.properties b/org.simantics.sysdyn.ui/build.properties
index 258de40bd8f170b1ed450b94b893b3019f578086..bde6286d52d33204b1d6ae5cf707f5f440c839c1 100644 (file)
--- a/org.simantics.sysdyn.ui/build.properties
+++ b/org.simantics.sysdyn.ui/build.properties
@@ -15,7 +15,5 @@ bin.includes = META-INF/,\
                .,\\r
                plugin.xml,\\r
                adapters.xml,\\r
-               icons/,\\r
-               splash.bmp,\\r
                plugin.properties,\\r
-               plugin_customization.ini\r
+               icons/\r

diff --git a/org.simantics.sysdyn.ui/plugin.properties b/org.simantics.sysdyn.ui/plugin.properties
index ad16535d5bcfcd8e0ca67371fc89cfcabbaccf20..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.properties
+++ b/org.simantics.sysdyn.ui/plugin.properties
@@ -1,9 +0,0 @@
-about.text = Simantics System Dynamics\n\\r
-\n\\r
-Version 1.9\n\\r
-\n\\r
-Copyright (c) 2014 Association for Decentralized Information Management in Industry THTH ry.\n\\r
-\n\\r
-Contributors:\n\\r
-VTT Technical Research Centre of Finland\n\\r
-Semantum Oy
\ No newline at end of file

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 892934998176d513f9a75fd601cd1b41ea250c45..449a6609cfecd6ca747e12741a7b8f45edad7ee3 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -2694,31 +2694,6 @@
             type="org.eclipse.jface.viewers.IStructuredSelection">\r
       </propertyTester>\r
    </extension>\r
-   <extension\r
-         id="product"\r
-         point="org.eclipse.core.runtime.products">\r
-      <product\r
-            application="org.simantics.workbench.application"\r
-            description="Simantics System Dynamic Modelling Environment"\r
-            name="Simantics System Dynamic Tool">\r
-         <property\r
-               name="appName"\r
-               value="Simantics System Dynamic Tool">\r
-         </property>\r
-         <property\r
-               name="windowImages"\r
-               value="icons/simantics_sysdyn16.png,icons/simantics_sysdyn32.png,icons/simantics_sysdyn48.png,icons/simantics_sysdyn64.png,icons/simantics_sysdyn128.png">\r
-         </property>\r
-         <property\r
-               name="aboutText"\r
-               value="%about.text">\r
-         </property>\r
-         <property\r
-               name="aboutImage"\r
-               value="icons/simantics_sysdyn128.png">\r
-         </property>\r
-      </product>\r
-   </extension>\r
    <extension\r
          point="org.simantics.browsing.ui.common.viewpointContributionBinding">\r
       <binding\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/EnumerationIndexRenameNodeHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/EnumerationIndexRenameNodeHandler.java
index 11b5cc3ba2be17030a8cfb4d9009405e1c7ce25b..63ef5737b61b183caf8eebe532330e83bdbfa154 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/EnumerationIndexRenameNodeHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/EnumerationIndexRenameNodeHandler.java
@@ -17,18 +17,13 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.ui.IEditorPart;\r
 import org.eclipse.ui.IWorkbenchPart;\r
-import org.eclipse.ui.IWorkbenchSite;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
 import org.eclipse.ui.part.IPage;\r
-import org.eclipse.ui.part.IPageSite;\r
-import org.simantics.browsing.ui.GraphExplorer;\r
 import org.simantics.browsing.ui.NodeContext;\r
 import org.simantics.browsing.ui.common.ColumnKeys;\r
 import org.simantics.browsing.ui.platform.PropertyPageView;\r
 import org.simantics.browsing.ui.swt.widgets.GraphExplorerComposite;\r
-import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;\r
 import org.simantics.utils.ui.ISelectionUtils;\r
 \r
 public class EnumerationIndexRenameNodeHandler extends AbstractHandler {\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java
index 8165e545e93d3107fb705e9a2589ce92f59a6b36..b4802418fb320373155a2de7106946654a537213 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportSharedLibraryHandler.java
@@ -25,8 +25,6 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
 import org.simantics.DatabaseJob;\r
-import org.simantics.db.common.utils.Logger;\r
-import org.simantics.graph.db.MissingDependencyException;\r
 import org.simantics.modeling.ModelingUtils;\r
 import org.simantics.sysdyn.ui.Activator;\r
 import org.simantics.sysdyn.ui.utils.imports.ImportUtilsUI;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
index 9d940f26a6feb244bf6166f8b3a36950f963ceee..ccd1c987f71548bcb4fef78ec0587991fa24845c 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
@@ -66,7 +66,7 @@ public abstract class IndexVariable<T> extends AbstractPropertyVariable {
                        return false;\r
                if (getClass() != obj.getClass())\r
                        return false;\r
-               IndexVariable other = (IndexVariable) obj;\r
+               IndexVariable<?> other = (IndexVariable<?>) obj;\r
                if (indexes == null) {\r
                        if (other.indexes != null)\r
                                return false;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java
index 2ef5afa33e5ad743ddf671d58834946076bc70f0..708ff2fd2ae5d5afa71ecee97546b0c5959e3155 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java
@@ -1,6 +1,5 @@
 package org.simantics.sysdyn.adapter;\r
 \r
-import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import org.simantics.db.ReadGraph;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SimulateDurationJob.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SimulateDurationJob.java
index 76238491f7e8383c9f3cc6fba7e16eee6991bc25..5c501d37f3c8269b953326c002910d6c6fdfd754 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SimulateDurationJob.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SimulateDurationJob.java
@@ -36,7 +36,7 @@ class SimulateDurationJob extends Job {
 \r
                TimeLogger.resetTime();\r
                \r
-               long start = System.nanoTime();\r
+//             long start = System.nanoTime();\r
                \r
                if(asJob) base.changeState(ExperimentState.RUNNING);\r
                        \r
@@ -100,7 +100,7 @@ class SimulateDurationJob extends Job {
                        System.err.println("SysdynGameExperiment simulateDuration failed: \n\t" + e.getMessage());\r
                }\r
                \r
-               long end = System.nanoTime();\r
+//             long end = System.nanoTime();\r
 //             System.err.println("simulate duration took " + 1e-6*(end-start) + "ms.");\r
 \r
                TimeLogger.log("SimulateDuration");\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java
index 02e78f9a900596511724eb706dbd8f30fb39c0e9..79f17152e0fe30c712692d9b983f9ca6a7de8958 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentBase.java
@@ -11,15 +11,11 @@
  *******************************************************************************/\r
 package org.simantics.sysdyn.manager;\r
 \r
-import gnu.trove.list.array.TDoubleArrayList;\r
-import gnu.trove.map.hash.THashMap;\r
-\r
 import java.util.Collection;\r
 import java.util.HashMap;\r
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.NullProgressMonitor;\r
-import org.eclipse.core.runtime.jobs.Job;\r
 import org.simantics.db.AsyncReadGraph;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
@@ -33,6 +29,8 @@ import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.solver.ISolver;\r
 import org.simantics.utils.datastructures.Quad;\r
 \r
+import gnu.trove.list.array.TDoubleArrayList;\r
+\r
 /**\r
  * Game experiment\r
  * @author Teemu Lempinen\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
index 23b17f6350e8fabb2a1be7d708e56697fae90400..a5f610d4528482215613893947a0edf0d2e50d40 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
@@ -11,9 +11,6 @@
  *******************************************************************************/\r
 package org.simantics.sysdyn.manager;\r
 \r
-import gnu.trove.list.array.TDoubleArrayList;\r
-import gnu.trove.map.hash.THashMap;\r
-\r
 import java.io.IOException;\r
 import java.util.HashMap;\r
 \r
@@ -38,6 +35,8 @@ import org.simantics.sysdyn.solver.ISolver;
 import org.simantics.sysdyn.solver.ISolverMonitor;\r
 import org.simantics.sysdyn.solver.InternalSolver;\r
 \r
+import gnu.trove.list.array.TDoubleArrayList;\r
+\r
 \r
 public class SysdynGameExperimentInternal extends SysdynGameExperimentBase {\r
 \r