From: Tuukka Lehtonen Date: Mon, 11 Sep 2017 21:08:56 +0000 (+0300) Subject: Contribute ResourceSelectionProcessor via ontology X-Git-Tag: v1.31.0~6 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1a3b6b93a84bddf502952ae307ff811ce08a8893;p=simantics%2Fsysdyn.git Contribute ResourceSelectionProcessor via ontology This fixes the problem of the sysdyn custom ResourceSelectionProcessor not getting invoked anymore when using the standard model browser. These changes also require the changes from #7478. refs #7378 refs #7479 Change-Id: I30279840c992568af54514a4c60878bcb361896c --- diff --git a/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF index 62c14367..3ab8e5de 100644 --- a/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.simantics.layer0, org.simantics.simulation.ontology;bundle-version="1.0.0", org.simantics.silk.ontology;bundle-version="1.0.0", org.simantics.spreadsheet.ontology;bundle-version="1.1.0", - org.simantics.workbench.ontology;bundle-version="1.2.0" + org.simantics.workbench.ontology;bundle-version="1.2.0", + org.simantics.selectionview.ontology;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.sysdyn Bundle-Vendor: VTT Technical Reserarch Centre of Finland diff --git a/bundles/org.simantics.sysdyn.ontology/graph.tg b/bundles/org.simantics.sysdyn.ontology/graph.tg index 21006429..74ef94a6 100644 Binary files a/bundles/org.simantics.sysdyn.ontology/graph.tg and b/bundles/org.simantics.sysdyn.ontology/graph.tg differ diff --git a/bundles/org.simantics.sysdyn.ontology/graph/SysdynModelingViewpoint.pgraph b/bundles/org.simantics.sysdyn.ontology/graph/SysdynModelingViewpoint.pgraph index 63acc013..31807d64 100644 --- a/bundles/org.simantics.sysdyn.ontology/graph/SysdynModelingViewpoint.pgraph +++ b/bundles/org.simantics.sysdyn.ontology/graph/SysdynModelingViewpoint.pgraph @@ -10,7 +10,9 @@ SYSDYN = SILK = SHEET = JFREE = +SEL = +SYSDYN.SysdynSelectionProcessor : SEL.SelectionProcessorContribution SBC = SYSDYN.ModelingBrowseContext : VP.BrowseContext SAC = SYSDYN.ModelingActionContext : VP.BrowseContext diff --git a/bundles/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/bundles/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java index 76bab8c9..065d5d4f 100644 --- a/bundles/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java +++ b/bundles/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java @@ -757,6 +757,7 @@ public class SysdynResource { public final Resource SysdynModelicaFunction_unit_Inverse; public final Resource SysdynModuleLibrary; public final Resource SysdynOperationBrowser; + public final Resource SysdynSelectionProcessor; public final Resource SysdynSymbol; public final Resource SysdynTerminal; public final Resource Top; @@ -1617,6 +1618,7 @@ public class SysdynResource { public static final String SysdynModelicaFunction_unit_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModelicaFunction/unit/Inverse"; public static final String SysdynModuleLibrary = "http://www.simantics.org/Sysdyn-1.1/SysdynModuleLibrary"; public static final String SysdynOperationBrowser = "http://www.simantics.org/Sysdyn-1.1/SysdynOperationBrowser"; + public static final String SysdynSelectionProcessor = "http://www.simantics.org/Sysdyn-1.1/SysdynSelectionProcessor"; public static final String SysdynSymbol = "http://www.simantics.org/Sysdyn-1.1/SysdynSymbol"; public static final String SysdynTerminal = "http://www.simantics.org/Sysdyn-1.1/SysdynTerminal"; public static final String Top = "http://www.simantics.org/Sysdyn-1.1/Top"; @@ -2487,6 +2489,7 @@ public class SysdynResource { SysdynModelicaFunction_unit_Inverse = getResourceOrNull(graph, URIs.SysdynModelicaFunction_unit_Inverse); SysdynModuleLibrary = getResourceOrNull(graph, URIs.SysdynModuleLibrary); SysdynOperationBrowser = getResourceOrNull(graph, URIs.SysdynOperationBrowser); + SysdynSelectionProcessor = getResourceOrNull(graph, URIs.SysdynSelectionProcessor); SysdynSymbol = getResourceOrNull(graph, URIs.SysdynSymbol); SysdynTerminal = getResourceOrNull(graph, URIs.SysdynTerminal); Top = getResourceOrNull(graph, URIs.Top); diff --git a/bundles/org.simantics.sysdyn.ui/adapters.xml b/bundles/org.simantics.sysdyn.ui/adapters.xml index a782dd60..07ed13a5 100644 --- a/bundles/org.simantics.sysdyn.ui/adapters.xml +++ b/bundles/org.simantics.sysdyn.ui/adapters.xml @@ -10,5 +10,5 @@ VTT Technical Research Centre of Finland - initial API and implementation --> - none 0 fill 1 + none 0 fill 1 \ No newline at end of file diff --git a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target index 362c48bb..48171711 100644 --- a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target +++ b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target @@ -1,284 +1,330 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.tpd b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.tpd new file mode 100644 index 00000000..d653a551 --- /dev/null +++ b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.tpd @@ -0,0 +1,5 @@ +target "Sysdyn 1.31.0" + +with source allEnvironments + +include "http://www.simantics.org/download/master/simantics.tpd" diff --git a/releng/pom.xml b/releng/pom.xml index dc067dd9..041293c0 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -16,6 +16,6 @@ org.simantics.sysdyn.build.targetdefinition org.simantics.sysdyn.repository - org.simantics.sysdyn.rcp.product +