Changed the location of FMU JNI control (refs #3763)

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

diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml
index 36d4d49427b180261178c0d1caf5e52ae8e1b30a..23193a92a1e22d5969b6452299a7ef8a66b6a9f8 100644 (file)
--- a/org.simantics.sysdyn.feature/feature.xml
+++ b/org.simantics.sysdyn.feature/feature.xml
@@ -127,4 +127,18 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.simantics.fmu"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.fmu.me.win32"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
 </feature>\r

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 159a3b70ae04b2a2b898c6e3bf58d903518a458d..12553dbce0cada828c734fb6867826fdc3ea6645 100644 (file)
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -53,7 +53,8 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.jfreechart.ontology;bundle-version="0.1.0",
  org.eclipse.ui.forms;bundle-version="3.5.2",
  org.simantics.scenegraph.swing;bundle-version="1.0.0",
- org.eclipse.nebula.widgets.tablecombo;bundle-version="1.0.0"
+ org.eclipse.nebula.widgets.tablecombo;bundle-version="1.0.0",
+ org.simantics.fmu;bundle-version="1.0.0"
 Bundle-Activator: org.simantics.sysdyn.ui.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.sysdyn.ui.browser.nodes

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 29368e9e485c28c90c2f64e63e6b060268f40271..5fe8735b05942c317128b94fb0c0192272ca1414 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -2152,6 +2152,13 @@
             <externalClass className="org.simantics.db.WriteGraph"/>\r
             <class className="org.simantics.sysdyn.ui.validation.Functions"/>\r
         </namespace>\r
+        <namespace path="Enumerations">\r
+            <externalClass className="org.simantics.db.Resource"/>\r
+            <externalClass className="org.simantics.db.layer0.variable.Variable"/>\r
+            <externalClass className="org.simantics.db.ReadGraph"/>\r
+            <externalClass className="org.simantics.db.WriteGraph"/>\r
+            <class className="org.simantics.sysdyn.ui.validation.EnumerationFunction"/>\r
+        </namespace>        \r
       </namespace>\r
    </extension>\r
 </plugin>\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
index da87dedb7d1eeeb77ea814724aaad17b65f8f49c..8d5befedcb15e3db8ebda1b506212a66f14a5084 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
@@ -35,7 +35,7 @@ import org.simantics.db.service.GraphChangeListenerSupport;
 import org.simantics.db.service.VirtualGraphSupport;\r
 import org.simantics.issues.common.IssueUtils;\r
 import org.simantics.layer0.Layer0;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
+import org.simantics.fmu.FMUControlJNI;\r
 import org.simantics.modeling.services.CaseInsensitiveComponentNamingStrategy2;\r
 import org.simantics.modeling.services.ComponentNamingStrategy;\r
 import org.simantics.project.IProject;\r

diff --git a/org.simantics.sysdyn/META-INF/MANIFEST.MF b/org.simantics.sysdyn/META-INF/MANIFEST.MF
index b96a03dccd1af6f139e582cbb5e1e109fd697464..640aac4bebcf405a28d8dbd7719c19b1557341f2 100644 (file)
--- a/org.simantics.sysdyn/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn/META-INF/MANIFEST.MF
@@ -25,7 +25,9 @@ Require-Bundle: org.simantics.objmap;bundle-version="0.1.0",
  org.simantics.spreadsheet.common;bundle-version="1.1.0",
  org.simantics.spreadsheet;bundle-version="1.1.0",
  org.eclipse.jface.text;bundle-version="3.6.1",
- org.simantics.spreadsheet.ontology;bundle-version="1.2.0"
+ org.simantics.spreadsheet.ontology;bundle-version="1.2.0",
+ org.simantics.fmu;bundle-version="1.0.0",
+ org.simantics.fmu.me.win32;bundle-version="1.0.0"
 Export-Package: org.simantics.sysdyn,
  org.simantics.sysdyn.adapter,
  org.simantics.sysdyn.expressionParser,

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java
index 558f086d4f61ced559542bc69cbf0ec0b09dd5db..5ab097335549bf997b757c69cac0db4b6d7eff88 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java
@@ -9,8 +9,8 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.utils.NameUtils;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 import org.simantics.simulation.experiment.ExperimentState;\r
 import org.simantics.sysdyn.SysdynResource;\r
 import org.simantics.sysdyn.manager.SysdynDataSet;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
index 399d6fd3325c4c023556d391fe45a617a7f1b55d..2c645814e256621419986d91653579a2fde6971b 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
@@ -29,8 +29,8 @@ import org.simantics.modelica.IModelicaMonitor;
 import org.simantics.modelica.SimulationLocation;\r
 import org.simantics.modelica.data.DataSet;\r
 import org.simantics.modelica.data.SimulationResult;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 import org.simantics.simulation.experiment.ExperimentState;\r
 import org.simantics.sysdyn.SysdynResource;\r
 import org.simantics.utils.datastructures.Triple;\r