fixes #6172

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

diff --git a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
index 60c5c4835862dd683b78c8ab1c4149b13ebd0200..5e74cf95d9c16e9464289075850637b4b4bd748f 100644 (file)
--- a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
+++ b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
@@ -319,7 +319,7 @@ public class Mapper {
        \r
        \r
        \r
-       private void applyGenerations(WriteGraph graph, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyGenerations(WriteGraph graph, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                \r
                int size = nodes.size();\r
                int count = 0;\r
@@ -369,7 +369,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyConnections(WriteGraph g, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyConnections(WriteGraph g, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                int size = nodes.size();\r
                int count = 0;\r
                \r
@@ -397,7 +397,7 @@ public class Mapper {
        \r
 \r
        \r
-       private void initializeRules(Session session, VirtualGraph vg, final Resource model ) throws DatabaseException{\r
+       protected void initializeRules(Session session, VirtualGraph vg, final Resource model ) throws DatabaseException{\r
                session.syncRequest(new WriteRequest(vg) {\r
                        @Override\r
                        public void perform(WriteGraph g) throws DatabaseException {\r
@@ -409,7 +409,7 @@ public class Mapper {
                \r
        }\r
                \r
-       private void collect(ReadGraph g) throws DatabaseException {\r
+       protected void collect(ReadGraph g) throws DatabaseException {\r
                if (vg != null)\r
                        return;\r
                SessionGarbageCollection.gc(g, 0, -1);\r
@@ -417,7 +417,7 @@ public class Mapper {
        \r
        int collect = 0;\r
        \r
-       private void collect2(ReadGraph g) throws DatabaseException {\r
+       protected void collect2(ReadGraph g) throws DatabaseException {\r
                if (vg != null)\r
                        return;\r
                \r
@@ -429,7 +429,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyModifications(Session session, final Collection<GraphNode<Identifiable>> nodes, final IProgressMonitor monitor) throws Exception {\r
+       protected void applyModifications(Session session, final Collection<GraphNode<Identifiable>> nodes, final IProgressMonitor monitor) throws Exception {\r
                \r
                \r
                \r
@@ -545,7 +545,7 @@ public class Mapper {
                });\r
        }\r
        \r
-       private void applyGenerations(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyGenerations(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                \r
                int size = nodes.size();\r
                int count = 0;\r
@@ -678,7 +678,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyConnections(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyConnections(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                int size = nodes.size();\r
                int count = 0;\r
                \r
@@ -730,7 +730,7 @@ public class Mapper {
                });\r
        }\r
 \r
-       private void applyModifications(ReadGraph g, GraphNode<Identifiable> n, Pair<IdentificationRule, ModificationRule> modRule, Collection<GraphNode<Identifiable>> ruleModified) throws Exception {\r
+       protected void applyModifications(ReadGraph g, GraphNode<Identifiable> n, Pair<IdentificationRule, ModificationRule> modRule, Collection<GraphNode<Identifiable>> ruleModified) throws Exception {\r
                if (!n.isDisposed() && modRule.first.matches(g, n)) { // we have to check \r
                        Collection<GraphNode<Identifiable>> perRule = new ArrayList<GraphNode<Identifiable>>();\r
                        perRule.add(n);\r
@@ -738,7 +738,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyConnections(WriteGraph g, GraphNode<Identifiable> node) throws Exception {\r
+       protected void applyConnections(WriteGraph g, GraphNode<Identifiable> node) throws Exception {\r
                for (Link<Identifiable> link : node.getLinks()) {\r
                        if (link.isMain()) {\r
                                \r