From 2621b79c95d51c267c84fc0dbf69df468d500980 Mon Sep 17 00:00:00 2001 From: villberg Date: Thu, 27 Oct 2011 08:19:03 +0000 Subject: [PATCH] git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23049 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../objmap/examples/SysdynExample.java | 10 +- .../META-INF/MANIFEST.MF | 2 +- org.simantics.sysdyn.ontology/graph.tg | Bin 72094 -> 71254 bytes .../graph/GeneralSymbols.pgraph | 2 +- .../graph/Profiles.pgraph | 2 +- .../graph/Sysdyn.pgraph | 18 +- .../graph/SysdynFunctions.pgraph | 4 +- .../Sysdyn_ModelBrowser_Viewpoint.pgraph | 4 +- .../graph/Validation.pgraph | 2 +- .../graph/VensimFunctions.pgraph | 4 +- .../graph/WorkModel.pgraph | 2 +- org.simantics.sysdyn.ontology/mdl2pgraph.pl | 4 +- .../org/simantics/sysdyn/SysdynResource.java | 234 ++++++++++++++++++ .../testGraph/Cancer.pgraph.keep | 4 +- org.simantics.sysdyn.ui/adapters.xml | 2 +- org.simantics.sysdyn.ui/plugin.xml | 76 +++--- .../sysdyn/ui/browser/SysdynBrowser.java | 7 +- .../sysdyn/ui/browser/SysdynModelBrowser.java | 5 +- .../ui/browser/SysdynOperationBrowser.java | 3 +- .../contributions/FunctionLibraries.java | 2 +- .../sysdyn/ui/editor/DiagramViewer.java | 2 +- .../CreateVariablesShortcutParticipant.java | 11 +- .../ui/handlers/ImportModelHandler.java | 2 +- .../sysdyn/ui/properties/ArrayIndexesTab.java | 4 +- .../sysdyn/ui/properties/EnumerationTab.java | 2 +- .../ui/properties/ExternalFilesTab.java | 3 +- .../sysdyn/ui/properties/ModuleTab.java | 3 +- .../SharedFunctionLibrariesTab.java | 5 +- .../properties/widgets/ShortcutTabWidget.java | 4 +- .../functions/WizardFunctionsExportPage.java | 3 +- .../functions/WizardFunctionsImportPage.java | 2 +- .../models/WizardModelsExportPage.java | 3 +- .../models/WizardModelsImportPage.java | 2 +- .../modules/WizardModulesExportPage.java | 2 +- .../modules/WizardModulesImportPage.java | 2 +- org.simantics.sysdyn/adapters.xml | 10 +- .../sysdyn/manager/FunctionUtils.java | 2 +- .../sysdyn/mdlImport/mdlElements/Model.java | 4 +- .../sysdyn/representation/ArrayIndexes.java | 2 +- .../sysdyn/representation/Auxiliary.java | 2 +- .../sysdyn/representation/Cloud.java | 2 +- .../sysdyn/representation/Configuration.java | 2 +- .../sysdyn/representation/Dependency.java | 8 +- .../sysdyn/representation/Enumeration.java | 8 +- .../representation/EnumerationIndex.java | 2 +- .../representation/EnumerationIndexes.java | 2 +- .../simantics/sysdyn/representation/Flow.java | 6 +- .../sysdyn/representation/Input.java | 6 +- .../sysdyn/representation/Model.java | 12 +- .../sysdyn/representation/Module.java | 4 +- .../sysdyn/representation/Redeclaration.java | 6 +- .../sysdyn/representation/Stock.java | 6 +- .../sysdyn/representation/Valve.java | 2 +- .../sysdyn/representation/Variable.java | 6 +- .../expressions/ConstantExpression.java | 4 +- .../expressions/DelayExpression.java | 2 +- .../expressions/Expression.java | 2 +- .../expressions/Expressions.java | 2 +- .../expressions/LookupExpression.java | 2 +- .../expressions/NormalExpression.java | 4 +- .../expressions/ParameterExpression.java | 4 +- .../expressions/WithLookupExpression.java | 6 +- 62 files changed, 407 insertions(+), 148 deletions(-) diff --git a/org.simantics.objmap/examples/org/simantics/objmap/examples/SysdynExample.java b/org.simantics.objmap/examples/org/simantics/objmap/examples/SysdynExample.java index a7b3d0a8..bb6df661 100644 --- a/org.simantics.objmap/examples/org/simantics/objmap/examples/SysdynExample.java +++ b/org.simantics.objmap/examples/org/simantics/objmap/examples/SysdynExample.java @@ -25,7 +25,7 @@ import org.simantics.objmap.schema.SimpleSchema; public class SysdynExample { - @GraphType("http://www.simantics.org/Sysdyn-1.0/Configuration") + @GraphType("http://www.simantics.org/Sysdyn-1.1/Configuration") static class Configuration { @RelatedElements("http://www.simantics.org/Layer0-1.0/ConsistsOf") Collection components; @@ -34,11 +34,11 @@ public class SysdynExample { static abstract class Component { } - @GraphType("http://www.simantics.org/Sysdyn-1.0/Dependency") + @GraphType("http://www.simantics.org/Sysdyn-1.1/Dependency") static class Dependency extends Component { - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasTail") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasTail") Variable tail; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasHead") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasHead") Auxiliary head; } @@ -47,7 +47,7 @@ public class SysdynExample { String name; } - @GraphType("http://www.simantics.org/Sysdyn-1.0/Auxiliary") + @GraphType("http://www.simantics.org/Sysdyn-1.1/Auxiliary") static class Auxiliary extends Variable { } diff --git a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF index 95c40536..be16f573 100644 --- a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF +++ b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Simantics System Dynamics Ontology +Bundle-Name: http://www.simantics.org/Sysdyn Bundle-SymbolicName: org.simantics.sysdyn.ontology Bundle-Version: 1.1.0.qualifier Require-Bundle: org.simantics.layer0, diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg index 1022b35029889dc31b6705d837ac02e75b8890a5..358bb901b8f779559413619d2561ef0ebbdb95ef 100644 GIT binary patch literal 71254 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

Ba6O^j#sf~p>os=P^XWJ= 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 G2D = DIA = -SYSDYN = +SYSDYN = GENERAL = SYSDYN.SymbolReferences.GeneralSymbols : DIA.SymbolReferenceLibrary L0.HasDescription "General graphical components" diff --git a/org.simantics.sysdyn.ontology/graph/Profiles.pgraph b/org.simantics.sysdyn.ontology/graph/Profiles.pgraph index 0b918dfc..45a75dfc 100644 --- a/org.simantics.sysdyn.ontology/graph/Profiles.pgraph +++ b/org.simantics.sysdyn.ontology/graph/Profiles.pgraph @@ -1,7 +1,7 @@ L0 = L0X = DIA = -SYSDYN = +SYSDYN = PROFILES = SYSDYN.Profiles : L0.Library diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph index 3f6baa9d..475e3a60 100644 --- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph +++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph @@ -18,7 +18,7 @@ SYSDYN = : L0.Ontology SYSDYN.ImportedOntologies : PROJ.NamespaceRequirement L0.HasDescription "Specifies the ontologies required by a Sysdyn project." PROJ.RequiresNamespace - "http://www.simantics.org/Sysdyn-1.0" : L0.URI + "http://www.simantics.org/Sysdyn-1.1" : L0.URI "http://www.simantics.org/Layer0-1.0" : L0.URI SYSDYN.SharedFunctionOntology -SYSDYN = +SYSDYN = -FL = : SYSDYN.SysdynModelicaFunctionLibrary +FL = : SYSDYN.SysdynModelicaFunctionLibrary FL.xidz : SYSDYN.SysdynModelicaFunction diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph index 947f5efe..8a714c78 100644 --- a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph +++ b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph @@ -6,7 +6,7 @@ IMAGE = ACT = MOD = STR = -SYSDYN = +SYSDYN = SBC = SYSDYN.ProjectBrowseContext : VP.BrowseContext SAC = SYSDYN.ProjectActionContext : VP.BrowseContext @@ -16,7 +16,7 @@ MBC = MOD.ModelingBrowseContext : VP.BrowseContext MAC = MOD.ModelingActionContext : VP.BrowseContext VP.BrowseContext.IsIncludedIn PROJECT.ProjectActionContext -BuiltinFunctions = +BuiltinFunctions = SBC.BuiltinFunctions : VP.ResourceNodeType SBC.ModuleTypeChildRule : VP.ChildRule SBC.ModuleTypeLabelRule : VP.LabelRule diff --git a/org.simantics.sysdyn.ontology/graph/Validation.pgraph b/org.simantics.sysdyn.ontology/graph/Validation.pgraph index 3ff190ea..ead8cfb8 100644 --- a/org.simantics.sysdyn.ontology/graph/Validation.pgraph +++ b/org.simantics.sysdyn.ontology/graph/Validation.pgraph @@ -1,7 +1,7 @@ L0 = L0X = ISSUE = -SYSDYN = +SYSDYN = VALIDATIONS = SYSDYN.Validations : L0.Library diff --git a/org.simantics.sysdyn.ontology/graph/VensimFunctions.pgraph b/org.simantics.sysdyn.ontology/graph/VensimFunctions.pgraph index 18c19556..08e4cc5a 100644 --- a/org.simantics.sysdyn.ontology/graph/VensimFunctions.pgraph +++ b/org.simantics.sysdyn.ontology/graph/VensimFunctions.pgraph @@ -1,8 +1,8 @@ L0 = -SYSDYN = +SYSDYN = -VF = : SYSDYN.SysdynModelicaFunctionLibrary +VF = : SYSDYN.SysdynModelicaFunctionLibrary /* VF.DELAYFIXED : SYSDYN.SysdynModelicaFunction diff --git a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph index 85f82b8c..042f12d0 100644 --- a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph +++ b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph @@ -5,7 +5,7 @@ STR = DIA = SIMU = MOD = -SYSDYN = +SYSDYN = PROJ = //###################################################################### diff --git a/org.simantics.sysdyn.ontology/mdl2pgraph.pl b/org.simantics.sysdyn.ontology/mdl2pgraph.pl index d7def866..2e49e3ec 100755 --- a/org.simantics.sysdyn.ontology/mdl2pgraph.pl +++ b/org.simantics.sysdyn.ontology/mdl2pgraph.pl @@ -584,14 +584,14 @@ STR = DIA = SIMU = MOD = -SYSDYN = +SYSDYN = PROJ = //###################################################################### //# Example work model with two modules //###################################################################### -WM = : PROJ.Project +WM = : PROJ.Project PROJ.HasFeature _ : PROJ.FeatureSpec PROJ.HasGroupId "org.simantics.sysdyn.feature.group" L0.PartOf diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java index 229bf186..5e1f85b6 100644 --- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java +++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java @@ -8,33 +8,71 @@ import org.simantics.db.exception.DatabaseException; public class SysdynResource { + public final Resource AdditionalSymbols; + public final Resource AdditionalSymbols_Text; + public final Resource AllElementsGroup; public final Resource ArrayIndexes; public final Resource ArrayIndexes_Inverse; public final Resource Auxiliary; public final Resource AuxiliarySymbol; + public final Resource AvailableSharedFunctionLibraries; + public final Resource AvailableVariableIndexes; public final Resource BasicExperiment; + public final Resource Browser; + public final Resource Built$in_Functions; + public final Resource Built$in_Functions_Vensim_Functions; + public final Resource Built$in_Functions_Vensim_Functions_ABS; + public final Resource Built$in_Functions_Vensim_Functions_COS; + public final Resource Built$in_Functions_Vensim_Functions_COSH; + public final Resource Built$in_Functions_Vensim_Functions_EXP; + public final Resource Built$in_Functions_Vensim_Functions_IFTHENELSE; + public final Resource Built$in_Functions_Vensim_Functions_LN; + public final Resource Built$in_Functions_Vensim_Functions_MAX; + public final Resource Built$in_Functions_Vensim_Functions_MIN; + public final Resource Built$in_Functions_Vensim_Functions_MODULO; + public final Resource Built$in_Functions_Vensim_Functions_PULSE; + public final Resource Built$in_Functions_Vensim_Functions_RAMP; + public final Resource Built$in_Functions_Vensim_Functions_SIN; + public final Resource Built$in_Functions_Vensim_Functions_SINH; + public final Resource Built$in_Functions_Vensim_Functions_SQRT; + public final Resource Built$in_Functions_Vensim_Functions_STEP; + public final Resource Built$in_Functions_Vensim_Functions_TAN; + public final Resource Built$in_Functions_Vensim_Functions_TANH; + public final Resource Built$in_Functions_Vensim_Functions_XIDZ; + public final Resource Built$in_Functions_Vensim_Functions_ZIDZ; + public final Resource Built$in_Functions_interpolate; + public final Resource Built$in_Functions_interpolateFull; + public final Resource Built$in_Functions_xidz; + public final Resource Built$in_Functions_zidz; public final Resource Cloud; public final Resource CloudSymbol; public final Resource Configuration; public final Resource ConfigurationDiagram; public final Resource ConfigurationDiagramTemplate; public final Resource ConstantExpression; + public final Resource DefaultProfile; public final Resource DefaultRealization; public final Resource DelayExpression; public final Resource Dependency; public final Resource DependencyConnection; + public final Resource DependencyIssue; public final Resource DiagramToCompositeMapping; public final Resource Enumeration; public final Resource EnumerationIndex; public final Resource EnumerationIndexes; public final Resource EnumerationIndexes_Inverse; + public final Resource EnumerationReplacement; public final Resource Experiment; + public final Resource ExportModuleTree; public final Resource Expression; + public final Resource ExpressionIssue; public final Resource Expressions; public final Resource Expressions_Inverse; + public final Resource ExternalFiles; public final Resource ExternalFunctionFile; public final Resource Flow; public final Resource FlowConnection; + public final Resource FunctionTree; public final Resource GameExperiment; public final Resource HasActiveExpression; public final Resource HasActiveExpression_Inverse; @@ -97,6 +135,7 @@ public class SysdynResource { public final Resource HasUnit; public final Resource HasUnit_Inverse; public final Resource HistoryRealization; + public final Resource ImportModuleTree; public final Resource ImportedOntologies; public final Resource IndependentVariable; public final Resource Input; @@ -108,7 +147,9 @@ public class SysdynResource { public final Resource IsReplaceable_Inverse; public final Resource IsTailOf; public final Resource IsTailOfTerminal; + public final Resource IssueStyle; public final Resource LookupExpression; + public final Resource ModelBrowser; public final Resource Module; public final Resource ModuleSymbol; public final Resource NormalExpression; @@ -118,6 +159,26 @@ public class SysdynResource { public final Resource PolarityLocation; public final Resource PolarityLocation_Inverse; public final Resource Polarity_Inverse; + public final Resource Profiles; + public final Resource Profiles_IssueWarnings; + public final Resource Profiles_SimulationPlaybackColours; + public final Resource ProjectActionContext; + public final Resource ProjectActionContext_Actions; + public final Resource ProjectActionContext_Actions_NewEnumeration; + public final Resource ProjectActionContext_Actions_NewFunction; + public final Resource ProjectActionContext_Actions_NewFunctionLibrary; + public final Resource ProjectActionContext_Actions_NewModuleType; + public final Resource ProjectActionContext_Actions_NewSharedFunctionLibrary; + public final Resource ProjectActionContext_Actions_OpenWorkbook; + public final Resource ProjectBrowseContext; + public final Resource ProjectBrowseContext_BuiltinFunctions; + public final Resource ProjectBrowseContext_FunctionsFolder; + public final Resource ProjectBrowseContext_ModuleContentChildRule; + public final Resource ProjectBrowseContext_ModuleSymbol; + public final Resource ProjectBrowseContext_ModuleTypeChildRule; + public final Resource ProjectBrowseContext_ModuleTypeLabelRule; + public final Resource ProjectBrowseContext_ModulesFolder; + public final Resource ProjectBrowseContext_SharedFunctionsFolder; public final Resource Redeclaration; public final Resource RefersTo; public final Resource ReplacedEnumeration; @@ -125,12 +186,15 @@ public class SysdynResource { public final Resource ReplacingEnumeration; public final Resource ReplacingEnumeration_Inverse; public final Resource Result; + public final Resource SelectedSharedFunctionLibraries; public final Resource SharedFunctionOntology; public final Resource SharedModuleOntolofgy; public final Resource ShowEnumerationIndexInCharts; public final Resource ShowEnumerationIndexInCharts_Inverse; public final Resource ShowResult; public final Resource SimulateOnChangeExperiment; + public final Resource SimulationPlaybackProfile; + public final Resource SimulationPlaybackStyle; public final Resource Stock; public final Resource StockExpression; public final Resource StockSymbol; @@ -140,11 +204,25 @@ public class SysdynResource { public final Resource Symbols; public final Resource SysdynConnectionType; public final Resource SysdynDiagramModelingRules; + public final Resource SysdynIssue; public final Resource SysdynModel; public final Resource SysdynModelicaFunction; public final Resource SysdynModelicaFunctionLibrary; public final Resource SysdynModuleLibrary; + public final Resource SysdynOperationBrowser; public final Resource SysdynTerminal; + public final Resource UsedVariableIndexes; + public final Resource Validations; + public final Resource Validations_Dependencies; + public final Resource Validations_Dependencies_DependencyConnectionsIssueSource; + public final Resource Validations_Dependencies_dependencyBaseRealizationFunction; + public final Resource Validations_Dependencies_dependencySynchronizer; + public final Resource Validations_Dependencies_dependencyValidator; + public final Resource Validations_Expressions; + public final Resource Validations_Expressions_ExpressionIssueSource; + public final Resource Validations_Expressions_expressionBaseRealizationFunction; + public final Resource Validations_Expressions_expressionSynchronizer; + public final Resource Validations_Expressions_expressionValidator; public final Resource Valve; public final Resource ValveSymbol; public final Resource Variable; @@ -156,33 +234,71 @@ public class SysdynResource { public final Resource polarityLocation; public static class URIs { + public static final String AdditionalSymbols = "http://www.simantics.org/Sysdyn-1.1/AdditionalSymbols"; + public static final String AdditionalSymbols_Text = "http://www.simantics.org/Sysdyn-1.1/AdditionalSymbols/Text"; + public static final String AllElementsGroup = "http://www.simantics.org/Sysdyn-1.1/AllElementsGroup"; public static final String ArrayIndexes = "http://www.simantics.org/Sysdyn-1.1/ArrayIndexes"; public static final String ArrayIndexes_Inverse = "http://www.simantics.org/Sysdyn-1.1/ArrayIndexes/Inverse"; public static final String Auxiliary = "http://www.simantics.org/Sysdyn-1.1/Auxiliary"; public static final String AuxiliarySymbol = "http://www.simantics.org/Sysdyn-1.1/AuxiliarySymbol"; + public static final String AvailableSharedFunctionLibraries = "http://www.simantics.org/Sysdyn-1.1/AvailableSharedFunctionLibraries"; + public static final String AvailableVariableIndexes = "http://www.simantics.org/Sysdyn-1.1/AvailableVariableIndexes"; public static final String BasicExperiment = "http://www.simantics.org/Sysdyn-1.1/BasicExperiment"; + public static final String Browser = "http://www.simantics.org/Sysdyn-1.1/Browser"; + public static final String Built$in_Functions = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions"; + public static final String Built$in_Functions_Vensim_Functions = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions"; + public static final String Built$in_Functions_Vensim_Functions_ABS = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/ABS"; + public static final String Built$in_Functions_Vensim_Functions_COS = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/COS"; + public static final String Built$in_Functions_Vensim_Functions_COSH = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/COSH"; + public static final String Built$in_Functions_Vensim_Functions_EXP = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/EXP"; + public static final String Built$in_Functions_Vensim_Functions_IFTHENELSE = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/IFTHENELSE"; + public static final String Built$in_Functions_Vensim_Functions_LN = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/LN"; + public static final String Built$in_Functions_Vensim_Functions_MAX = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/MAX"; + public static final String Built$in_Functions_Vensim_Functions_MIN = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/MIN"; + public static final String Built$in_Functions_Vensim_Functions_MODULO = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/MODULO"; + public static final String Built$in_Functions_Vensim_Functions_PULSE = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/PULSE"; + public static final String Built$in_Functions_Vensim_Functions_RAMP = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/RAMP"; + public static final String Built$in_Functions_Vensim_Functions_SIN = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/SIN"; + public static final String Built$in_Functions_Vensim_Functions_SINH = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/SINH"; + public static final String Built$in_Functions_Vensim_Functions_SQRT = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/SQRT"; + public static final String Built$in_Functions_Vensim_Functions_STEP = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/STEP"; + public static final String Built$in_Functions_Vensim_Functions_TAN = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/TAN"; + public static final String Built$in_Functions_Vensim_Functions_TANH = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/TANH"; + public static final String Built$in_Functions_Vensim_Functions_XIDZ = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/XIDZ"; + public static final String Built$in_Functions_Vensim_Functions_ZIDZ = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/Vensim%20Functions/ZIDZ"; + public static final String Built$in_Functions_interpolate = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/interpolate"; + public static final String Built$in_Functions_interpolateFull = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/interpolateFull"; + public static final String Built$in_Functions_xidz = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/xidz"; + public static final String Built$in_Functions_zidz = "http://www.simantics.org/Sysdyn-1.1/Built-in%20Functions/zidz"; public static final String Cloud = "http://www.simantics.org/Sysdyn-1.1/Cloud"; public static final String CloudSymbol = "http://www.simantics.org/Sysdyn-1.1/CloudSymbol"; public static final String Configuration = "http://www.simantics.org/Sysdyn-1.1/Configuration"; public static final String ConfigurationDiagram = "http://www.simantics.org/Sysdyn-1.1/ConfigurationDiagram"; public static final String ConfigurationDiagramTemplate = "http://www.simantics.org/Sysdyn-1.1/ConfigurationDiagramTemplate"; public static final String ConstantExpression = "http://www.simantics.org/Sysdyn-1.1/ConstantExpression"; + public static final String DefaultProfile = "http://www.simantics.org/Sysdyn-1.1/DefaultProfile"; public static final String DefaultRealization = "http://www.simantics.org/Sysdyn-1.1/DefaultRealization"; public static final String DelayExpression = "http://www.simantics.org/Sysdyn-1.1/DelayExpression"; public static final String Dependency = "http://www.simantics.org/Sysdyn-1.1/Dependency"; public static final String DependencyConnection = "http://www.simantics.org/Sysdyn-1.1/DependencyConnection"; + public static final String DependencyIssue = "http://www.simantics.org/Sysdyn-1.1/DependencyIssue"; public static final String DiagramToCompositeMapping = "http://www.simantics.org/Sysdyn-1.1/DiagramToCompositeMapping"; public static final String Enumeration = "http://www.simantics.org/Sysdyn-1.1/Enumeration"; public static final String EnumerationIndex = "http://www.simantics.org/Sysdyn-1.1/EnumerationIndex"; public static final String EnumerationIndexes = "http://www.simantics.org/Sysdyn-1.1/EnumerationIndexes"; public static final String EnumerationIndexes_Inverse = "http://www.simantics.org/Sysdyn-1.1/EnumerationIndexes/Inverse"; + public static final String EnumerationReplacement = "http://www.simantics.org/Sysdyn-1.1/EnumerationReplacement"; public static final String Experiment = "http://www.simantics.org/Sysdyn-1.1/Experiment"; + public static final String ExportModuleTree = "http://www.simantics.org/Sysdyn-1.1/ExportModuleTree"; public static final String Expression = "http://www.simantics.org/Sysdyn-1.1/Expression"; + public static final String ExpressionIssue = "http://www.simantics.org/Sysdyn-1.1/ExpressionIssue"; public static final String Expressions = "http://www.simantics.org/Sysdyn-1.1/Expressions"; public static final String Expressions_Inverse = "http://www.simantics.org/Sysdyn-1.1/Expressions/Inverse"; + public static final String ExternalFiles = "http://www.simantics.org/Sysdyn-1.1/ExternalFiles"; public static final String ExternalFunctionFile = "http://www.simantics.org/Sysdyn-1.1/ExternalFunctionFile"; public static final String Flow = "http://www.simantics.org/Sysdyn-1.1/Flow"; public static final String FlowConnection = "http://www.simantics.org/Sysdyn-1.1/FlowConnection"; + public static final String FunctionTree = "http://www.simantics.org/Sysdyn-1.1/FunctionTree"; public static final String GameExperiment = "http://www.simantics.org/Sysdyn-1.1/GameExperiment"; public static final String HasActiveExpression = "http://www.simantics.org/Sysdyn-1.1/HasActiveExpression"; public static final String HasActiveExpression_Inverse = "http://www.simantics.org/Sysdyn-1.1/HasActiveExpression/Inverse"; @@ -245,6 +361,7 @@ public class SysdynResource { public static final String HasUnit = "http://www.simantics.org/Sysdyn-1.1/HasUnit"; public static final String HasUnit_Inverse = "http://www.simantics.org/Sysdyn-1.1/HasUnit/Inverse"; public static final String HistoryRealization = "http://www.simantics.org/Sysdyn-1.1/HistoryRealization"; + public static final String ImportModuleTree = "http://www.simantics.org/Sysdyn-1.1/ImportModuleTree"; public static final String ImportedOntologies = "http://www.simantics.org/Sysdyn-1.1/ImportedOntologies"; public static final String IndependentVariable = "http://www.simantics.org/Sysdyn-1.1/IndependentVariable"; public static final String Input = "http://www.simantics.org/Sysdyn-1.1/Input"; @@ -256,7 +373,9 @@ public class SysdynResource { public static final String IsReplaceable_Inverse = "http://www.simantics.org/Sysdyn-1.1/IsReplaceable/Inverse"; public static final String IsTailOf = "http://www.simantics.org/Sysdyn-1.1/IsTailOf"; public static final String IsTailOfTerminal = "http://www.simantics.org/Sysdyn-1.1/IsTailOfTerminal"; + public static final String IssueStyle = "http://www.simantics.org/Sysdyn-1.1/IssueStyle"; public static final String LookupExpression = "http://www.simantics.org/Sysdyn-1.1/LookupExpression"; + public static final String ModelBrowser = "http://www.simantics.org/Sysdyn-1.1/ModelBrowser"; public static final String Module = "http://www.simantics.org/Sysdyn-1.1/Module"; public static final String ModuleSymbol = "http://www.simantics.org/Sysdyn-1.1/ModuleSymbol"; public static final String NormalExpression = "http://www.simantics.org/Sysdyn-1.1/NormalExpression"; @@ -266,6 +385,26 @@ public class SysdynResource { public static final String PolarityLocation = "http://www.simantics.org/Sysdyn-1.1/PolarityLocation"; public static final String PolarityLocation_Inverse = "http://www.simantics.org/Sysdyn-1.1/PolarityLocation/Inverse"; public static final String Polarity_Inverse = "http://www.simantics.org/Sysdyn-1.1/Polarity/Inverse"; + public static final String Profiles = "http://www.simantics.org/Sysdyn-1.1/Profiles"; + public static final String Profiles_IssueWarnings = "http://www.simantics.org/Sysdyn-1.1/Profiles/IssueWarnings"; + public static final String Profiles_SimulationPlaybackColours = "http://www.simantics.org/Sysdyn-1.1/Profiles/SimulationPlaybackColours"; + public static final String ProjectActionContext = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext"; + public static final String ProjectActionContext_Actions = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions"; + public static final String ProjectActionContext_Actions_NewEnumeration = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions/NewEnumeration"; + public static final String ProjectActionContext_Actions_NewFunction = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions/NewFunction"; + public static final String ProjectActionContext_Actions_NewFunctionLibrary = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions/NewFunctionLibrary"; + public static final String ProjectActionContext_Actions_NewModuleType = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions/NewModuleType"; + public static final String ProjectActionContext_Actions_NewSharedFunctionLibrary = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions/NewSharedFunctionLibrary"; + public static final String ProjectActionContext_Actions_OpenWorkbook = "http://www.simantics.org/Sysdyn-1.1/ProjectActionContext/Actions/OpenWorkbook"; + public static final String ProjectBrowseContext = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext"; + public static final String ProjectBrowseContext_BuiltinFunctions = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/BuiltinFunctions"; + public static final String ProjectBrowseContext_FunctionsFolder = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/FunctionsFolder"; + public static final String ProjectBrowseContext_ModuleContentChildRule = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/ModuleContentChildRule"; + public static final String ProjectBrowseContext_ModuleSymbol = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/ModuleSymbol"; + public static final String ProjectBrowseContext_ModuleTypeChildRule = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/ModuleTypeChildRule"; + public static final String ProjectBrowseContext_ModuleTypeLabelRule = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/ModuleTypeLabelRule"; + public static final String ProjectBrowseContext_ModulesFolder = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/ModulesFolder"; + public static final String ProjectBrowseContext_SharedFunctionsFolder = "http://www.simantics.org/Sysdyn-1.1/ProjectBrowseContext/SharedFunctionsFolder"; public static final String Redeclaration = "http://www.simantics.org/Sysdyn-1.1/Redeclaration"; public static final String RefersTo = "http://www.simantics.org/Sysdyn-1.1/RefersTo"; public static final String ReplacedEnumeration = "http://www.simantics.org/Sysdyn-1.1/ReplacedEnumeration"; @@ -273,12 +412,15 @@ public class SysdynResource { public static final String ReplacingEnumeration = "http://www.simantics.org/Sysdyn-1.1/ReplacingEnumeration"; public static final String ReplacingEnumeration_Inverse = "http://www.simantics.org/Sysdyn-1.1/ReplacingEnumeration/Inverse"; public static final String Result = "http://www.simantics.org/Sysdyn-1.1/Result"; + public static final String SelectedSharedFunctionLibraries = "http://www.simantics.org/Sysdyn-1.1/SelectedSharedFunctionLibraries"; public static final String SharedFunctionOntology = "http://www.simantics.org/Sysdyn-1.1/SharedFunctionOntology"; public static final String SharedModuleOntolofgy = "http://www.simantics.org/Sysdyn-1.1/SharedModuleOntolofgy"; public static final String ShowEnumerationIndexInCharts = "http://www.simantics.org/Sysdyn-1.1/ShowEnumerationIndexInCharts"; public static final String ShowEnumerationIndexInCharts_Inverse = "http://www.simantics.org/Sysdyn-1.1/ShowEnumerationIndexInCharts/Inverse"; public static final String ShowResult = "http://www.simantics.org/Sysdyn-1.1/ShowResult"; public static final String SimulateOnChangeExperiment = "http://www.simantics.org/Sysdyn-1.1/SimulateOnChangeExperiment"; + public static final String SimulationPlaybackProfile = "http://www.simantics.org/Sysdyn-1.1/SimulationPlaybackProfile"; + public static final String SimulationPlaybackStyle = "http://www.simantics.org/Sysdyn-1.1/SimulationPlaybackStyle"; public static final String Stock = "http://www.simantics.org/Sysdyn-1.1/Stock"; public static final String StockExpression = "http://www.simantics.org/Sysdyn-1.1/StockExpression"; public static final String StockSymbol = "http://www.simantics.org/Sysdyn-1.1/StockSymbol"; @@ -288,11 +430,25 @@ public class SysdynResource { public static final String Symbols = "http://www.simantics.org/Sysdyn-1.1/Symbols"; public static final String SysdynConnectionType = "http://www.simantics.org/Sysdyn-1.1/SysdynConnectionType"; public static final String SysdynDiagramModelingRules = "http://www.simantics.org/Sysdyn-1.1/SysdynDiagramModelingRules"; + public static final String SysdynIssue = "http://www.simantics.org/Sysdyn-1.1/SysdynIssue"; public static final String SysdynModel = "http://www.simantics.org/Sysdyn-1.1/SysdynModel"; public static final String SysdynModelicaFunction = "http://www.simantics.org/Sysdyn-1.1/SysdynModelicaFunction"; public static final String SysdynModelicaFunctionLibrary = "http://www.simantics.org/Sysdyn-1.1/SysdynModelicaFunctionLibrary"; 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 SysdynTerminal = "http://www.simantics.org/Sysdyn-1.1/SysdynTerminal"; + public static final String UsedVariableIndexes = "http://www.simantics.org/Sysdyn-1.1/UsedVariableIndexes"; + public static final String Validations = "http://www.simantics.org/Sysdyn-1.1/Validations"; + public static final String Validations_Dependencies = "http://www.simantics.org/Sysdyn-1.1/Validations/Dependencies"; + public static final String Validations_Dependencies_DependencyConnectionsIssueSource = "http://www.simantics.org/Sysdyn-1.1/Validations/Dependencies/DependencyConnectionsIssueSource"; + public static final String Validations_Dependencies_dependencyBaseRealizationFunction = "http://www.simantics.org/Sysdyn-1.1/Validations/Dependencies/dependencyBaseRealizationFunction"; + public static final String Validations_Dependencies_dependencySynchronizer = "http://www.simantics.org/Sysdyn-1.1/Validations/Dependencies/dependencySynchronizer"; + public static final String Validations_Dependencies_dependencyValidator = "http://www.simantics.org/Sysdyn-1.1/Validations/Dependencies/dependencyValidator"; + public static final String Validations_Expressions = "http://www.simantics.org/Sysdyn-1.1/Validations/Expressions"; + public static final String Validations_Expressions_ExpressionIssueSource = "http://www.simantics.org/Sysdyn-1.1/Validations/Expressions/ExpressionIssueSource"; + public static final String Validations_Expressions_expressionBaseRealizationFunction = "http://www.simantics.org/Sysdyn-1.1/Validations/Expressions/expressionBaseRealizationFunction"; + public static final String Validations_Expressions_expressionSynchronizer = "http://www.simantics.org/Sysdyn-1.1/Validations/Expressions/expressionSynchronizer"; + public static final String Validations_Expressions_expressionValidator = "http://www.simantics.org/Sysdyn-1.1/Validations/Expressions/expressionValidator"; public static final String Valve = "http://www.simantics.org/Sysdyn-1.1/Valve"; public static final String ValveSymbol = "http://www.simantics.org/Sysdyn-1.1/ValveSymbol"; public static final String Variable = "http://www.simantics.org/Sysdyn-1.1/Variable"; @@ -314,33 +470,71 @@ public class SysdynResource { } public SysdynResource(ReadGraph graph) { + AdditionalSymbols = getResourceOrNull(graph, URIs.AdditionalSymbols); + AdditionalSymbols_Text = getResourceOrNull(graph, URIs.AdditionalSymbols_Text); + AllElementsGroup = getResourceOrNull(graph, URIs.AllElementsGroup); ArrayIndexes = getResourceOrNull(graph, URIs.ArrayIndexes); ArrayIndexes_Inverse = getResourceOrNull(graph, URIs.ArrayIndexes_Inverse); Auxiliary = getResourceOrNull(graph, URIs.Auxiliary); AuxiliarySymbol = getResourceOrNull(graph, URIs.AuxiliarySymbol); + AvailableSharedFunctionLibraries = getResourceOrNull(graph, URIs.AvailableSharedFunctionLibraries); + AvailableVariableIndexes = getResourceOrNull(graph, URIs.AvailableVariableIndexes); BasicExperiment = getResourceOrNull(graph, URIs.BasicExperiment); + Browser = getResourceOrNull(graph, URIs.Browser); + Built$in_Functions = getResourceOrNull(graph, URIs.Built$in_Functions); + Built$in_Functions_Vensim_Functions = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions); + Built$in_Functions_Vensim_Functions_ABS = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_ABS); + Built$in_Functions_Vensim_Functions_COS = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_COS); + Built$in_Functions_Vensim_Functions_COSH = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_COSH); + Built$in_Functions_Vensim_Functions_EXP = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_EXP); + Built$in_Functions_Vensim_Functions_IFTHENELSE = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_IFTHENELSE); + Built$in_Functions_Vensim_Functions_LN = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_LN); + Built$in_Functions_Vensim_Functions_MAX = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_MAX); + Built$in_Functions_Vensim_Functions_MIN = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_MIN); + Built$in_Functions_Vensim_Functions_MODULO = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_MODULO); + Built$in_Functions_Vensim_Functions_PULSE = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_PULSE); + Built$in_Functions_Vensim_Functions_RAMP = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_RAMP); + Built$in_Functions_Vensim_Functions_SIN = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_SIN); + Built$in_Functions_Vensim_Functions_SINH = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_SINH); + Built$in_Functions_Vensim_Functions_SQRT = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_SQRT); + Built$in_Functions_Vensim_Functions_STEP = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_STEP); + Built$in_Functions_Vensim_Functions_TAN = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_TAN); + Built$in_Functions_Vensim_Functions_TANH = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_TANH); + Built$in_Functions_Vensim_Functions_XIDZ = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_XIDZ); + Built$in_Functions_Vensim_Functions_ZIDZ = getResourceOrNull(graph, URIs.Built$in_Functions_Vensim_Functions_ZIDZ); + Built$in_Functions_interpolate = getResourceOrNull(graph, URIs.Built$in_Functions_interpolate); + Built$in_Functions_interpolateFull = getResourceOrNull(graph, URIs.Built$in_Functions_interpolateFull); + Built$in_Functions_xidz = getResourceOrNull(graph, URIs.Built$in_Functions_xidz); + Built$in_Functions_zidz = getResourceOrNull(graph, URIs.Built$in_Functions_zidz); Cloud = getResourceOrNull(graph, URIs.Cloud); CloudSymbol = getResourceOrNull(graph, URIs.CloudSymbol); Configuration = getResourceOrNull(graph, URIs.Configuration); ConfigurationDiagram = getResourceOrNull(graph, URIs.ConfigurationDiagram); ConfigurationDiagramTemplate = getResourceOrNull(graph, URIs.ConfigurationDiagramTemplate); ConstantExpression = getResourceOrNull(graph, URIs.ConstantExpression); + DefaultProfile = getResourceOrNull(graph, URIs.DefaultProfile); DefaultRealization = getResourceOrNull(graph, URIs.DefaultRealization); DelayExpression = getResourceOrNull(graph, URIs.DelayExpression); Dependency = getResourceOrNull(graph, URIs.Dependency); DependencyConnection = getResourceOrNull(graph, URIs.DependencyConnection); + DependencyIssue = getResourceOrNull(graph, URIs.DependencyIssue); DiagramToCompositeMapping = getResourceOrNull(graph, URIs.DiagramToCompositeMapping); Enumeration = getResourceOrNull(graph, URIs.Enumeration); EnumerationIndex = getResourceOrNull(graph, URIs.EnumerationIndex); EnumerationIndexes = getResourceOrNull(graph, URIs.EnumerationIndexes); EnumerationIndexes_Inverse = getResourceOrNull(graph, URIs.EnumerationIndexes_Inverse); + EnumerationReplacement = getResourceOrNull(graph, URIs.EnumerationReplacement); Experiment = getResourceOrNull(graph, URIs.Experiment); + ExportModuleTree = getResourceOrNull(graph, URIs.ExportModuleTree); Expression = getResourceOrNull(graph, URIs.Expression); + ExpressionIssue = getResourceOrNull(graph, URIs.ExpressionIssue); Expressions = getResourceOrNull(graph, URIs.Expressions); Expressions_Inverse = getResourceOrNull(graph, URIs.Expressions_Inverse); + ExternalFiles = getResourceOrNull(graph, URIs.ExternalFiles); ExternalFunctionFile = getResourceOrNull(graph, URIs.ExternalFunctionFile); Flow = getResourceOrNull(graph, URIs.Flow); FlowConnection = getResourceOrNull(graph, URIs.FlowConnection); + FunctionTree = getResourceOrNull(graph, URIs.FunctionTree); GameExperiment = getResourceOrNull(graph, URIs.GameExperiment); HasActiveExpression = getResourceOrNull(graph, URIs.HasActiveExpression); HasActiveExpression_Inverse = getResourceOrNull(graph, URIs.HasActiveExpression_Inverse); @@ -403,6 +597,7 @@ public class SysdynResource { HasUnit = getResourceOrNull(graph, URIs.HasUnit); HasUnit_Inverse = getResourceOrNull(graph, URIs.HasUnit_Inverse); HistoryRealization = getResourceOrNull(graph, URIs.HistoryRealization); + ImportModuleTree = getResourceOrNull(graph, URIs.ImportModuleTree); ImportedOntologies = getResourceOrNull(graph, URIs.ImportedOntologies); IndependentVariable = getResourceOrNull(graph, URIs.IndependentVariable); Input = getResourceOrNull(graph, URIs.Input); @@ -414,7 +609,9 @@ public class SysdynResource { IsReplaceable_Inverse = getResourceOrNull(graph, URIs.IsReplaceable_Inverse); IsTailOf = getResourceOrNull(graph, URIs.IsTailOf); IsTailOfTerminal = getResourceOrNull(graph, URIs.IsTailOfTerminal); + IssueStyle = getResourceOrNull(graph, URIs.IssueStyle); LookupExpression = getResourceOrNull(graph, URIs.LookupExpression); + ModelBrowser = getResourceOrNull(graph, URIs.ModelBrowser); Module = getResourceOrNull(graph, URIs.Module); ModuleSymbol = getResourceOrNull(graph, URIs.ModuleSymbol); NormalExpression = getResourceOrNull(graph, URIs.NormalExpression); @@ -424,6 +621,26 @@ public class SysdynResource { PolarityLocation = getResourceOrNull(graph, URIs.PolarityLocation); PolarityLocation_Inverse = getResourceOrNull(graph, URIs.PolarityLocation_Inverse); Polarity_Inverse = getResourceOrNull(graph, URIs.Polarity_Inverse); + Profiles = getResourceOrNull(graph, URIs.Profiles); + Profiles_IssueWarnings = getResourceOrNull(graph, URIs.Profiles_IssueWarnings); + Profiles_SimulationPlaybackColours = getResourceOrNull(graph, URIs.Profiles_SimulationPlaybackColours); + ProjectActionContext = getResourceOrNull(graph, URIs.ProjectActionContext); + ProjectActionContext_Actions = getResourceOrNull(graph, URIs.ProjectActionContext_Actions); + ProjectActionContext_Actions_NewEnumeration = getResourceOrNull(graph, URIs.ProjectActionContext_Actions_NewEnumeration); + ProjectActionContext_Actions_NewFunction = getResourceOrNull(graph, URIs.ProjectActionContext_Actions_NewFunction); + ProjectActionContext_Actions_NewFunctionLibrary = getResourceOrNull(graph, URIs.ProjectActionContext_Actions_NewFunctionLibrary); + ProjectActionContext_Actions_NewModuleType = getResourceOrNull(graph, URIs.ProjectActionContext_Actions_NewModuleType); + ProjectActionContext_Actions_NewSharedFunctionLibrary = getResourceOrNull(graph, URIs.ProjectActionContext_Actions_NewSharedFunctionLibrary); + ProjectActionContext_Actions_OpenWorkbook = getResourceOrNull(graph, URIs.ProjectActionContext_Actions_OpenWorkbook); + ProjectBrowseContext = getResourceOrNull(graph, URIs.ProjectBrowseContext); + ProjectBrowseContext_BuiltinFunctions = getResourceOrNull(graph, URIs.ProjectBrowseContext_BuiltinFunctions); + ProjectBrowseContext_FunctionsFolder = getResourceOrNull(graph, URIs.ProjectBrowseContext_FunctionsFolder); + ProjectBrowseContext_ModuleContentChildRule = getResourceOrNull(graph, URIs.ProjectBrowseContext_ModuleContentChildRule); + ProjectBrowseContext_ModuleSymbol = getResourceOrNull(graph, URIs.ProjectBrowseContext_ModuleSymbol); + ProjectBrowseContext_ModuleTypeChildRule = getResourceOrNull(graph, URIs.ProjectBrowseContext_ModuleTypeChildRule); + ProjectBrowseContext_ModuleTypeLabelRule = getResourceOrNull(graph, URIs.ProjectBrowseContext_ModuleTypeLabelRule); + ProjectBrowseContext_ModulesFolder = getResourceOrNull(graph, URIs.ProjectBrowseContext_ModulesFolder); + ProjectBrowseContext_SharedFunctionsFolder = getResourceOrNull(graph, URIs.ProjectBrowseContext_SharedFunctionsFolder); Redeclaration = getResourceOrNull(graph, URIs.Redeclaration); RefersTo = getResourceOrNull(graph, URIs.RefersTo); ReplacedEnumeration = getResourceOrNull(graph, URIs.ReplacedEnumeration); @@ -431,12 +648,15 @@ public class SysdynResource { ReplacingEnumeration = getResourceOrNull(graph, URIs.ReplacingEnumeration); ReplacingEnumeration_Inverse = getResourceOrNull(graph, URIs.ReplacingEnumeration_Inverse); Result = getResourceOrNull(graph, URIs.Result); + SelectedSharedFunctionLibraries = getResourceOrNull(graph, URIs.SelectedSharedFunctionLibraries); SharedFunctionOntology = getResourceOrNull(graph, URIs.SharedFunctionOntology); SharedModuleOntolofgy = getResourceOrNull(graph, URIs.SharedModuleOntolofgy); ShowEnumerationIndexInCharts = getResourceOrNull(graph, URIs.ShowEnumerationIndexInCharts); ShowEnumerationIndexInCharts_Inverse = getResourceOrNull(graph, URIs.ShowEnumerationIndexInCharts_Inverse); ShowResult = getResourceOrNull(graph, URIs.ShowResult); SimulateOnChangeExperiment = getResourceOrNull(graph, URIs.SimulateOnChangeExperiment); + SimulationPlaybackProfile = getResourceOrNull(graph, URIs.SimulationPlaybackProfile); + SimulationPlaybackStyle = getResourceOrNull(graph, URIs.SimulationPlaybackStyle); Stock = getResourceOrNull(graph, URIs.Stock); StockExpression = getResourceOrNull(graph, URIs.StockExpression); StockSymbol = getResourceOrNull(graph, URIs.StockSymbol); @@ -446,11 +666,25 @@ public class SysdynResource { Symbols = getResourceOrNull(graph, URIs.Symbols); SysdynConnectionType = getResourceOrNull(graph, URIs.SysdynConnectionType); SysdynDiagramModelingRules = getResourceOrNull(graph, URIs.SysdynDiagramModelingRules); + SysdynIssue = getResourceOrNull(graph, URIs.SysdynIssue); SysdynModel = getResourceOrNull(graph, URIs.SysdynModel); SysdynModelicaFunction = getResourceOrNull(graph, URIs.SysdynModelicaFunction); SysdynModelicaFunctionLibrary = getResourceOrNull(graph, URIs.SysdynModelicaFunctionLibrary); SysdynModuleLibrary = getResourceOrNull(graph, URIs.SysdynModuleLibrary); + SysdynOperationBrowser = getResourceOrNull(graph, URIs.SysdynOperationBrowser); SysdynTerminal = getResourceOrNull(graph, URIs.SysdynTerminal); + UsedVariableIndexes = getResourceOrNull(graph, URIs.UsedVariableIndexes); + Validations = getResourceOrNull(graph, URIs.Validations); + Validations_Dependencies = getResourceOrNull(graph, URIs.Validations_Dependencies); + Validations_Dependencies_DependencyConnectionsIssueSource = getResourceOrNull(graph, URIs.Validations_Dependencies_DependencyConnectionsIssueSource); + Validations_Dependencies_dependencyBaseRealizationFunction = getResourceOrNull(graph, URIs.Validations_Dependencies_dependencyBaseRealizationFunction); + Validations_Dependencies_dependencySynchronizer = getResourceOrNull(graph, URIs.Validations_Dependencies_dependencySynchronizer); + Validations_Dependencies_dependencyValidator = getResourceOrNull(graph, URIs.Validations_Dependencies_dependencyValidator); + Validations_Expressions = getResourceOrNull(graph, URIs.Validations_Expressions); + Validations_Expressions_ExpressionIssueSource = getResourceOrNull(graph, URIs.Validations_Expressions_ExpressionIssueSource); + Validations_Expressions_expressionBaseRealizationFunction = getResourceOrNull(graph, URIs.Validations_Expressions_expressionBaseRealizationFunction); + Validations_Expressions_expressionSynchronizer = getResourceOrNull(graph, URIs.Validations_Expressions_expressionSynchronizer); + Validations_Expressions_expressionValidator = getResourceOrNull(graph, URIs.Validations_Expressions_expressionValidator); Valve = getResourceOrNull(graph, URIs.Valve); ValveSymbol = getResourceOrNull(graph, URIs.ValveSymbol); Variable = getResourceOrNull(graph, URIs.Variable); diff --git a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep index 6b559e7d..d99f7b6e 100644 --- a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep +++ b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep @@ -4,14 +4,14 @@ STR = DIA = SIMU = MOD = -SYSDYN = +SYSDYN = PROJ = //###################################################################### //# Example work model with two modules //###################################################################### -WM = : PROJ.Project +WM = : PROJ.Project PROJ.HasFeature _ : PROJ.FeatureSpec PROJ.HasGroupId "org.simantics.sysdyn.feature.group" L0.PartOf diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml index 1c1472e3..282a08e5 100644 --- a/org.simantics.sysdyn.ui/adapters.xml +++ b/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/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml index 0502cfae..f2b5516a 100644 --- a/org.simantics.sysdyn.ui/plugin.xml +++ b/org.simantics.sysdyn.ui/plugin.xml @@ -40,7 +40,7 @@ + type_uris="http://www.simantics.org/Sysdyn-0.0/Configuration"> @@ -915,7 +915,7 @@ variable="selection"> @@ -1207,7 +1207,7 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/Browser"> @@ -1253,69 +1253,69 @@ preference="2.0"> - + + browseContext="http://www.simantics.org/Sysdyn-0.0/AvailableVariableIndexes"> + browseContext="http://www.simantics.org/Sysdyn-0.0/UsedVariableIndexes"> + browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationIndexes"> + browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationReplacement"> + browseContext="http://www.simantics.org/Sysdyn-0.0/ExternalFiles"> + browseContext="http://www.simantics.org/Sysdyn-0.0/ModelBrowser"> + browseContext="http://www.simantics.org/Sysdyn-0.0/AvailableSharedFunctionLibraries"> + browseContext="http://www.simantics.org/Sysdyn-0.0/SelectedSharedFunctionLibraries"> + browseContext="http://www.simantics.org/Sysdyn-0.0/FunctionTree"> @@ -1334,14 +1334,14 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/ImportModuleTree"> + browseContext="http://www.simantics.org/Sysdyn-0.0/ExportModuleTree"> @@ -1355,7 +1355,7 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/Browser"> @@ -1417,61 +1417,61 @@ preference="2.0"> - + + browseContext="http://www.simantics.org/Sysdyn-0.0/AvailableVariableIndexes"> + browseContext="http://www.simantics.org/Sysdyn-0.0/UsedVariableIndexes"> + browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationIndexes"> + browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationReplacement"> + browseContext="http://www.simantics.org/Sysdyn-0.0/ExternalFiles"> + browseContext="http://www.simantics.org/Sysdyn-0.0/AvailableSharedFunctionLibraries"> + browseContext="http://www.simantics.org/Sysdyn-0.0/SelectedSharedFunctionLibraries"> + browseContext="http://www.simantics.org/Sysdyn-0.0/FunctionTree"> @@ -1490,14 +1490,14 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/ImportModuleTree"> + browseContext="http://www.simantics.org/Sysdyn-0.0/ExportModuleTree"> @@ -1511,7 +1511,7 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/Browser"> @@ -1521,26 +1521,26 @@ preference="2.0"> - + + browseContext="http://www.simantics.org/Sysdyn-0.0/ExternalFiles"> + browseContext="http://www.simantics.org/Sysdyn-0.0/AvailableSharedFunctionLibraries"> + browseContext="http://www.simantics.org/Sysdyn-0.0/SelectedSharedFunctionLibraries"> @@ -1550,7 +1550,7 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/Browser"> @@ -1609,7 +1609,7 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/Browser"> @@ -1653,7 +1653,7 @@ @@ -1661,7 +1661,7 @@ + browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationIndexes"> @@ -1719,7 +1719,7 @@ - + diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java index d838c192..15d9a7f1 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java @@ -27,6 +27,7 @@ import org.simantics.browsing.ui.swt.GraphExplorerFactory; import org.simantics.browsing.ui.swt.IContextMenuInitializer; import org.simantics.db.layer0.SelectionHints; import org.simantics.db.layer0.variable.Variable; +import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.Activator; import org.simantics.sysdyn.ui.browser.nodes.VariableNode; import org.simantics.sysdyn.ui.properties.SysdynPropertyPage; @@ -37,8 +38,8 @@ import org.simantics.utils.datastructures.hints.IHintContext; public class SysdynBrowser extends GraphExplorerView { -// private static final Set browseContexts = Collections.singleton("http://www.simantics.org/Sysdyn-1.0/Browser"); - private static final Set browseContexts = new HashSet(Arrays.asList("http://www.simantics.org/Sysdyn-1.0/Browser", "http://www.simantics.org/Operating-1.0/Browser", "http://www.simantics.org/Image-1.0/Browser")); +// private static final Set browseContexts = Collections.singleton("http://www.simantics.org/Sysdyn-1.1/Browser"); + private static final Set browseContexts = new HashSet(Arrays.asList("http://www.simantics.org/Sysdyn-1.1/Browser", "http://www.simantics.org/Operating-1.1/Browser", "http://www.simantics.org/Image-1.0/Browser")); private BinaryFunction selectionTransformation = new BinaryFunction() { @@ -98,7 +99,7 @@ public class SysdynBrowser extends GraphExplorerView { @Override public Object getAdapter(Class adapter) { if (adapter == IPropertyPage.class) - return new SysdynPropertyPage(getSite(), Collections.singleton("http://www.simantics.org/Sysdyn-1.0/Browser")); + return new SysdynPropertyPage(getSite(), Collections.singleton(SysdynResource.URIs.Browser)); return super.getAdapter(adapter); } } diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java index d1b32713..bf28f106 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java @@ -6,16 +6,17 @@ import java.util.HashSet; import java.util.Set; import org.simantics.structural.ui.modelBrowser.ModelBrowser; +import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.properties.SysdynPropertyPage; import org.simantics.ui.workbench.IPropertyPage; public class SysdynModelBrowser extends ModelBrowser { - final private Set browseContexts = new HashSet(Arrays.asList("http://www.simantics.org/Sysdyn-1.0/ProjectBrowseContext", "http://www.simantics.org/Operating-1.0/Browser", "http://www.simantics.org/Image-1.0/Browser")); + final private Set browseContexts = new HashSet(Arrays.asList(SysdynResource.URIs.ProjectBrowseContext, "http://www.simantics.org/Operating-1.1/Browser", "http://www.simantics.org/Image-1.0/Browser")); @Override protected IPropertyPage getPropertyPage() { - return new SysdynPropertyPage(getSite(), Collections.singleton("http://www.simantics.org/Sysdyn-1.0/ModelBrowser")); + return new SysdynPropertyPage(getSite(), Collections.singleton(SysdynResource.URIs.ModelBrowser)); } @Override diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynOperationBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynOperationBrowser.java index 9a767c1d..85ca518e 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynOperationBrowser.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynOperationBrowser.java @@ -15,10 +15,11 @@ import java.util.Collections; import java.util.Set; import org.simantics.browsing.ui.platform.GraphExplorerView; +import org.simantics.sysdyn.SysdynResource; public class SysdynOperationBrowser extends GraphExplorerView { - final private Set browseContexts = Collections.singleton("http://www.simantics.org/Sysdyn-1.0/SysdynOperationBrowser"); + final private Set browseContexts = Collections.singleton(SysdynResource.URIs.SysdynOperationBrowser); @Override protected Set getBrowseContexts() { diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/FunctionLibraries.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/FunctionLibraries.java index 754510d6..87151394 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/FunctionLibraries.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/FunctionLibraries.java @@ -48,7 +48,7 @@ public class FunctionLibraries extends ViewpointContributor { result.add(new FunctionLibraryNode(functionLibrary)); } - Resource sysdyn = graph.getPossibleResource("http://www.simantics.org/Sysdyn-1.0"); + Resource sysdyn = graph.getPossibleResource("http://www.simantics.org/Sysdyn-1.1"); if(sysdyn != null) { for(Resource library : graph.syncRequest(new ObjectsWithType(sysdyn, l0.ConsistsOf, sr.SysdynModelicaFunctionLibrary))) { result.add(new FunctionLibraryNode(library)); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java index b4efb985..8e697c51 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java @@ -103,7 +103,7 @@ public class DiagramViewer extends org.simantics.modeling.ui.diagramEditor.Diagr @Override protected Set getPropertyPageContexts() { - return Collections.singleton("http://www.simantics.org/Sysdyn-1.0/Browser"); + return Collections.singleton(SysdynResource.URIs.Browser); } @Override diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java index d778169c..03d91fe0 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/CreateVariablesShortcutParticipant.java @@ -45,6 +45,7 @@ import org.simantics.scenegraph.g2d.events.KeyEvent.KeyReleasedEvent; import org.simantics.scenegraph.g2d.events.MouseEvent.MouseClickEvent; import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent; import org.simantics.scenegraph.g2d.nodes.ShapeNode; +import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.elements2.AuxiliaryFactory; import org.simantics.sysdyn.ui.elements2.CloudFactory; import org.simantics.sysdyn.ui.elements2.InputFactory; @@ -126,31 +127,31 @@ public class CreateVariablesShortcutParticipant extends AbstractDiagramParticipa if (kpe.keyCode == java.awt.event.KeyEvent.VK_A) { variableInformation = new VariableInformation( java.awt.event.KeyEvent.VK_A, - "http://www.simantics.org/Sysdyn-1.0/AuxiliarySymbol", + SysdynResource.URIs.AuxiliarySymbol, (ShapeNode)AuxiliaryFactory.AUX_STATIC_IMAGE.init(parent) ); } else if (kpe.keyCode == java.awt.event.KeyEvent.VK_S) { variableInformation = new VariableInformation( java.awt.event.KeyEvent.VK_S, - "http://www.simantics.org/Sysdyn-1.0/StockSymbol", + SysdynResource.URIs.StockSymbol, (ShapeNode)StockFactory.STOCK_IMAGE.init(parent) ); } else if (kpe.keyCode == java.awt.event.KeyEvent.VK_C) { variableInformation = new VariableInformation( java.awt.event.KeyEvent.VK_C, - "http://www.simantics.org/Sysdyn-1.0/CloudSymbol", + SysdynResource.URIs.CloudSymbol, (ShapeNode)CloudFactory.CLOUD_IMAGE.init(parent) ); } else if (kpe.keyCode == java.awt.event.KeyEvent.VK_V) { variableInformation = new VariableInformation( java.awt.event.KeyEvent.VK_V, - "http://www.simantics.org/Sysdyn-1.0/ValveSymbol", + SysdynResource.URIs.ValveSymbol, (ShapeNode)ValveFactory.VALVE_STATIC_IMAGE.init(parent) ); } else if (kpe.keyCode == java.awt.event.KeyEvent.VK_I) { variableInformation = new VariableInformation( java.awt.event.KeyEvent.VK_I, - "http://www.simantics.org/Sysdyn-1.0/InputSymbol", + SysdynResource.URIs.InputSymbol, (ShapeNode)InputFactory.INPUT_IMAGE.init(parent) ); } diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ImportModelHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ImportModelHandler.java index 7d871b48..0bf887a3 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ImportModelHandler.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ImportModelHandler.java @@ -185,7 +185,7 @@ public class ImportModelHandler extends AbstractHandler { try { Layer0 l0 = Layer0.getInstance(graph); // The links should be exported and imported automatically - Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.0"); + Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.1"); Resource layer0 = graph.getResource("http://www.simantics.org/Layer0-1.0"); if(!graph.hasStatement(model, l0.IsLinkedTo, sysdyn)) graph.claim(model, l0.IsLinkedTo, sysdyn); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayIndexesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayIndexesTab.java index a6e4b241..0939900e 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayIndexesTab.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ArrayIndexesTab.java @@ -52,7 +52,7 @@ public class ArrayIndexesTab extends LabelPropertyTabContributor implements Widg "displaySelectors", "displayFilter").values(false, false), site, available, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI); availableEnumerationsExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/AvailableVariableIndexes"); + .setBrowseContexts(SysdynResource.URIs.AvailableVariableIndexes); availableEnumerationsExplorer.setColumns(ColumnKeys.ENUMERATION_TABLE_COLUMNS); availableEnumerationsExplorer.setInputSource(new SingleSelectionInputSource( Resource.class)); @@ -102,7 +102,7 @@ public class ArrayIndexesTab extends LabelPropertyTabContributor implements Widg "displaySelectors", "displayFilter").values(false, false), site, used, SWT.FULL_SELECTION | SWT.BORDER); usedEnumerationsExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/UsedVariableIndexes"); + .setBrowseContexts(SysdynResource.URIs.UsedVariableIndexes); usedEnumerationsExplorer.setColumns(ColumnKeys.ENUMERATION_TABLE_COLUMNS); usedEnumerationsExplorer.setInputSource(new SingleSelectionInputSource( Resource.class)); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java index 589f0c36..b0ceb8a0 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java @@ -92,7 +92,7 @@ public class EnumerationTab extends LabelPropertyTabContributor implements Widge "displaySelectors", "displayFilter").values(false, false), site, container, support, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI | SWT.CHECK); indexExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/EnumerationIndexes"); + .setBrowseContexts(SysdynResource.URIs.EnumerationIndexes); indexExplorer.setInputSource(new SingleSelectionInputSource( Resource.class)); ((Tree)indexExplorer.getExplorerControl()).addListener(SWT.Selection, new Listener () { diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java index 407ea60c..88c72a6f 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java @@ -38,6 +38,7 @@ import org.simantics.db.WriteGraph; import org.simantics.db.common.request.WriteRequest; import org.simantics.db.exception.DatabaseException; import org.simantics.db.management.ISessionContext; +import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.handlers.ExportExternalFunctionFilesHandler; import org.simantics.sysdyn.ui.handlers.ImportExternalFunctionFilesHandler; import org.simantics.sysdyn.ui.handlers.RemoveNodeHandler; @@ -63,7 +64,7 @@ public class ExternalFilesTab extends LabelPropertyTabContributor implements Wid "displaySelectors", "displayFilter").values(false, false), site, composite, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI); externalFilesExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/ExternalFiles"); + .setBrowseContexts(SysdynResource.URIs.ExternalFiles); externalFilesExplorer.setInputSource(new SingleSelectionInputSource( Resource.class)); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java index acde5e36..34f5ac22 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java @@ -29,6 +29,7 @@ import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport; import org.simantics.db.Resource; import org.simantics.db.management.ISessionContext; import org.simantics.layer0.Layer0; +import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.properties.widgets.ColumnKeys; import org.simantics.utils.datastructures.ArrayMap; @@ -54,7 +55,7 @@ public class ModuleTab extends LabelPropertyTabContributor implements Widget { "displaySelectors", "displayFilter").values(false, false), site, composite, SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI); enumerationRedeclarationExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/EnumerationReplacement"); + .setBrowseContexts(SysdynResource.URIs.EnumerationReplacement); enumerationRedeclarationExplorer.setColumns(ColumnKeys.ENUMERATION_REDECLARATION_COLUMNS); enumerationRedeclarationExplorer.setInputSource(new SingleSelectionInputSource( Resource.class)); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SharedFunctionLibrariesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SharedFunctionLibrariesTab.java index 248bceeb..e0172573 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SharedFunctionLibrariesTab.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SharedFunctionLibrariesTab.java @@ -39,6 +39,7 @@ import org.simantics.db.common.request.WriteRequest; import org.simantics.db.exception.DatabaseException; import org.simantics.db.management.ISessionContext; import org.simantics.layer0.Layer0; +import org.simantics.sysdyn.SysdynResource; import org.simantics.sysdyn.ui.browser.nodes.SharedFunctionLibraryNode; import org.simantics.ui.SimanticsUI; import org.simantics.ui.utils.AdaptionUtils; @@ -95,7 +96,7 @@ public class SharedFunctionLibrariesTab extends LabelPropertyTabContributor impl }; availableSharedFunctionLibraries - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/AvailableSharedFunctionLibraries"); + .setBrowseContexts(SysdynResource.URIs.AvailableSharedFunctionLibraries); availableSharedFunctionLibraries.setInputSource(new SingleSelectionInputSource( Resource.class)); @@ -194,7 +195,7 @@ public class SharedFunctionLibrariesTab extends LabelPropertyTabContributor impl }; usedSharedFunctionLibraries - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/SelectedSharedFunctionLibraries"); + .setBrowseContexts(SysdynResource.URIs.SelectedSharedFunctionLibraries); usedSharedFunctionLibraries.setInputSource(new SingleSelectionInputSource( Resource.class)); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ShortcutTabWidget.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ShortcutTabWidget.java index 4edaba63..4e8374e7 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ShortcutTabWidget.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ShortcutTabWidget.java @@ -90,13 +90,13 @@ public class ShortcutTabWidget implements Widget { Layer0 l0 = Layer0.getInstance(graph); ArrayList funktiot = new ArrayList(); - Resource funktionlibrary = graph.getPossibleResource("http://www.simantics.org/Sysdyn-1.0/Built-in%20Functions"); + Resource funktionlibrary = graph.getPossibleResource(SysdynResource.URIs.Built$in_Functions); for(Resource r : graph.syncRequest(new ObjectsWithType(funktionlibrary, l0.ConsistsOf, sr.SysdynModelicaFunction))) { String name = NameUtils.getSafeName(graph, r); funktiot.add(name); } - Resource subfunktionlibrary = graph.getPossibleResource("http://www.simantics.org/Sysdyn-1.0/Built-in%20Functions/Vensim%20Functions"); + Resource subfunktionlibrary = graph.getPossibleResource(SysdynResource.URIs.Built$in_Functions_Vensim_Functions); for(Resource r : graph.syncRequest(new ObjectsWithType(subfunktionlibrary, l0.ConsistsOf, sr.SysdynModelicaFunction))) { String name = NameUtils.getSafeName(graph, r); funktiot.add(name); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java index af6c0b21..06b421f2 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsExportPage.java @@ -41,6 +41,7 @@ import org.simantics.db.layer0.util.TransferableGraphRequest2; import org.simantics.db.request.Read; import org.simantics.graph.representation.TransferableGraph1; import org.simantics.layer0.Layer0; +import org.simantics.sysdyn.SysdynResource; import org.simantics.ui.SimanticsUI; import org.simantics.utils.datastructures.ArrayMap; import org.simantics.utils.datastructures.Pair; @@ -186,7 +187,7 @@ public class WizardFunctionsExportPage extends WizardPage { "displaySelectors", "displayFilter").values(false, false), null, workArea, SWT.BORDER | SWT.SINGLE); functionLibraryExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/FunctionTree"); + .setBrowseContexts(SysdynResource.URIs.FunctionTree); functionLibraryExplorer.finish(); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java index 3a5d4e50..86f10c2c 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/functions/WizardFunctionsImportPage.java @@ -200,7 +200,7 @@ public class WizardFunctionsImportPage extends WizardPage{ "displaySelectors", "displayFilter").values(false, false), null, workArea, SWT.BORDER | SWT.SINGLE); functionLibraryExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/FunctionTree"); + .setBrowseContexts(SysdynResource.URIs.FunctionTree); functionLibraryExplorer.finish(); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java index 36d147f9..a7194de6 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsExportPage.java @@ -40,6 +40,7 @@ import org.simantics.db.layer0.util.TransferableGraphRequest2; import org.simantics.db.request.Read; import org.simantics.graph.representation.TransferableGraph1; import org.simantics.layer0.Layer0; +import org.simantics.sysdyn.SysdynResource; import org.simantics.ui.SimanticsUI; import org.simantics.utils.datastructures.ArrayMap; import org.simantics.utils.datastructures.Pair; @@ -189,7 +190,7 @@ public class WizardModelsExportPage extends WizardPage { "displaySelectors", "displayFilter").values(false, false), null, workArea, SWT.BORDER | SWT.SINGLE); modelExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/ImportModuleTree"); + .setBrowseContexts(SysdynResource.URIs.ImportModuleTree); modelExplorer.finish(); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java index 9e2ecc5c..e778d60c 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/models/WizardModelsImportPage.java @@ -307,7 +307,7 @@ public class WizardModelsImportPage extends WizardPage{ try { Layer0 l0 = Layer0.getInstance(graph); // The links should be exported and imported automatically - Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.0"); + Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.1"); Resource layer0 = graph.getResource("http://www.simantics.org/Layer0-1.0"); if(!graph.hasStatement(model, l0.IsLinkedTo, sysdyn)) graph.claim(model, l0.IsLinkedTo, sysdyn); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java index af0a1996..1bfea7c3 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesExportPage.java @@ -192,7 +192,7 @@ public class WizardModulesExportPage extends WizardPage { "displaySelectors", "displayFilter").values(false, false), null, workArea, SWT.BORDER | SWT.SINGLE); modelExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/ExportModuleTree"); + .setBrowseContexts(SysdynResource.URIs.ExportModuleTree); modelExplorer.finish(); diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java index 0950f7da..9ec3377d 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/modules/WizardModulesImportPage.java @@ -197,7 +197,7 @@ public class WizardModulesImportPage extends WizardPage{ "displaySelectors", "displayFilter").values(false, false), null, workArea, SWT.BORDER | SWT.SINGLE); modelExplorer - .setBrowseContexts("http://www.simantics.org/Sysdyn-1.0/ImportModuleTree"); + .setBrowseContexts(SysdynResource.URIs.ImportModuleTree); modelExplorer.finish(); diff --git a/org.simantics.sysdyn/adapters.xml b/org.simantics.sysdyn/adapters.xml index ed510299..aa3f0ba4 100644 --- a/org.simantics.sysdyn/adapters.xml +++ b/org.simantics.sysdyn/adapters.xml @@ -15,14 +15,14 @@ - - - diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/FunctionUtils.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/FunctionUtils.java index 725eed58..1ef05738 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/FunctionUtils.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/FunctionUtils.java @@ -229,7 +229,7 @@ public class FunctionUtils { String parentName = NameUtils.getSafeName(graph, library); File scriptFile = new File(dir, parentName + ".mo"); - Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.0"); + Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.1"); if(library.equals(sysdyn)) { updateFunctionFile(graph, library, scriptFile, true); diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java index 017d9d77..48cc1fce 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java @@ -225,8 +225,8 @@ public class Model implements IWriteableMDLObject { // Diagram creation copied from SysdynProject. // Could the same code be reused? - Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.0"); - Resource layer0 = graph.getResource("http://www.simantics.org/Layer0-1.0"); + Resource sysdyn = graph.getResource("http://www.simantics.org/Sysdyn-1.1"); + Resource layer0 = graph.getResource("http://www.simantics.org/Layer0-1.1"); Resource model = GraphUtils.create2( graph, diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/ArrayIndexes.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/ArrayIndexes.java index a148b0cb..1db1239b 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/ArrayIndexes.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/ArrayIndexes.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedOrderedSetElements; -@GraphType("http://www.simantics.org/Sysdyn-1.0/ArrayIndexes") +@GraphType("http://www.simantics.org/Sysdyn-1.1/ArrayIndexes") public class ArrayIndexes { @RelatedOrderedSetElements diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Auxiliary.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Auxiliary.java index 9d0b1fba..fa150c78 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Auxiliary.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Auxiliary.java @@ -14,7 +14,7 @@ package org.simantics.sysdyn.representation; import org.simantics.objmap.annotations.GraphType; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Auxiliary") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Auxiliary") public class Auxiliary extends IndependentVariable { @Override public void accept(IElementVisitorVoid v) { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Cloud.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Cloud.java index f1973c7f..56840b6c 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Cloud.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Cloud.java @@ -14,7 +14,7 @@ package org.simantics.sysdyn.representation; import org.simantics.objmap.annotations.GraphType; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Cloud") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Cloud") public class Cloud implements IElement { @Override public void accept(IElementVisitorVoid v) { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Configuration.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Configuration.java index 298aada1..b2e8e8a5 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Configuration.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Configuration.java @@ -19,7 +19,7 @@ import org.simantics.objmap.annotations.RelatedElements; import org.simantics.objmap.annotations.RelatedValue; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Configuration") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Configuration") public class Configuration { @RelatedValue("http://www.simantics.org/Layer0-1.0/HasName") diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Dependency.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Dependency.java index 2186d748..2b220fbf 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Dependency.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Dependency.java @@ -15,13 +15,13 @@ import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedElement; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Dependency") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Dependency") public class Dependency implements IElement { - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasTail") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasTail") private IElement tail; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasHead") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasHead") private IElement head; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/RefersTo") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/RefersTo") private IElement refersTo; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Enumeration.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Enumeration.java index 98acfbb4..741f3375 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Enumeration.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Enumeration.java @@ -19,17 +19,17 @@ import org.simantics.objmap.annotations.RelatedElements; import org.simantics.objmap.annotations.RelatedValue; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Enumeration") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Enumeration") public class Enumeration extends Variable { - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasEnumerationIndexes") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasEnumerationIndexes") private EnumerationIndexes enumerationIndexes; - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/IsReplaceable") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/IsReplaceable") private Boolean isReplaceable; @RelatedElements( - value = "http://www.simantics.org/Sysdyn-1.0/ReplacedEnumeration/Inverse", + value = "http://www.simantics.org/Sysdyn-1.1/ReplacedEnumeration/Inverse", composition = true) private ArrayList redeclarations = new ArrayList(); diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndex.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndex.java index 9cbff869..0d565c41 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndex.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndex.java @@ -3,7 +3,7 @@ package org.simantics.sysdyn.representation; import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedValue; -@GraphType("http://www.simantics.org/Sysdyn-1.0/EnumerationIndex") +@GraphType("http://www.simantics.org/Sysdyn-1.1/EnumerationIndex") public class EnumerationIndex { @RelatedValue("http://www.simantics.org/Layer0-1.0/HasName") diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndexes.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndexes.java index 024a7b3e..43e111f3 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndexes.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/EnumerationIndexes.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedOrderedSetElements; -@GraphType("http://www.simantics.org/Sysdyn-1.0/EnumerationIndexes") +@GraphType("http://www.simantics.org/Sysdyn-1.1/EnumerationIndexes") public class EnumerationIndexes { @RelatedOrderedSetElements diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Flow.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Flow.java index 25c102af..98996b11 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Flow.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Flow.java @@ -15,11 +15,11 @@ import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedElement; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Flow") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Flow") public class Flow implements IElement { - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasTail") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasTail") private IElement tail; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasHead") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasHead") private IElement head; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Input.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Input.java index 2c387726..5ad136a2 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Input.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Input.java @@ -20,12 +20,12 @@ import org.simantics.objmap.annotations.RelatedElements; import org.simantics.objmap.annotations.RelatedValue; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Input") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Input") public class Input extends Variable { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasDefaultInputValue") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasDefaultInputValue") private Double defaultInputValue; - @RelatedElements("http://www.simantics.org/Sysdyn-1.0/IsHeadOf") + @RelatedElements("http://www.simantics.org/Sysdyn-1.1/IsHeadOf") private List isHeadOf; diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java index 49594945..8be91f13 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java @@ -14,22 +14,22 @@ package org.simantics.sysdyn.representation; import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedValue; -@GraphType("http://www.simantics.org/Sysdyn-1.0/SysdynModel") +@GraphType("http://www.simantics.org/Sysdyn-1.1/SysdynModel") public class Model { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasStartTime") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasStartTime") private Double startTime = 0.0; - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasStopTime") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasStopTime") private Double stopTime = 10.0; - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasOutputInterval") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasOutputInterval") private Double outputInterval; - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasTolerance") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasTolerance") private Double tolerance; - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasSolver") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasSolver") private String solver; public Double getStartTime() { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Module.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Module.java index 941e0632..4c7fb5ba 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Module.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Module.java @@ -21,7 +21,7 @@ import org.simantics.objmap.annotations.RelatedElements; import org.simantics.objmap.annotations.RelatedValue; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Module") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Module") public class Module implements IElement { @RelatedValue("http://www.simantics.org/Layer0-1.0/HasName") @@ -33,7 +33,7 @@ public class Module implements IElement { @RelatedElement("http://www.simantics.org/Layer0-1.0/InstanceOf") private ModuleType type; - @RelatedElements("http://www.simantics.org/Sysdyn-1.0/HasRedeclaration") + @RelatedElements("http://www.simantics.org/Sysdyn-1.1/HasRedeclaration") private List redeclarations; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Redeclaration.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Redeclaration.java index e850d9c5..417fbbab 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Redeclaration.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Redeclaration.java @@ -14,13 +14,13 @@ package org.simantics.sysdyn.representation; import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedElement; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Redeclaration") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Redeclaration") public class Redeclaration { - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/ReplacedEnumeration") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/ReplacedEnumeration") private Enumeration replacedEnumeration; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/ReplacingEnumeration") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/ReplacingEnumeration") private Enumeration replacingEnumeration; public String getRedeclaration() { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Stock.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Stock.java index b05cef6c..8aee598a 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Stock.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Stock.java @@ -17,17 +17,17 @@ import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedElements; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Stock") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Stock") public class Stock extends IndependentVariable { @RelatedElements( - value = "http://www.simantics.org/Sysdyn-1.0/IsHeadOf", + value = "http://www.simantics.org/Sysdyn-1.1/IsHeadOf", composition = true) private ArrayList incomingConnections = new ArrayList(); @RelatedElements( - value = "http://www.simantics.org/Sysdyn-1.0/IsTailOf", + value = "http://www.simantics.org/Sysdyn-1.1/IsTailOf", composition = true) private ArrayList outgoingConnections = new ArrayList(); diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Valve.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Valve.java index 05c88989..0ae3c3b0 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Valve.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Valve.java @@ -14,7 +14,7 @@ package org.simantics.sysdyn.representation; import org.simantics.objmap.annotations.GraphType; import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Valve") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Valve") public class Valve extends IndependentVariable { @Override public void accept(IElementVisitorVoid v) { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Variable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Variable.java index b7f37b95..69c03432 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Variable.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Variable.java @@ -17,7 +17,7 @@ import org.simantics.sysdyn.representation.expressions.Expressions; public abstract class Variable implements IElement { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/Variable/Type") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/Variable/Type") protected String type; @RelatedValue("http://www.simantics.org/Layer0-1.0/HasName") @@ -26,10 +26,10 @@ public abstract class Variable implements IElement { @RelatedElement("http://www.simantics.org/Layer0-1.0/PartOf") protected Object parent; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasArrayIndexes") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasArrayIndexes") protected ArrayIndexes arrayIndexes; - @RelatedElement("http://www.simantics.org/Sysdyn-1.0/HasExpressions") + @RelatedElement("http://www.simantics.org/Sysdyn-1.1/HasExpressions") protected Expressions expressions; diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ConstantExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ConstantExpression.java index d7cae5e9..c4a3d1e6 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ConstantExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ConstantExpression.java @@ -15,10 +15,10 @@ import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedValue; import org.simantics.sysdyn.representation.IndependentVariable; -@GraphType("http://www.simantics.org/Sysdyn-1.0/ConstantExpression") +@GraphType("http://www.simantics.org/Sysdyn-1.1/ConstantExpression") public class ConstantExpression extends Expression { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasEquation") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasEquation") private String equation; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/DelayExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/DelayExpression.java index 5d826ae7..1f9fe835 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/DelayExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/DelayExpression.java @@ -13,7 +13,7 @@ package org.simantics.sysdyn.representation.expressions; import org.simantics.objmap.annotations.GraphType; -@GraphType("http://www.simantics.org/Sysdyn-1.0/DelayExpression") +@GraphType("http://www.simantics.org/Sysdyn-1.1/DelayExpression") public class DelayExpression extends Expression { } diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java index 1fd149ef..ea8eb302 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java @@ -16,7 +16,7 @@ import org.simantics.sysdyn.representation.IndependentVariable; public abstract class Expression implements IExpression { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasArrayRange") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasArrayRange") private String range; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expressions.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expressions.java index d92336d8..394ce422 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expressions.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expressions.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import org.simantics.objmap.annotations.GraphType; import org.simantics.objmap.annotations.RelatedOrderedSetElements; -@GraphType("http://www.simantics.org/Sysdyn-1.0/Expressions") +@GraphType("http://www.simantics.org/Sysdyn-1.1/Expressions") public class Expressions { @RelatedOrderedSetElements diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/LookupExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/LookupExpression.java index b9213656..e6ef859c 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/LookupExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/LookupExpression.java @@ -13,7 +13,7 @@ package org.simantics.sysdyn.representation.expressions; import org.simantics.objmap.annotations.GraphType; -@GraphType("http://www.simantics.org/Sysdyn-1.0/LookupExpression") +@GraphType("http://www.simantics.org/Sysdyn-1.1/LookupExpression") public class LookupExpression extends Expression { } diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/NormalExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/NormalExpression.java index aaf00192..6495c4d6 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/NormalExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/NormalExpression.java @@ -22,10 +22,10 @@ import org.simantics.sysdyn.representation.IndependentVariable; import org.simantics.sysdyn.representation.utils.FormatUtils; import org.simantics.sysdyn.representation.utils.IndexUtils; -@GraphType("http://www.simantics.org/Sysdyn-1.0/NormalExpression") +@GraphType("http://www.simantics.org/Sysdyn-1.1/NormalExpression") public class NormalExpression extends Expression { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasEquation") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasEquation") private String equation; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ParameterExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ParameterExpression.java index e5649c11..14819372 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ParameterExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ParameterExpression.java @@ -21,10 +21,10 @@ import org.simantics.sysdyn.representation.Enumeration; import org.simantics.sysdyn.representation.IndependentVariable; import org.simantics.sysdyn.representation.utils.IndexUtils; -@GraphType("http://www.simantics.org/Sysdyn-1.0/ParameterExpression") +@GraphType("http://www.simantics.org/Sysdyn-1.1/ParameterExpression") public class ParameterExpression extends Expression { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasEquation") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasEquation") private String equation; @Override diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java index c15eb7cd..3de4ffe7 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java @@ -23,12 +23,12 @@ import org.simantics.sysdyn.representation.utils.FormatUtils; import org.simantics.sysdyn.representation.utils.IndexUtils; -@GraphType("http://www.simantics.org/Sysdyn-1.0/WithLookupExpression") +@GraphType("http://www.simantics.org/Sysdyn-1.1/WithLookupExpression") public class WithLookupExpression extends Expression { - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasLookup") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasLookup") private String lookupTable; - @RelatedValue("http://www.simantics.org/Sysdyn-1.0/HasEquation") + @RelatedValue("http://www.simantics.org/Sysdyn-1.1/HasEquation") private String equation; @Override -- 2.47.1