X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.document.linking.ui%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Flinking%2Freport%2Fevaluator%2FAnd.java;h=e2a264069d296560a5d188847443bea224e0472e;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=2dfadcd8b766ca6f0f86656f7f38c8bdc8d15658;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/And.java b/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/And.java
index 2dfadcd8b..e2a264069 100644
--- a/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/And.java
+++ b/bundles/org.simantics.document.linking.ui/src/org/simantics/document/linking/report/evaluator/And.java
@@ -1,124 +1,124 @@
-package org.simantics.document.linking.report.evaluator;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.variable.Variable;
-import org.simantics.document.linking.Activator;
-import org.simantics.document.linking.ontology.DocumentLink;
-import org.simantics.document.linking.report.DocumentLine;
-import org.simantics.objmap.graph.annotations.OrderedSetType;
-import org.simantics.objmap.graph.annotations.RelatedGetValue;
-import org.simantics.objmap.graph.annotations.RelatedSetValue;
-
-/**
- * And node combines contents of the child nodes with configurable separator (default " ")
- * 
- * If all children return null, the return value is null.
- * 
- * @author Marko Luukkainen <marko.luukkainen@vtt.fi>
- *
- */
-@OrderedSetType(DocumentLink.URIs.EvaluatorTree_And)
-public class And extends EvaluatorNode implements StringEditableNode{
-	
-	String separator;
-	
-	
-	public And() {
-		separator = " ";
-	}
-	
-	public And(String separator) {
-		this.separator = separator;
-	}
-	
-	public void setSeparator(String separator) {
-		this.separator = separator;
-	}
-	
-	public String getSeparator() {
-		return separator;
-	}
-	
-	
-	@Override
-	public String getValue(ReadGraph graph, Variable variable, Map<Object, Object> context) throws DatabaseException {
-		String s = "";
-		for (int i = 0 ; i < children.size(); i++) {
-			String s2 = children.get(i).getValue(graph, variable, context);
-			if (s2 != null) {
-				s+= s2;
-				if (i < children.size()-1)
-					s+=separator;
-			}
-		}
-		if (s.length() == 0)
-			return null;
-		return s;
-	}
-	
-	@Override
-	public List<DocumentLine> getLines(ReadGraph graph,	Variable variable, Map<Object, Object> context) throws DatabaseException {
-		List<DocumentLine> result = new ArrayList<DocumentLine>();
-		for (int i = 0 ; i < children.size(); i++) {
-			List<DocumentLine> list = children.get(i).getLines(graph, variable, context);
-			for (int j = 0; j < list.size(); j++) {
-				DocumentLine line = list.get(j); 
-				if (j <= result.size()) {
-					result.add(line);
-				} else {
-					DocumentLine extLine = result.get(j);
-					String combined = extLine.getLine() + separator + line.getLine();
-					Map<Object,Object> combinedSet = new HashMap<Object, Object>();
-					combinedSet.putAll(extLine.getHints());
-					combinedSet.putAll(line.getHints());
-					
-					result.set(j, new DocumentLine(combined,combinedSet));
-				}
-			}
-		}
-		return result;
-	}
-	
-
-	@Override
-	public String toString() {
-		return "and " + "(" + separator +")" ;
-	}
-	
-	@RelatedGetValue(DocumentLink.URIs.EvaluatorTree_HasValue)
-	@Override
-	public String getValue() {
-		return separator;
-	}
-	
-	@Override
-	public String setValue(String value) {
-		separator = value;
-		return null;
-	}
-	
-	@RelatedSetValue(DocumentLink.URIs.EvaluatorTree_HasValue)
-	public void _setValue(String value) {
-		separator = value;
-	}
-	
-	@Override
-	public EvaluatorItem copy() {
-		And a = new And(separator);
-		copyChildren(a);
-		return a;
-	}
-	
-	@Override
-	public ImageDescriptor getImage() {
-		return Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/text_columns.png");
-	}
-
-}
+package org.simantics.document.linking.report.evaluator;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.linking.Activator;
+import org.simantics.document.linking.ontology.DocumentLink;
+import org.simantics.document.linking.report.DocumentLine;
+import org.simantics.objmap.graph.annotations.OrderedSetType;
+import org.simantics.objmap.graph.annotations.RelatedGetValue;
+import org.simantics.objmap.graph.annotations.RelatedSetValue;
+
+/**
+ * And node combines contents of the child nodes with configurable separator (default " ")
+ * 
+ * If all children return null, the return value is null.
+ * 
+ * @author Marko Luukkainen <marko.luukkainen@vtt.fi>
+ *
+ */
+@OrderedSetType(DocumentLink.URIs.EvaluatorTree_And)
+public class And extends EvaluatorNode implements StringEditableNode{
+	
+	String separator;
+	
+	
+	public And() {
+		separator = " ";
+	}
+	
+	public And(String separator) {
+		this.separator = separator;
+	}
+	
+	public void setSeparator(String separator) {
+		this.separator = separator;
+	}
+	
+	public String getSeparator() {
+		return separator;
+	}
+	
+	
+	@Override
+	public String getValue(ReadGraph graph, Variable variable, Map<Object, Object> context) throws DatabaseException {
+		String s = "";
+		for (int i = 0 ; i < children.size(); i++) {
+			String s2 = children.get(i).getValue(graph, variable, context);
+			if (s2 != null) {
+				s+= s2;
+				if (i < children.size()-1)
+					s+=separator;
+			}
+		}
+		if (s.length() == 0)
+			return null;
+		return s;
+	}
+	
+	@Override
+	public List<DocumentLine> getLines(ReadGraph graph,	Variable variable, Map<Object, Object> context) throws DatabaseException {
+		List<DocumentLine> result = new ArrayList<DocumentLine>();
+		for (int i = 0 ; i < children.size(); i++) {
+			List<DocumentLine> list = children.get(i).getLines(graph, variable, context);
+			for (int j = 0; j < list.size(); j++) {
+				DocumentLine line = list.get(j); 
+				if (j <= result.size()) {
+					result.add(line);
+				} else {
+					DocumentLine extLine = result.get(j);
+					String combined = extLine.getLine() + separator + line.getLine();
+					Map<Object,Object> combinedSet = new HashMap<Object, Object>();
+					combinedSet.putAll(extLine.getHints());
+					combinedSet.putAll(line.getHints());
+					
+					result.set(j, new DocumentLine(combined,combinedSet));
+				}
+			}
+		}
+		return result;
+	}
+	
+
+	@Override
+	public String toString() {
+		return "and " + "(" + separator +")" ;
+	}
+	
+	@RelatedGetValue(DocumentLink.URIs.EvaluatorTree_HasValue)
+	@Override
+	public String getValue() {
+		return separator;
+	}
+	
+	@Override
+	public String setValue(String value) {
+		separator = value;
+		return null;
+	}
+	
+	@RelatedSetValue(DocumentLink.URIs.EvaluatorTree_HasValue)
+	public void _setValue(String value) {
+		separator = value;
+	}
+	
+	@Override
+	public EvaluatorItem copy() {
+		And a = new And(separator);
+		copyChildren(a);
+		return a;
+	}
+	
+	@Override
+	public ImageDescriptor getImage() {
+		return Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/text_columns.png");
+	}
+
+}