From da9323177e6fb1dbd0b81bf52d5e9d2e90cbdc41 Mon Sep 17 00:00:00 2001 From: lempinen Date: Wed, 10 Oct 2012 10:29:45 +0000 Subject: [PATCH] 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 --- org.simantics.sysdyn.feature/feature.xml | 14 ++++++++++++++ org.simantics.sysdyn.ui/META-INF/MANIFEST.MF | 3 ++- org.simantics.sysdyn.ui/plugin.xml | 7 +++++++ .../simantics/sysdyn/ui/project/SysdynProject.java | 2 +- org.simantics.sysdyn/META-INF/MANIFEST.MF | 4 +++- .../sysdyn/adapter/ValueIndexVariable.java | 4 ++-- .../sysdyn/manager/SysdynGameExperiment.java | 4 ++-- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml index 36d4d494..23193a92 100644 --- a/org.simantics.sysdyn.feature/feature.xml +++ b/org.simantics.sysdyn.feature/feature.xml @@ -127,4 +127,18 @@ version="0.0.0" unpack="false"/> + + + + diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF index 159a3b70..12553dbc 100644 --- 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 29368e9e..5fe8735b 100644 --- a/org.simantics.sysdyn.ui/plugin.xml +++ b/org.simantics.sysdyn.ui/plugin.xml @@ -2152,6 +2152,13 @@ + + + + + + + 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 da87dedb..8d5befed 100644 --- 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; import org.simantics.issues.common.IssueUtils; import org.simantics.layer0.Layer0; -import org.simantics.modelica.fmi.FMUControlJNI; +import org.simantics.fmu.FMUControlJNI; import org.simantics.modeling.services.CaseInsensitiveComponentNamingStrategy2; import org.simantics.modeling.services.ComponentNamingStrategy; import org.simantics.project.IProject; diff --git a/org.simantics.sysdyn/META-INF/MANIFEST.MF b/org.simantics.sysdyn/META-INF/MANIFEST.MF index b96a03dc..640aac4b 100644 --- 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 558f086d..5ab09733 100644 --- 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; import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.variable.Variable; -import org.simantics.modelica.fmi.FMUControlJNI; -import org.simantics.modelica.fmi.FMUJNIException; +import org.simantics.fmu.FMUControlJNI; +import org.simantics.fmu.FMUJNIException; import org.simantics.simulation.experiment.ExperimentState; import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.manager.SysdynDataSet; 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 399d6fd3..2c645814 100644 --- 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; import org.simantics.modelica.data.DataSet; import org.simantics.modelica.data.SimulationResult; -import org.simantics.modelica.fmi.FMUControlJNI; -import org.simantics.modelica.fmi.FMUJNIException; +import org.simantics.fmu.FMUControlJNI; +import org.simantics.fmu.FMUJNIException; import org.simantics.simulation.experiment.ExperimentState; import org.simantics.sysdyn.SysdynResource; import org.simantics.utils.datastructures.Triple; -- 2.47.1