From: villberg Date: Thu, 27 Oct 2011 08:19:03 +0000 (+0000) Subject: git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23049 ac1ea38d-2e2b... X-Git-Tag: simantics-1.6~122 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=2621b79c95d51c267c84fc0dbf69df468d500980;p=simantics%2Fsysdyn.git git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23049 ac1ea38d-2e2b-0410-8846-a27921b304fc --- 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 1022b350..358bb901 100644 Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ diff --git a/org.simantics.sysdyn.ontology/graph/GeneralSymbols.pgraph b/org.simantics.sysdyn.ontology/graph/GeneralSymbols.pgraph index 57f3e8e2..2c700f19 100644 --- a/org.simantics.sysdyn.ontology/graph/GeneralSymbols.pgraph +++ b/org.simantics.sysdyn.ontology/graph/GeneralSymbols.pgraph @@ -1,7 +1,7 @@ L0 = 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