Fixes for non-compiling code after merge 5930811a7

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl.java
index b81a6e734c1c2940638f4eafc61bd437f12da9cb..c4ed5739c873e809932cf2538c349c4f4f5bf685 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl.java
@@ -70,11 +70,6 @@ public class ClusterSetsSupportImpl implements ClusterSetsSupport, Disposable {
        clusterSets.clear();\r
     }\r
     \r
-    @Override\r
-    public void setReadDirectory(Path read) {\r
-        // TODO Auto-generated method stub\r
-        \r
-    }\r
     @Override\r
     public void updateWriteDirectory(Path write) {\r
         // Nothing to do here\r

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl2.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl2.java
index 33950652cff5957b8fa6bdea13d05b57b805462d..5da4e37615f8c4f2def8e31228b6b1985d7fbbe5 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl2.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ClusterSetsSupportImpl2.java
@@ -83,9 +83,4 @@ public class ClusterSetsSupportImpl2 implements ClusterSetsSupport, Disposable {
         this.readDirectory = read;\r
     }\r
 \r
-    @Override\r
-    public void setReadDirectory(Path read) {\r
-        this.readDirectory = read;\r
-    }\r
-\r
 }\r

diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
index 34d7a33241d31a9fd613f2891f93473cb22a7435..44d05ac08c0d12fd067bf567125747776f72e56b 100644 (file)
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
@@ -286,8 +286,8 @@ public class ModuleRegressionTests extends TestBase {
         for(BranchPoint bp : branchPoints) {
             for(int i=0;i<ind;++i)
                 System.out.print("    ");
-            System.out.println(bp.codeSize);
-            printCoverageTree(bp.children, ind+1);
+            System.out.println(bp.getCodeSize());
+            printCoverageTree(bp.getChildren(), ind+1);
         }
     }