]> gerrit.simantics Code Review - simantics/sysdyn.git/commit
Merge changes from dev-jkauttio
authorjkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Fri, 25 Apr 2014 14:29:05 +0000 (14:29 +0000)
committerjkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Fri, 25 Apr 2014 14:29:05 +0000 (14:29 +0000)
commit308f891430ed5fa3b50ffd0acb322cb07f07c00d
tree5a8fa441a40f4df4be0782c0f19911310175400f
parent089a60a7f0d94149f6e5ab3118b076c131ed51b1
Merge changes from dev-jkauttio

refs #2924

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29357 ac1ea38d-2e2b-0410-8846-a27921b304fc
74 files changed:
org.simantics.sysdyn.ui/plugin.xml
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/imports/ImportMdlHandler.java
org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/wizards/mdl/WizardMdlImportPage.java
org.simantics.sysdyn/META-INF/MANIFEST.MF
org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiment.java
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/ImportUtils.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/MdlFile.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/MdlParser.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Auxiliary.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Cloud.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Connection.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Dependency.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Element.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/EquivalenceSubscript.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Expression.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Function.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/IWriteableMDLElement.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/IWriteableMDLObject.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Model.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/ModelControl.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Stock.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Subscript.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Valve.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Variable.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/View.java [deleted file]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlParser.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/MdlUtil.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Declaration.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/IMdlObject.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Lookup.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/MdlModel.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Sketch.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchComment.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchConnection.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchElement.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchObject.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchValve.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SketchVariable.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Subscript.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/SubscriptVariable.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/mdl/Variable.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/IWriteableObject.java [moved from org.simantics.sysdyn/src/org/simantics/sysdyn/mdlImport/mdlElements/Flow.java with 55% similarity]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/Model.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/WriteContext.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Auxiliary.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Cloud.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Comment.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Connection.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Dependency.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Flow.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/ModelVariable.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Shadow.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Stock.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Symbol.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/element/Valve.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/DelayExpression.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/EnumerationExpression.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/Expression.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/IntegralExpression.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/LookupExpression.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/expression/NormalExpression.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Enumeration.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Function.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelImport/model/support/Range.java [new file with mode: 0644]
org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/IndependentVariable.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Stock.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/DelayExpression.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/IExpression.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/ParameterExpression.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/StockExpression.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java
org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/RepresentationUtils.java
org.simantics.sysdyn/src/org/simantics/sysdyn/utils/ModelUtils.java