X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Frequests%2FCollectionResult.java;h=c182c59c80120b7c5eff2814b7a073a07898fc44;hp=844524ac167a6e5097a9e07bb86d54cc4b3636bd;hb=6573b29e111ea03c3fa88bf1565d47d0fc4faabd;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/requests/CollectionResult.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/requests/CollectionResult.java
index 844524ac1..c182c59c8 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/requests/CollectionResult.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/requests/CollectionResult.java
@@ -1,86 +1,107 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.modeling.requests;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.simantics.db.Resource;
-import org.simantics.scl.runtime.function.Function1;
-
-/**
- * @author Tuukka Lehtonen
- */
-public class CollectionResult {
-
-    public class DiagramFilter implements IFilter {
-
-        private final IFilter proxy;
-
-        public DiagramFilter(IFilter proxy) {
-            this.proxy = proxy;
-        }
-
-        @Override
-        public boolean select(Object node) {
-            return diagramSet.contains(node) && (proxy == null || proxy.select(node));
-        }
-
-    }
-
-    final public Set<Node>           roots       = new ConcurrentSkipListSet<Node>();
-    final private Set<Node>          diagramSet  = new ConcurrentSkipListSet<Node>();
-    final public List<Node>          diagramList = new Vector<Node>();
-    final public Map<Resource, Node> diagrams    = new ConcurrentHashMap<Resource, Node>();
-
-    public void addDiagram(Resource r, Node n) {
-        diagramList.add(n);
-        diagrams.put(r, n);
-        diagramSet.add(n);
-    }
-
-    public Collection<Node> breadthFirstFlatten() {
-        return breadthFirstFlatten(null);
-    }
-
-    public Collection<Node> breadthFirstFlatten(IFilter filter) {
-        return Nodes.breadthFirstFlatten(new DiagramFilter(filter), roots);
-    }
-
-    public Collection<Node> depthFirstFlatten() {
-        return depthFirstFlatten(null, null);
-    }
-
-    public Collection<Node> depthFirstFlatten(IFilter filter, Comparator<? super Node> comparator) {
-        return Nodes.depthFirstFlatten(new DiagramFilter(filter), roots, comparator);
-    }
-
-    /**
-     * @param f
-     *            function that takes the walked Node as argument and returns a
-     *            boolean to describe whether to continue the walk or cancel the
-     *            walk. The returned value cannot be <code>null</code>.
-     * @return <code>true</code> if the walk was completed or <code>false</code>
-     *         if the walk was cancelled
-     */
-    public boolean walkTree(Function1<Node, Boolean> f) {
-        return Nodes.walkTree(f, roots);
-   }
-
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.modeling.requests;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import org.eclipse.jface.viewers.IFilter;
+import org.simantics.db.Resource;
+import org.simantics.scl.runtime.function.Function1;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class CollectionResult {
+
+    public static final IFilter DIAGRAM_RESOURCE_FILTER = o -> Nodes.DIAGRAM_RESOURCE_PREDICATE.test((Node) o);
+    public static final IFilter DIAGRAM_RESOURCE_AND_RVI_FILTER = o -> Nodes.DIAGRAM_RESOURCE_AND_RVI_PREDICATE.test((Node) o);
+
+    public class DiagramFilter implements IFilter {
+
+        private final IFilter proxy;
+
+        public DiagramFilter(IFilter proxy) {
+            this.proxy = proxy;
+        }
+
+        @Override
+        public boolean select(Object node) {
+            return diagramSet.contains(node) && (proxy == null || proxy.select(node));
+        }
+
+    }
+
+    public final Set<Node>           roots;
+    private final Set<Node>          diagramSet;
+    public final List<Node>          diagramList;
+    public final Map<Resource, Node> diagrams;
+
+    public CollectionResult() {
+        this.roots       = new ConcurrentSkipListSet<Node>();
+        this.diagramSet  = new ConcurrentSkipListSet<Node>();
+        this.diagramList = new Vector<Node>();
+        this.diagrams    = new ConcurrentHashMap<Resource, Node>();
+    }
+
+    private CollectionResult(Set<Node> roots, Set<Node> diagramSet, List<Node> diagramList, Map<Resource, Node> diagrams) {
+        this.roots = roots;
+        this.diagramSet = diagramSet;
+        this.diagramList = diagramList;
+        this.diagrams = diagrams;
+    }
+
+    public CollectionResult withRoots(Set<Node> roots) {
+        return new CollectionResult(roots, diagramSet, diagramList, diagrams);
+    }
+
+    public void addDiagram(Resource r, Node n) {
+        diagramList.add(n);
+        diagrams.put(r, n);
+        diagramSet.add(n);
+    }
+
+    public Collection<Node> breadthFirstFlatten() {
+        return breadthFirstFlatten(null);
+    }
+
+    public Collection<Node> breadthFirstFlatten(IFilter filter) {
+        return Nodes.breadthFirstFlatten(new DiagramFilter(filter), roots);
+    }
+
+    public Collection<Node> depthFirstFlatten() {
+        return depthFirstFlatten(null, null);
+    }
+
+    public Collection<Node> depthFirstFlatten(IFilter filter, Comparator<? super Node> comparator) {
+        return Nodes.depthFirstFlatten(new DiagramFilter(filter), roots, comparator);
+    }
+
+    /**
+     * @param f
+     *            function that takes the walked Node as argument and returns a
+     *            boolean to describe whether to continue the walk or cancel the
+     *            walk. The returned value cannot be <code>null</code>.
+     * @return <code>true</code> if the walk was completed or <code>false</code>
+     *         if the walk was cancelled
+     */
+    public boolean walkTree(Function1<Node, Boolean> f) {
+        return Nodes.walkTree(f, roots);
+   }
+
 }
\ No newline at end of file