Fixed warnings from sysdyn code.

refs #4695

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29573 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
index b2ec695c4bd97acbd7103a4a5dd2512b354f201e..8c09ab6f8ad7c812bef468bd4fd25f205dd5cd17 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
@@ -10,8 +10,6 @@
  *******************************************************************************/\r
 package fi.semantum.sysdyn.solver;\r
 \r
-import java.util.Collection;\r
-import java.util.Iterator;\r
 import java.util.Map;\r
 \r
 public class Addition implements IExpression {\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/And.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/And.java
index dc3ab53d03f92e0821797fc86514ff45242692aa..2cee3857cba7ef11ddf484fd4db7546e733764af 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/And.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/And.java
@@ -13,8 +13,6 @@ package fi.semantum.sysdyn.solver;
 import java.util.ArrayList;\r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class And implements IExpression {\r
        \r
     public IExpression[] exps;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Application.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Application.java
index a59ece28b39daa68866aeade33baba2d9cfdabbb..8f1987a47ac21a0cf36a770c5a487c4d2b1e2176 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Application.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Application.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Application implements IExpression {\r
 \r
        public String name;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Argument.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Argument.java
index 2712ab905037bf5dd5fa026b1d7a0cebd63a17df..cf5fe6758ce7d7f85a05dc4e7f7ecb1dcbb9530e 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Argument.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Argument.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Argument implements IExpression {\r
 \r
        public String name;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
index 233838d9f949f0b479071ec94f973fb71974b527..75d286edcd137a8934a30d6ab5078cca431b6601 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
@@ -15,9 +15,6 @@ import java.util.Collection;
 import java.util.Iterator;\r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-import fi.semantum.sysdyn.solver.SolverUtils.Slice;\r
-\r
 public class Array implements IExpression {\r
 \r
        public static final Array FULL = new Array();\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ArraySliceExpression.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ArraySliceExpression.java
index 9ed04b14069c72af50efe648cc0f30216b09f8cc..24d313d8e5fd87778efdd3537a9aca92011c96b0 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ArraySliceExpression.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ArraySliceExpression.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class ArraySliceExpression implements IExpression {\r
 \r
        public IExpression start;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
index acaee56a3aefd664b8b2994dd047a015f7cad7e2..8f43075a63f2c248d4e2c1753a8dff89711bb6b2 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
@@ -10,7 +10,6 @@
  *******************************************************************************/\r
 package fi.semantum.sysdyn.solver;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
 \r
 public class Assignment {\r
        \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
index b93dc9898bc44e89670b7d616035576d7618fcd9..3c56e26a2adf72b5947999fe3d6c3c73d53c6427 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Constant implements IExpression {\r
 \r
        public Object value;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Declaration.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Declaration.java
index 90b2cfc2a1eb7dfaddd305855b23eafb8097e5dd..b7b1678b35da80155bb02dbf21940c305ed1a45c 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Declaration.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Declaration.java
@@ -11,11 +11,8 @@
  *******************************************************************************/\r
 package fi.semantum.sysdyn.solver;\r
 \r
-import java.nio.channels.UnsupportedAddressTypeException;\r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Declaration implements IExpression {\r
 \r
        public Variable variable;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Derivate.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Derivate.java
index ef3b60121f104e749982486eabaeacd86550b530..131ca742555067ea63ba5b12352d13d3e44f73cf 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Derivate.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Derivate.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Derivate implements IExpression {\r
 \r
        private Variable variable;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
index 80fbaee4394f1bc5498c9249cc75732043fc97d5..d8d357feb3d30d9aab731dda97ebf948641916bf 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Division implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java
index 5888029f8b1f713cd64e9f3fc706379692ec1565..59ea9718f7aa8885879d907ac3cfbb940c9264d3 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java
@@ -14,8 +14,6 @@ import java.util.Collection;
 import java.util.Iterator;\r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class ElementwiseProduct implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Equals.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Equals.java
index 110c99bd97c06f657b862b96f53900dd0d29a0df..5113479c6b07ed8f50968c0f3da6b402dc9ac6b8 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Equals.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Equals.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Equals implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ForArray.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ForArray.java
index 2a2687329d90be5ce8d2c3824cb08d3ec38fb789..bf7b7be6f8311e3a66d6ffe956a017d63aed6597 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ForArray.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ForArray.java
@@ -14,8 +14,6 @@ import java.util.ArrayList;
 import java.util.Collection;\r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class ForArray implements IExpression {\r
 \r
        private ArrayList<Object> elements = new ArrayList<Object>();\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterOrEqualThan.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterOrEqualThan.java
index 4876199cfaa7d106bbbe6da7210a95d55cbb95f8..e9f8cdccddab809f4ed21e4a8b44e172781239fb 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterOrEqualThan.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterOrEqualThan.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class GreaterOrEqualThan implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterThan.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterThan.java
index 1a9791d6652c55a439a0189530d0d4ef6ac9dd15..e91f0ffc6bcd5203bea79fe6f2ef29bd23830dce 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterThan.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterThan.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class GreaterThan implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IfThenElse.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IfThenElse.java
index a95c99e1265edba02eda76e22c31ab35c1e6069b..d8511d728553c176280e85ae66ea0144f9d644a0 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IfThenElse.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IfThenElse.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class IfThenElse implements IExpression {\r
        \r
     public IExpression exp;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessOrEqualThan.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessOrEqualThan.java
index b9ab757e3900428ecd3204f8e81449636cd05574..d45163e97a8dc74da5e07addc5ea480b00909701 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessOrEqualThan.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessOrEqualThan.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class LessOrEqualThan implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessThan.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessThan.java
index db79808367fb69b8baefdd83ea78316a44a51131..d66d63a557da35840bb5b5bf64fdc0b1ff15afde 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessThan.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessThan.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class LessThan implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LineReader.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LineReader.java
index d4e2f420942cd228f7bd62fd0f8f0ff5f8ad1593..4b2da148df6b301ee8ad56658aab650232d63697 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LineReader.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LineReader.java
@@ -167,7 +167,7 @@ public class LineReader {
 \r
        public void parse() throws Exception {\r
 \r
-               long start = System.nanoTime();\r
+               //long start = System.nanoTime();\r
                \r
                for(;pos<chars.length;pos++) {\r
                        if(chars[pos] == '\r') {\r
@@ -178,7 +178,7 @@ public class LineReader {
                        }\r
                }\r
 \r
-               long duration = System.nanoTime() - start;\r
+               //long duration = System.nanoTime() - start;\r
                //System.err.println("LineReader parse in " + 1e-9*duration + "s.");            \r
        }\r
        \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/MultiStatement.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/MultiStatement.java
index fd878fd39fd69dd6d925649d6b9729492c446e86..ff330375b3f89752e99f7c4a80be10dc0fe9af01 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/MultiStatement.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/MultiStatement.java
@@ -31,6 +31,7 @@ public class MultiStatement implements IStatement {
     \r
     @Override\r
     public void evaluate(IEnvironment environment) {\r
+       @SuppressWarnings("unchecked")\r
        ArrayList<Object> values = (ArrayList<Object>)environment.getSystem().evaluateFunction(environment, fn.base.name, args);\r
        for(int i=0;i<targets.size();i++) {\r
                targets.get(i).assignPlain(environment, values.get(i));\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
index fa37e77a54a4a321951892dd145b8f8cf8ba3cc5..e4d29b2cd32b62b81d961dd61bbd9c22e866be8e 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Multiplication implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
index c60bf13e6b7fce831146467e29d663fadd1f0bb2..8cdad84e33600d9cc922fcd3cfde66aded68cb35 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Negation implements IExpression {\r
        \r
     public IExpression exp;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NotEquals.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NotEquals.java
index 5c5499cecc435f801a96796bcb19055da6904345..9a526c30f0faea2d845863dd1adb04efdd2c5f72 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NotEquals.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NotEquals.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class NotEquals implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Or.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Or.java
index 375c9240e1e70e1d74cb9b7b59ecdd824c6b4e3d..315a78a832861342708f4c01b0905b47fd0fc587 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Or.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Or.java
@@ -13,8 +13,6 @@ package fi.semantum.sysdyn.solver;
 import java.util.ArrayList;\r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Or implements IExpression {\r
        \r
     public IExpression[] exps;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Power.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Power.java
index d25a0d077c99dec629af6a7d082f5d25b61a8adf..aa98c9e0d31237103cef7b1d3f2145f20304ed78 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Power.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Power.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Power implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
index 60a4306353cd404746255a5539981784532ba81d..7534d1fbbc0e471a57f15f1207b2ccfe03fa7510 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class Subtraction implements IExpression {\r
        \r
     public IExpression exp1;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/TimeVariable.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/TimeVariable.java
index 19e5f299e9c035c2f5e3d54822995db15dc3a5cc..509824bc6b525638717c7d8a8c58fd46a4962e5c 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/TimeVariable.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/TimeVariable.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 public class TimeVariable implements IExpression {\r
 \r
        @Override\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
index ae686cedf4b7e481a79de1956256d904df1a2e21..e72ececdf80b4bacb2ff864cef8d9b13e067538a 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
@@ -13,8 +13,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 \r
 \r
 public class Variable implements IExpression {\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
index 183f9e25fc3edd0e3e58dec319e439fa8f812f81..0e55bf979a06c72363e415053aa5cd228fc8dd15 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
@@ -10,7 +10,6 @@
  *******************************************************************************/\r
 package fi.semantum.sysdyn.solver;\r
 \r
-import fi.semantum.sysdyn.solver.SolverUtils.Slice;\r
 \r
 public class VariableBase {\r
 \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableDeclaration.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableDeclaration.java
index 51164eac35cdce8fe1332e463779339d2cc139d4..83958d394b8102aa4ad8fb0cf397ca1e239f5d86 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableDeclaration.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableDeclaration.java
@@ -12,8 +12,6 @@ package fi.semantum.sysdyn.solver;
 \r
 import java.util.Map;\r
 \r
-import fi.semantum.sysdyn.solver.IExpression.ExpressionVisitor;\r
-\r
 \r
 public class VariableDeclaration implements IExpression {\r
 \r

diff --git a/org.simantics.jfreechart.ontology/build.properties b/org.simantics.jfreechart.ontology/build.properties
index 022de1735b3f377a077bbc56b320d9bf79fb835c..ecdc7c302aa463b9939d114ba5cd6b88ce6f02a1 100644 (file)
--- a/org.simantics.jfreechart.ontology/build.properties
+++ b/org.simantics.jfreechart.ontology/build.properties
@@ -1,6 +1,5 @@
 source.. = src/\r
 output.. = bin/\r
-bin.includes = plugin.xml,\\r
-               META-INF/,\\r
+bin.includes = META-INF/,\\r
                .,\\r
                graph.tg\r

diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java
index b4a52d912c8b3e9e77b27f0fb89b4b989efd161c..dd44e61bde95ce3eab029fd8c6a6e368ed64d84d 100644 (file)
--- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java
+++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java
@@ -16,7 +16,6 @@ import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.plot.Plot;\r
 import org.jfree.chart.plot.PlotOrientation;\r
 import org.jfree.chart.renderer.category.CategoryItemRenderer;\r
-import org.jfree.data.general.Dataset;\r
 import org.jfree.ui.RectangleInsets;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.ReadGraph;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/VariableChildRule.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/VariableChildRule.java
index aaecd2d083ddad5cd3bd493eba6299ae7e7e5a94..270ad2280390c35b3ea413a4378203ec9ef37918 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/VariableChildRule.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/childrules/VariableChildRule.java
@@ -58,7 +58,7 @@ public class VariableChildRule implements ChildRule {
         \r
         ArrayList<Variable> variables = new ArrayList<Variable>();\r
 \r
-        for(Variable child : variable.browseChildren(graph)) {\r
+        for(Variable child : variable.getChildren(graph)) {\r
             Resource represents = (Resource)child.getPropertyValue(graph, Variables.REPRESENTS);\r
             if(graph.isInstanceOf(represents, sr.IndependentVariable)) {\r
                 variables.add(child);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
index d50bfbc2ab00658f77e3999669bc8db57aa47d11..fdb9ee0b608cd9fa8e77b622b1dc5d336f5ef412 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
@@ -51,7 +51,7 @@ public class Configuration extends ViewpointContributor<ConfigurationNode<Resour
                TreeMap<String, Variable> enumerations = new TreeMap<String, Variable>(AlphanumComparator.CASE_INSENSITIVE_COMPARATOR);\r
 \r
 \r
-               for(Variable child : variable.browseChildren(graph)) {\r
+               for(Variable child : variable.getChildren(graph)) {\r
                        Resource represents = (Resource)child.getPropertyValue(graph, Variables.REPRESENTS);\r
                        if(graph.isInstanceOf(represents, sr.IndependentVariable)) {\r
                                variables.put(child.getName(graph), child);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/ModulesLabeler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/ModulesLabeler.java
index c271365abb672da6ea39df8c44f8cff1427c2b3e..36d64d01439e0777880c2422c393b840d68e28f4 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/ModulesLabeler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/ModulesLabeler.java
@@ -15,7 +15,6 @@ package org.simantics.sysdyn.ui.browser.contributions;
 import org.simantics.browsing.ui.graph.contributor.labeler.LabelerContributor;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.sysdyn.ui.browser.nodes.ExperimentsFolder;\r
 import org.simantics.sysdyn.ui.browser.nodes.ModulesNode;\r
 \r
 public class ModulesLabeler extends LabelerContributor<ModulesNode>{\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationType.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationType.java
index 8b608c993f6cfbe1a9df82b17c10b35ad37e4cd6..d5f3b6ba9299934f5661854eb7cf160b2a63bb7b 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationType.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationType.java
@@ -26,7 +26,6 @@ import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.CancelTransactionException;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.exception.ServiceNotFoundException;\r
 import org.simantics.db.layer0.util.RemoverUtil;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.ui.SimanticsUI;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationValue.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationValue.java
index b97ad52e9361240524848559b10dc494e3c24861..0f551eee55c18a1ce37e9b5edd665cccd784dd80 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationValue.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/AnnotationValue.java
@@ -21,12 +21,9 @@ import org.simantics.browsing.ui.graph.impl.LabelModifier;
 import org.simantics.db.Resource;\r
 import org.simantics.db.Session;\r
 import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.primitiverequest.PossibleObject;\r
 import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.CancelTransactionException;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.exception.ServiceNotFoundException;\r
 import org.simantics.db.layer0.util.RemoverUtil;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.ui.SimanticsUI;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/Library.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/Library.java
index c62f6c6610080631213ed6ccc11910d18ee1d957..736081eb26e602dabf9593f154a794d4c7b8d453 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/Library.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/Library.java
@@ -21,12 +21,9 @@ import org.simantics.browsing.ui.graph.impl.LabelModifier;
 import org.simantics.db.Resource;\r
 import org.simantics.db.Session;\r
 import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.primitiverequest.PossibleObject;\r
 import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.CancelTransactionException;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.exception.ServiceNotFoundException;\r
 import org.simantics.db.layer0.util.RemoverUtil;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.ui.SimanticsUI;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java
index 4a489593d85bd06c33f6f858f93b75bd8a0cbd64..2c5c0dd92a130918fad356e15f579b9afee70577 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java
@@ -20,17 +20,14 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.ui.PlatformUI;\r
 import org.simantics.Simantics;\r
-import org.simantics.annotation.ontology.AnnotationResource;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.Session;\r
 import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.request.ReadRequest;\r
 import org.simantics.db.common.request.WriteRequest;\r
 import org.simantics.db.common.utils.NameUtils;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.request.Read;\r
-import org.simantics.db.service.QueryControl;\r
 import org.simantics.diagram.handler.CopyPasteUtil;\r
 import org.simantics.diagram.handler.DefaultCopyPasteStrategy;\r
 import org.simantics.diagram.handler.ElementObjectAssortment;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportSharedOntologyHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportSharedOntologyHandler.java
index 9d2f67034a150b66424769d85b2c2008a79908fd..5e29611e64fed8ee5e07ca81338a43d8a085a68a 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportSharedOntologyHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportSharedOntologyHandler.java
@@ -19,7 +19,6 @@ public class ExportSharedOntologyHandler  extends AbstractHandler {
 \r
         ISelection sel = HandlerUtil.getCurrentSelection(event);\r
         \r
-        @SuppressWarnings("unchecked")\r
                SharedOntologyNode node = AdaptionUtils.adaptToSingle(sel, SharedOntologyNode.class);\r
         if (node == null)\r
             return null;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationTypeHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationTypeHandler.java
index ee052f8b9d68333ebb5727d48331704d14a5e2b5..f77b693f1a8c51b6a40104e54f9bf8f81bbb80aa 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationTypeHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationTypeHandler.java
@@ -24,10 +24,10 @@ public class NewAnnotationTypeHandler  extends AbstractHandler {
 \r
         ISelection sel = HandlerUtil.getCurrentSelection(event);\r
         \r
-        @SuppressWarnings("unchecked")\r
                Resource res = AdaptionUtils.adaptToSingle(sel, Resource.class);\r
         if(res == null) {\r
-               AbstractNode<Resource> node = AdaptionUtils.adaptToSingle(sel, AbstractNode.class);\r
+               @SuppressWarnings("unchecked")\r
+                       AbstractNode<Resource> node = AdaptionUtils.adaptToSingle(sel, AbstractNode.class);\r
                if (node == null)\r
                        return null;\r
                res = node.data;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationValueHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationValueHandler.java
index 29ad88db5c82df8c958e85ed0d10be6d29d88bc6..e8f757e1ab469e9f2f44c7195839790486d8fd54 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationValueHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewAnnotationValueHandler.java
@@ -20,10 +20,10 @@ public class NewAnnotationValueHandler  extends AbstractHandler {
 \r
         ISelection sel = HandlerUtil.getCurrentSelection(event);\r
         \r
-        @SuppressWarnings("unchecked")\r
                Resource res = AdaptionUtils.adaptToSingle(sel, Resource.class);\r
         if(res == null) {\r
-               AbstractNode<Resource> node = AdaptionUtils.adaptToSingle(sel, AbstractNode.class);\r
+               @SuppressWarnings("unchecked")\r
+                       AbstractNode<Resource> node = AdaptionUtils.adaptToSingle(sel, AbstractNode.class);\r
                if (node == null)\r
                        return null;\r
                res = node.data;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewLibraryHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewLibraryHandler.java
index 009d225cf91950be5549ec42556d7ff012247ca0..0f20af7dac89663df33d173cebb39cd337c45687 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewLibraryHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewLibraryHandler.java
@@ -21,10 +21,10 @@ public class NewLibraryHandler  extends AbstractHandler {
 \r
         ISelection sel = HandlerUtil.getCurrentSelection(event);\r
         \r
-        @SuppressWarnings("unchecked")\r
                Resource res = AdaptionUtils.adaptToSingle(sel, Resource.class);\r
         if(res == null) {\r
-               AbstractNode<Resource> node = AdaptionUtils.adaptToSingle(sel, AbstractNode.class);\r
+               @SuppressWarnings("unchecked")\r
+                       AbstractNode<Resource> node = AdaptionUtils.adaptToSingle(sel, AbstractNode.class);\r
                if (node == null)\r
                        return null;\r
                res = node.data;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/game/ReloadGameExperimentHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/game/ReloadGameExperimentHandler.java
index 72d6970ca335943aa74d1cf73b8c7d61bd92c994..218512cd282b5f2df59b19ac6e7c4f84292a8b83 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/game/ReloadGameExperimentHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/game/ReloadGameExperimentHandler.java
@@ -20,7 +20,6 @@ import org.simantics.project.IProject;
 import org.simantics.simulation.experiment.ExperimentState;\r
 import org.simantics.simulation.experiment.IExperiment;\r
 import org.simantics.simulation.project.IExperimentManager;\r
-import org.simantics.sysdyn.manager.SysdynGameExperiment;\r
 import org.simantics.sysdyn.manager.SysdynGameExperimentBase;\r
 import org.simantics.sysdyn.ui.handlers.RunBasicExperiment;\r
 import org.simantics.ui.SimanticsUI;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynPlaybackExperimentListener.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynPlaybackExperimentListener.java
index e527a7f9bbfcfb8b717f550ac48026ab3e499400..70dc93d34e7b84bf1999afe242acdc853c0eca7a 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynPlaybackExperimentListener.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynPlaybackExperimentListener.java
@@ -62,6 +62,7 @@ public class SysdynPlaybackExperimentListener implements IExperimentListener {
         switch(state) {\r
             case DISPOSED:\r
                 revertPlaybackProfiles();\r
+            default:\r
                 break;\r
         }\r
     }\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/PieDataset.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/PieDataset.java
index 3eb92c5719d2146b7593a0fd0751763722ef6c72..81d73100748016b8ea5738b2014daf414e25e394 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/PieDataset.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/PieDataset.java
@@ -48,7 +48,7 @@ import org.simantics.ui.SimanticsUI;
  * @author Teemu Lempinen\r
  *\r
  */\r
-public class PieDataset extends AbstractDataset implements org.simantics.jfreechart.chart.PieDataset{\r
+public class PieDataset extends AbstractDataset implements org.simantics.jfreechart.chart.PieDataset<String> {\r
 \r
     private List<Resource> seriesList;\r
     private String realizationURI;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
index 395a6c50e1fa5e539d4ba8c87d0c012207d42d5b..145262d70b5bbf574b8aca622012caf0889fea7f 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.NullProgressMonitor;\r
+import org.simantics.Simantics;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.AsyncReadGraph;\r
 import org.simantics.db.ReadGraph;\r
@@ -32,7 +33,6 @@ import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.util.Layer0Utils;\r
-import org.simantics.db.layer0.util.Simantics;\r
 import org.simantics.db.layer0.variable.Variable;\r
 import org.simantics.db.layer0.variable.Variables;\r
 import org.simantics.db.procedure.AsyncListener;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
index 11129a3a82d3da4049080964a8ab46b6b63cff8b..07226b807130356e110e261f77619fd8c2df46f5 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperimentInternal.java
@@ -17,6 +17,7 @@ import java.util.HashMap;
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.NullProgressMonitor;\r
+import org.simantics.Simantics;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.WriteGraph;\r
@@ -24,7 +25,6 @@ import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.util.Layer0Utils;\r
-import org.simantics.db.layer0.util.Simantics;\r
 import org.simantics.db.layer0.variable.Variable;\r
 import org.simantics.db.layer0.variable.Variables;\r
 import org.simantics.modelica.IModelicaMonitor;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/utils/DocumentationUtils.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/utils/DocumentationUtils.java
index 725516d3b043cbc3690d9a9a707e203738822793..2247106a65b39d56b20d12188be93bc3987e0d8d 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/utils/DocumentationUtils.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/utils/DocumentationUtils.java
@@ -519,7 +519,6 @@ public class DocumentationUtils {
                        double[] values = EvaluatingListener.<double[]>trySyncRequest(Simantics.getSession(),\r
                                        \r
                                        new UniqueRead<double[]>(){\r
-                                               @SuppressWarnings("unchecked")\r
                                                @Override\r
                                                public double[] perform(ReadGraph graph) throws DatabaseException{\r
                                                        \r