From dec1729d8c67bc51494262f0b1f966b587def34a Mon Sep 17 00:00:00 2001 From: jkauttio Date: Tue, 1 Apr 2014 11:21:17 +0000 Subject: [PATCH] Clean up vensim import, move files under sensible packages refs #2924 git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/dev-jkauttio@29232 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../sysdyn/modelImport/MdlParser2.java | 38 ++++++++--------- .../sysdyn/modelImport/MdlUtils.java | 32 +++++++------- .../modelImport/{model => mdl}/MdlModel.java | 5 ++- .../modelImport/{model => mdl}/Sketch2.java | 4 +- .../{model => mdl}/SketchComment.java | 5 ++- .../{model => mdl}/SketchConnection.java | 6 ++- .../{model => mdl}/SketchElement.java | 4 +- .../{model => mdl}/SketchObject.java | 2 +- .../{model => mdl}/SketchValve.java | 6 ++- .../{model => mdl}/SketchVariable.java | 8 +++- .../sysdyn/modelImport/model/Expression.java | 42 ------------------- .../sysdyn/modelImport/model/IExpression.java | 5 --- .../sysdyn/modelImport/model/Model2.java | 5 +++ .../model/{ => element}/Auxiliary2.java | 6 ++- .../model/{ => element}/Cloud2.java | 3 +- .../model/{ => element}/Comment2.java | 3 +- .../model/{ => element}/Connection2.java | 4 +- .../model/{ => element}/Dependency2.java | 3 +- .../model/{ => element}/Element2.java | 5 ++- .../model/{ => element}/Flow2.java | 3 +- .../model/{ => element}/ModelVariable.java | 7 +++- .../model/{ => element}/Shadow2.java | 4 +- .../model/{ => element}/Stock2.java | 6 ++- .../model/{ => element}/Valve2.java | 6 ++- .../{ => expression}/DelayExpression.java | 3 +- .../model/expression/IExpression.java | 7 ++++ .../{ => expression}/IntegralExpression.java | 3 +- .../{ => expression}/LookupExpression.java | 3 +- .../{ => expression}/NormalExpression.java | 3 +- .../{ => expression}/SubscriptExpression.java | 3 +- .../model/{ => support}/Enumeration2.java | 4 +- .../model/{ => support}/Range.java | 4 +- .../model/{ => support}/Subscript2.java | 2 +- .../model/{ => support}/Variable2.java | 5 ++- 34 files changed, 138 insertions(+), 111 deletions(-) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/MdlModel.java (86%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/Sketch2.java (91%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/SketchComment.java (74%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/SketchConnection.java (84%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/SketchElement.java (90%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/SketchObject.java (76%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/SketchValve.java (69%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/{model => mdl}/SketchVariable.java (62%) delete mode 100644 org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Expression.java delete mode 100644 org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IExpression.java rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Auxiliary2.java (74%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Cloud2.java (85%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Comment2.java (87%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Connection2.java (91%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Dependency2.java (88%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Element2.java (87%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Flow2.java (86%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/ModelVariable.java (82%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Shadow2.java (85%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Stock2.java (73%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => element}/Valve2.java (81%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => expression}/DelayExpression.java (86%) create mode 100644 org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IExpression.java rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => expression}/IntegralExpression.java (87%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => expression}/LookupExpression.java (81%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => expression}/NormalExpression.java (86%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => expression}/SubscriptExpression.java (87%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => support}/Enumeration2.java (76%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => support}/Range.java (77%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => support}/Subscript2.java (85%) rename org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/{ => support}/Variable2.java (77%) diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java index 2cd600b3..9dd6dbfb 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser2.java @@ -20,26 +20,26 @@ import java.util.ArrayList; import java.util.HashMap; import org.simantics.sysdyn.modelImport.MdlUtils.CommentIcon; -import org.simantics.sysdyn.modelImport.model.Auxiliary2; -import org.simantics.sysdyn.modelImport.model.Cloud2; -import org.simantics.sysdyn.modelImport.model.Comment2; -import org.simantics.sysdyn.modelImport.model.Connection2; -import org.simantics.sysdyn.modelImport.model.Element2; -import org.simantics.sysdyn.modelImport.model.IntegralExpression; -import org.simantics.sysdyn.modelImport.model.MdlModel; +import org.simantics.sysdyn.modelImport.mdl.MdlModel; +import org.simantics.sysdyn.modelImport.mdl.Sketch2; +import org.simantics.sysdyn.modelImport.mdl.SketchComment; +import org.simantics.sysdyn.modelImport.mdl.SketchConnection; +import org.simantics.sysdyn.modelImport.mdl.SketchElement; +import org.simantics.sysdyn.modelImport.mdl.SketchObject; +import org.simantics.sysdyn.modelImport.mdl.SketchValve; +import org.simantics.sysdyn.modelImport.mdl.SketchVariable; import org.simantics.sysdyn.modelImport.model.Model2; -import org.simantics.sysdyn.modelImport.model.Shadow2; -import org.simantics.sysdyn.modelImport.model.Sketch2; -import org.simantics.sysdyn.modelImport.model.SketchComment; -import org.simantics.sysdyn.modelImport.model.SketchConnection; -import org.simantics.sysdyn.modelImport.model.SketchElement; -import org.simantics.sysdyn.modelImport.model.SketchObject; -import org.simantics.sysdyn.modelImport.model.SketchValve; -import org.simantics.sysdyn.modelImport.model.SketchVariable; -import org.simantics.sysdyn.modelImport.model.Stock2; -import org.simantics.sysdyn.modelImport.model.Subscript2; -import org.simantics.sysdyn.modelImport.model.Valve2; -import org.simantics.sysdyn.modelImport.model.Variable2; +import org.simantics.sysdyn.modelImport.model.element.Auxiliary2; +import org.simantics.sysdyn.modelImport.model.element.Cloud2; +import org.simantics.sysdyn.modelImport.model.element.Comment2; +import org.simantics.sysdyn.modelImport.model.element.Connection2; +import org.simantics.sysdyn.modelImport.model.element.Element2; +import org.simantics.sysdyn.modelImport.model.element.Shadow2; +import org.simantics.sysdyn.modelImport.model.element.Stock2; +import org.simantics.sysdyn.modelImport.model.element.Valve2; +import org.simantics.sysdyn.modelImport.model.expression.IntegralExpression; +import org.simantics.sysdyn.modelImport.model.support.Subscript2; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public class MdlParser2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlUtils.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlUtils.java index d9eb5455..223c4d69 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlUtils.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlUtils.java @@ -3,22 +3,22 @@ package org.simantics.sysdyn.modelImport; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.simantics.sysdyn.modelImport.model.DelayExpression; -import org.simantics.sysdyn.modelImport.model.IExpression; -import org.simantics.sysdyn.modelImport.model.IntegralExpression; -import org.simantics.sysdyn.modelImport.model.LookupExpression; -import org.simantics.sysdyn.modelImport.model.MdlModel; -import org.simantics.sysdyn.modelImport.model.NormalExpression; -import org.simantics.sysdyn.modelImport.model.Range; -import org.simantics.sysdyn.modelImport.model.SketchComment; -import org.simantics.sysdyn.modelImport.model.SketchConnection; -import org.simantics.sysdyn.modelImport.model.SketchElement; -import org.simantics.sysdyn.modelImport.model.SketchValve; -import org.simantics.sysdyn.modelImport.model.SketchVariable; -import org.simantics.sysdyn.modelImport.model.Subscript2; -import org.simantics.sysdyn.modelImport.model.SubscriptExpression; -import org.simantics.sysdyn.modelImport.model.Variable2; -import org.simantics.sysdyn.modelImport.model.Valve2.TextPosition; +import org.simantics.sysdyn.modelImport.mdl.MdlModel; +import org.simantics.sysdyn.modelImport.mdl.SketchComment; +import org.simantics.sysdyn.modelImport.mdl.SketchConnection; +import org.simantics.sysdyn.modelImport.mdl.SketchElement; +import org.simantics.sysdyn.modelImport.mdl.SketchValve; +import org.simantics.sysdyn.modelImport.mdl.SketchVariable; +import org.simantics.sysdyn.modelImport.model.element.Valve2.TextPosition; +import org.simantics.sysdyn.modelImport.model.expression.DelayExpression; +import org.simantics.sysdyn.modelImport.model.expression.IExpression; +import org.simantics.sysdyn.modelImport.model.expression.IntegralExpression; +import org.simantics.sysdyn.modelImport.model.expression.LookupExpression; +import org.simantics.sysdyn.modelImport.model.expression.NormalExpression; +import org.simantics.sysdyn.modelImport.model.expression.SubscriptExpression; +import org.simantics.sysdyn.modelImport.model.support.Range; +import org.simantics.sysdyn.modelImport.model.support.Subscript2; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public class MdlUtils { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/MdlModel.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/MdlModel.java similarity index 86% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/MdlModel.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/MdlModel.java index 7f211623..3677ec77 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/MdlModel.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/MdlModel.java @@ -1,10 +1,13 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; +import org.simantics.sysdyn.modelImport.model.support.Subscript2; +import org.simantics.sysdyn.modelImport.model.support.Variable2; + public class MdlModel { private String name; diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Sketch2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Sketch2.java similarity index 91% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Sketch2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Sketch2.java index b2f86ae8..b75d3741 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Sketch2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Sketch2.java @@ -1,9 +1,11 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.simantics.sysdyn.modelImport.model.element.Element2; + public class Sketch2 { private String name; diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchComment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchComment.java similarity index 74% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchComment.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchComment.java index d053a5c0..fe3c4110 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchComment.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchComment.java @@ -1,6 +1,9 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; import org.simantics.sysdyn.modelImport.MdlUtils.CommentIcon; +import org.simantics.sysdyn.modelImport.model.element.Cloud2; +import org.simantics.sysdyn.modelImport.model.element.Comment2; +import org.simantics.sysdyn.modelImport.model.element.Element2; public class SketchComment extends SketchElement { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchConnection.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchConnection.java similarity index 84% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchConnection.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchConnection.java index 5968eb8e..c0828b76 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchConnection.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchConnection.java @@ -1,6 +1,10 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; import org.simantics.sysdyn.modelImport.MdlUtils.ConnectionType; +import org.simantics.sysdyn.modelImport.model.element.Connection2; +import org.simantics.sysdyn.modelImport.model.element.Dependency2; +import org.simantics.sysdyn.modelImport.model.element.Element2; +import org.simantics.sysdyn.modelImport.model.element.Flow2; public class SketchConnection extends SketchObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchElement.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchElement.java similarity index 90% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchElement.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchElement.java index 34ce854d..974751e2 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchElement.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchElement.java @@ -1,4 +1,6 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; + +import org.simantics.sysdyn.modelImport.model.element.Element2; public abstract class SketchElement extends SketchObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchObject.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchObject.java similarity index 76% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchObject.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchObject.java index 003741c7..d554ec59 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchObject.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchObject.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; public abstract class SketchObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchValve.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchValve.java similarity index 69% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchValve.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchValve.java index 670e23cc..71161285 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchValve.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchValve.java @@ -1,6 +1,8 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; -import org.simantics.sysdyn.modelImport.model.Valve2.TextPosition; +import org.simantics.sysdyn.modelImport.model.element.Element2; +import org.simantics.sysdyn.modelImport.model.element.Valve2; +import org.simantics.sysdyn.modelImport.model.element.Valve2.TextPosition; public class SketchValve extends SketchElement { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchVariable.java similarity index 62% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchVariable.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchVariable.java index 6a0fabb7..c24791a0 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SketchVariable.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchVariable.java @@ -1,4 +1,10 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.mdl; + +import org.simantics.sysdyn.modelImport.model.element.Auxiliary2; +import org.simantics.sysdyn.modelImport.model.element.Element2; +import org.simantics.sysdyn.modelImport.model.element.Stock2; +import org.simantics.sysdyn.modelImport.model.expression.IntegralExpression; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public class SketchVariable extends SketchElement { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Expression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Expression.java deleted file mode 100644 index f8e4bade..00000000 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Expression.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2011 Association for Decentralized Information Management in - * Industry THTH ry. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * VTT Technical Research Centre of Finland - initial API and implementation - *******************************************************************************/ -package org.simantics.sysdyn.modelImport.model; - - -public class Expression { - - private String range, expression; - - @Override - public String toString() { - return (range != null ? "[" + range + "]: " : "") + expression; - } - - public String getRange() { - return range; - } - - public void setRange(String range) { - this.range = range; - } - - public String getExpression() { - if (expression == null) - return ""; - return expression; - } - - public void setExpression(String expression) { - this.expression = expression; - } - -} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IExpression.java deleted file mode 100644 index d4ab16f0..00000000 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IExpression.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.simantics.sysdyn.modelImport.model; - -public interface IExpression extends IWriteableObject { - -} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java index ca68dad5..b4121b12 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model2.java @@ -24,6 +24,11 @@ import org.simantics.diagram.stubs.DiagramResource; import org.simantics.layer0.Layer0; import org.simantics.modeling.ModelingResources; import org.simantics.simulation.ontology.SimulationResource; +import org.simantics.sysdyn.modelImport.model.element.Connection2; +import org.simantics.sysdyn.modelImport.model.element.Element2; +import org.simantics.sysdyn.modelImport.model.element.ModelVariable; +import org.simantics.sysdyn.modelImport.model.element.Shadow2; +import org.simantics.sysdyn.modelImport.model.support.Enumeration2; import org.simantics.sysdyn.utils.ModelUtils; public class Model2 implements IWriteableObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Auxiliary2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Auxiliary2.java similarity index 74% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Auxiliary2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Auxiliary2.java index cbca5c98..f1dbf8e4 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Auxiliary2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Auxiliary2.java @@ -1,9 +1,13 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; +import org.simantics.sysdyn.modelImport.model.expression.IExpression; +import org.simantics.sysdyn.modelImport.model.support.Range; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public class Auxiliary2 extends ModelVariable { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Cloud2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Cloud2.java similarity index 85% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Cloud2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Cloud2.java index 14d39b63..f8813db7 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Cloud2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Cloud2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; @@ -6,6 +6,7 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Cloud2 extends Element2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Comment2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Comment2.java similarity index 87% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Comment2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Comment2.java index 985fc73a..72b18b2f 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Comment2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Comment2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.databoard.Bindings; import org.simantics.db.Resource; @@ -8,6 +8,7 @@ import org.simantics.diagram.stubs.DiagramResource; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Comment2 extends Element2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Connection2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Connection2.java similarity index 91% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Connection2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Connection2.java index c034f638..e39b8c38 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Connection2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Connection2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; @@ -10,6 +10,8 @@ import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.modeling.ModelingResources; import org.simantics.structural.stubs.StructuralResource2; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.IWriteableObject; +import org.simantics.sysdyn.modelImport.model.WriteContext; public abstract class Connection2 implements IWriteableObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Dependency2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Dependency2.java similarity index 88% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Dependency2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Dependency2.java index 973d1ebf..576402bf 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Dependency2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Dependency2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.databoard.Bindings; import org.simantics.db.Resource; @@ -6,6 +6,7 @@ import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Dependency2 extends Connection2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Element2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Element2.java similarity index 87% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Element2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Element2.java index d24e5551..7680f9da 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Element2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Element2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.databoard.Bindings; import org.simantics.db.Resource; @@ -10,6 +10,9 @@ import org.simantics.diagram.stubs.G2DResource; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.modeling.ModelingResources; +import org.simantics.sysdyn.modelImport.mdl.SketchElement; +import org.simantics.sysdyn.modelImport.model.IWriteableObject; +import org.simantics.sysdyn.modelImport.model.WriteContext; public abstract class Element2 implements IWriteableObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Flow2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Flow2.java similarity index 86% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Flow2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Flow2.java index fc3b5979..84fb5d75 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Flow2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Flow2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.databoard.Bindings; import org.simantics.db.Resource; @@ -6,6 +6,7 @@ import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Flow2 extends Connection2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/ModelVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/ModelVariable.java similarity index 82% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/ModelVariable.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/ModelVariable.java index bfa0651a..4b0dc58c 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/ModelVariable.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/ModelVariable.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import java.util.List; @@ -10,6 +10,11 @@ import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.modeling.ModelingResources; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; +import org.simantics.sysdyn.modelImport.model.expression.IExpression; +import org.simantics.sysdyn.modelImport.model.support.Enumeration2; +import org.simantics.sysdyn.modelImport.model.support.Range; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public abstract class ModelVariable extends Element2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Shadow2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Shadow2.java similarity index 85% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Shadow2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Shadow2.java index f386fbcc..00509634 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Shadow2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Shadow2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; @@ -6,6 +6,8 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.mdl.SketchVariable; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Shadow2 extends Element2 { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Stock2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Stock2.java similarity index 73% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Stock2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Stock2.java index 412cf35d..0078f4fc 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Stock2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Stock2.java @@ -1,9 +1,13 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; +import org.simantics.sysdyn.modelImport.model.expression.IntegralExpression; +import org.simantics.sysdyn.modelImport.model.support.Range; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public class Stock2 extends ModelVariable { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Valve2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Valve2.java similarity index 81% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Valve2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Valve2.java index 0abd36da..cc0442c7 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Valve2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Valve2.java @@ -1,9 +1,13 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.element; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; +import org.simantics.sysdyn.modelImport.model.expression.IExpression; +import org.simantics.sysdyn.modelImport.model.support.Range; +import org.simantics.sysdyn.modelImport.model.support.Variable2; public class Valve2 extends ModelVariable { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/DelayExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/DelayExpression.java similarity index 86% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/DelayExpression.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/DelayExpression.java index ccb552ba..07a5b976 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/DelayExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/DelayExpression.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.expression; import java.util.Arrays; @@ -9,6 +9,7 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class DelayExpression implements IExpression { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IExpression.java new file mode 100644 index 00000000..234a1059 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IExpression.java @@ -0,0 +1,7 @@ +package org.simantics.sysdyn.modelImport.model.expression; + +import org.simantics.sysdyn.modelImport.model.IWriteableObject; + +public interface IExpression extends IWriteableObject { + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IntegralExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IntegralExpression.java similarity index 87% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IntegralExpression.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IntegralExpression.java index 783b181d..6c3ccfa8 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IntegralExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IntegralExpression.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.expression; import java.util.Arrays; @@ -9,6 +9,7 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class IntegralExpression implements IExpression { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/LookupExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/LookupExpression.java similarity index 81% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/LookupExpression.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/LookupExpression.java index cc2052f7..ccbfdb00 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/LookupExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/LookupExpression.java @@ -1,8 +1,9 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.expression; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class LookupExpression implements IExpression { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/NormalExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/NormalExpression.java similarity index 86% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/NormalExpression.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/NormalExpression.java index f84bcc05..296fe5c5 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/NormalExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/NormalExpression.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.expression; import java.util.Arrays; @@ -9,6 +9,7 @@ import org.simantics.db.exception.DatabaseException; import org.simantics.layer0.Layer0; import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class NormalExpression implements IExpression { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SubscriptExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/SubscriptExpression.java similarity index 87% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SubscriptExpression.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/SubscriptExpression.java index 6a64637a..e315e321 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/SubscriptExpression.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/SubscriptExpression.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.expression; import java.util.ArrayList; import java.util.HashMap; @@ -7,6 +7,7 @@ import java.util.List; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class SubscriptExpression implements IExpression { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Enumeration2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Enumeration2.java similarity index 76% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Enumeration2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Enumeration2.java index 00e0b1ed..4f31cb0c 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Enumeration2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Enumeration2.java @@ -1,10 +1,12 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.support; import java.util.ArrayList; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; +import org.simantics.sysdyn.modelImport.model.IWriteableObject; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Enumeration2 implements IWriteableObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Range.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Range.java similarity index 77% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Range.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Range.java index 9a7ca8a0..fb51d0a0 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Range.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Range.java @@ -1,8 +1,10 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.support; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; +import org.simantics.sysdyn.modelImport.model.IWriteableObject; +import org.simantics.sysdyn.modelImport.model.WriteContext; public class Range implements IWriteableObject { diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Subscript2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Subscript2.java similarity index 85% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Subscript2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Subscript2.java index f2a549e4..4f53a925 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Subscript2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Subscript2.java @@ -1,4 +1,4 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.support; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Variable2.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Variable2.java similarity index 77% rename from org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Variable2.java rename to org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Variable2.java index 698ad7ec..fbcc18e3 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Variable2.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Variable2.java @@ -1,4 +1,7 @@ -package org.simantics.sysdyn.modelImport.model; +package org.simantics.sysdyn.modelImport.model.support; + +import org.simantics.sysdyn.modelImport.model.expression.IExpression; +import org.simantics.sysdyn.modelImport.model.expression.SubscriptExpression; public class Variable2 { -- 2.47.1