From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 26 Nov 2015 12:12:12 +0000 (+0000)
Subject: fixes #6172
X-Git-Tag: v1.31.0~63
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=db6def39515fd442543064502a9ae7ae07ffc160;p=simantics%2Finterop.git

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