X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fadapter%2FDiagramContentRequest.java;h=843f907a8bedd526f95a0552c9dfe62144320135;hb=6326b65c5c6a785aadcb615cb95ceadd8f53964a;hp=56063b990f71e771180a75acfd06db99b09877fa;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/DiagramContentRequest.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/DiagramContentRequest.java index 56063b990..843f907a8 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/DiagramContentRequest.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/DiagramContentRequest.java @@ -11,12 +11,8 @@ *******************************************************************************/ package org.simantics.diagram.adapter; -import gnu.trove.list.array.TIntArrayList; -import gnu.trove.map.hash.THashMap; -import gnu.trove.procedure.TIntProcedure; -import gnu.trove.set.hash.THashSet; - import java.util.ArrayList; +import java.util.Collection; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -24,8 +20,9 @@ import org.simantics.db.AsyncReadGraph; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.common.procedure.adapter.ProcedureAdapter; +import org.simantics.db.common.request.UniqueAsyncRead; +import org.simantics.db.common.utils.OrderedSetUtils; import org.simantics.db.exception.DatabaseException; -import org.simantics.db.procedure.AsyncMultiProcedure; import org.simantics.db.procedure.AsyncProcedure; import org.simantics.diagram.content.ConnectionPartData; import org.simantics.diagram.content.ConnectionPartRequest; @@ -36,12 +33,21 @@ import org.simantics.diagram.content.RouteGraphConnectionPartRequest; import org.simantics.diagram.stubs.DiagramResource; import org.simantics.diagram.synchronization.ErrorHandler; import org.simantics.g2d.canvas.ICanvasContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import gnu.trove.list.array.TIntArrayList; +import gnu.trove.map.hash.THashMap; +import gnu.trove.procedure.TIntProcedure; +import gnu.trove.set.hash.THashSet; /** * @author Tuukka Lehtonen */ public class DiagramContentRequest extends BaseRequest { + private static final Logger LOGGER = LoggerFactory.getLogger(DiagramContentRequest.class); + int previousElementCount = 32; ErrorHandler errorHandler; @@ -54,141 +60,170 @@ public class DiagramContentRequest extends BaseRequest(previousElementCount); - result.nodeSet = new THashSet(); - result.connectionSet = new THashSet(); - result.connectionSegments = new THashSet(); - result.branchPoints = new THashSet(); - result.routeGraphConnectionSet = new THashSet(); - result.routeLinks = new THashSet(); - result.routeLines = new THashSet(); - result.routePoints = new THashSet(); - - result.partToConnection = new THashMap(); // These help loading result.elements in the correct order. final AtomicInteger index = new AtomicInteger(); final TIntArrayList unrecognizedElementIndices = new TIntArrayList(); + + Collection components = OrderedSetUtils.toList(g, data); + + DiagramContents result = g.syncRequest(new UniqueAsyncRead() { + + @Override + public void perform(AsyncReadGraph graph, AsyncProcedure procedure) { + + DiagramContents result = new DiagramContents(); + procedure.execute(graph, result); + + result.elements = new ArrayList(previousElementCount); + result.nodeSet = new THashSet(); + result.connectionSet = new THashSet(); + result.connectionSegments = new THashSet(); + result.branchPoints = new THashSet(); + result.routeGraphConnectionSet = new THashSet(); + result.routeLinks = new THashSet(); + result.routeLines = new THashSet(); + result.routePoints = new THashSet(); + + result.partToConnection = new THashMap(); + + for(final Resource component : components) { + + // Must add the elements to the result set here in order to + // keep their order the same as in the ordered set. + final int elementIndex = index.getAndIncrement(); + result.elements.add(component); + + graph.forTypes(component, new ProcedureAdapter>() { + + @Override + public void execute(Set types) { + + if (types.contains(DIA.Connection)) { + if (types.contains(DIA.RouteGraphConnection)) { + graph.asyncRequest(new RouteGraphConnectionPartRequest(errorHandler, DIA, component), + new ProcedureAdapter() { + @Override + public void execute(RouteGraphConnectionPartData partData) { + synchronized (result) { + for (EdgeResource link : partData.links) { + result.routeLinks.add(link); + result.partToConnection.put(link, component); + result.connectionToParts.add(component, link); + } + for (Resource line : partData.routeLines) { + result.routeLines.add(line); + result.connectionToParts.add(component, line); + result.partToConnection.put(line, component); + } + for (Resource point : partData.routePoints) { + result.routePoints.add(point); + result.connectionToParts.add(component, point); + result.partToConnection.put(point, component); + } + } + } + }); + + synchronized (result.routeGraphConnectionSet) { + result.routeGraphConnectionSet.add(component); + } + } else { + graph.asyncRequest(new ConnectionPartRequest(errorHandler, DIA, component), + new ProcedureAdapter() { + @Override + public void execute(ConnectionPartData partData) { + synchronized (result) { + for (EdgeResource er : partData.edges) { + result.connectionSegments.add(er); + result.partToConnection.put(er, component); + result.connectionToParts.add(component, er); + } + for (Resource bp : partData.branchPoints) { + result.branchPoints.add(bp); + result.connectionToParts.add(component, bp); + result.partToConnection.put(bp, component); + } + } + } + }); + + synchronized (result.connectionSet) { + result.connectionSet.add(component); + } + } + } + else if (types.contains(DIA.Element)) { + synchronized (result.nodeSet) { + result.nodeSet.add(component); + } + } + else { + synchronized (unrecognizedElementIndices) { + // Unrecognized element, mark it to be + // removed after everything is processed. + unrecognizedElementIndices.add(elementIndex); + } + } + + } + + }); + + } + } - g.forOrderedSet(data, new AsyncMultiProcedure() { - - @Override - public void execute(AsyncReadGraph graph, final Resource component) { - - // Must add the elements to the result set here in order to - // keep their order the same as in the ordered set. - final int elementIndex = index.getAndIncrement(); - result.elements.add(component); - - graph.forTypes(component, new AsyncProcedure>() { - - @Override - public void exception(AsyncReadGraph graph, Throwable t) { - if (errorHandler != null) - errorHandler.error(t.getMessage(), t); - } - - @Override - public void execute(AsyncReadGraph graph, Set types) { - if (types.contains(DIA.Connection)) { - if (types.contains(DIA.RouteGraphConnection)) { - graph.asyncRequest(new RouteGraphConnectionPartRequest(errorHandler, DIA, component), - new ProcedureAdapter() { - @Override - public void execute(RouteGraphConnectionPartData partData) { - synchronized (result) { - for (EdgeResource link : partData.links) { - result.routeLinks.add(link); - result.partToConnection.put(link, component); - result.connectionToParts.add(component, link); - } - for (Resource line : partData.routeLines) { - result.routeLines.add(line); - result.connectionToParts.add(component, line); - result.partToConnection.put(line, component); - } - for (Resource point : partData.routePoints) { - result.routePoints.add(point); - result.connectionToParts.add(component, point); - result.partToConnection.put(point, component); - } - } - } - }); - - synchronized (result.routeGraphConnectionSet) { - result.routeGraphConnectionSet.add(component); - } - } else { - graph.asyncRequest(new ConnectionPartRequest(errorHandler, DIA, component), - new ProcedureAdapter() { - @Override - public void execute(ConnectionPartData partData) { - synchronized (result) { - for (EdgeResource er : partData.edges) { - result.connectionSegments.add(er); - result.partToConnection.put(er, component); - result.connectionToParts.add(component, er); - } - for (Resource bp : partData.branchPoints) { - result.branchPoints.add(bp); - result.connectionToParts.add(component, bp); - result.partToConnection.put(bp, component); - } - } - } - }); - - synchronized (result.connectionSet) { - result.connectionSet.add(component); - } - } - } - else if (types.contains(DIA.Element)) { - synchronized (result.nodeSet) { - result.nodeSet.add(component); - } - } - else { - synchronized (unrecognizedElementIndices) { - // Unrecognized element, mark it to be - // removed after everything is processed. - unrecognizedElementIndices.add(elementIndex); - } - } - } - - }); - - } - - @Override - public void finished(AsyncReadGraph graph) { - // Remove elements that were not recognized in descending order. - unrecognizedElementIndices.sort(); - unrecognizedElementIndices.forEachDescending(new TIntProcedure() { - @Override - public boolean execute(int index) { - result.elements.remove(index); - return true; - } - }); - - // Help successive request executions by remembering the previous - // element count. This will relieve some ArrayList reallocation - // strain down the road. - previousElementCount = result.elements.size(); - } + }); + // Remove elements that were not recognized in descending order. + unrecognizedElementIndices.sort(); + unrecognizedElementIndices.forEachDescending(new TIntProcedure() { @Override - public void exception(AsyncReadGraph graph, Throwable t) { - if (errorHandler != null) - errorHandler.error(t.getMessage(), t); + public boolean execute(int index) { + result.elements.remove(index); + return true; } }); + // Help successive request executions by remembering the previous + // element count. This will relieve some ArrayList reallocation + // strain down the road. + previousElementCount = result.elements.size(); + + +// g.forOrderedSet(data, new AsyncMultiProcedure() { +// +// @Override +// public void execute(AsyncReadGraph graph, final Resource component) { +// +// graph.forTypes(component, new AsyncProcedure>() { +// +// @Override +// public void exception(AsyncReadGraph graph, Throwable t) { +// if (errorHandler != null) +// errorHandler.error(t.getMessage(), t); +// } +// +// @Override +// public void execute(AsyncReadGraph graph, Set types) { +// +// } +// +// }); +// +// } +// +// @Override +// public void finished(AsyncReadGraph graph) { +// } +// +// @Override +// public void exception(AsyncReadGraph graph, Throwable t) { +// if (errorHandler != null) +// errorHandler.error(t.getMessage(), t); +// } +// }); + return result; } } \ No newline at end of file