X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.mapping%2Fsrc%2Forg%2Fsimantics%2Fmapping%2Fconstraint%2Finstructions%2FOrInstruction.java;h=4902ab494f9abebc158ee8075e98d6484f6b3674;hp=f571ccaa92cca5160bf7226acb1f45c6ff8e7bfa;hb=refs%2Fchanges%2F38%2F238%2F2;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

diff --git a/bundles/org.simantics.mapping/src/org/simantics/mapping/constraint/instructions/OrInstruction.java b/bundles/org.simantics.mapping/src/org/simantics/mapping/constraint/instructions/OrInstruction.java
index f571ccaa9..4902ab494 100644
--- a/bundles/org.simantics.mapping/src/org/simantics/mapping/constraint/instructions/OrInstruction.java
+++ b/bundles/org.simantics.mapping/src/org/simantics/mapping/constraint/instructions/OrInstruction.java
@@ -1,90 +1,90 @@
-/*******************************************************************************
- * 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.mapping.constraint.instructions;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.exception.DatabaseException;
-
-public class OrInstruction extends CombinedInstruction {
-	
-	public OrInstruction(IInstruction... instructions) {
-		super(instructions);
-	}
-
-	static class Continuation {
-		Object continuation;
-		int instructionId;	
-		
-		public Continuation(Object continuation, int instructionId) {
-			this.continuation = continuation;
-			this.instructionId = instructionId;
-		}
-	}
-	
-	@Override
-	public Object query(ReadGraph g, Object[] bindings) throws DatabaseException {
-		int instructionId;
-		for(instructionId=0;instructionId<instructions.length-1;++instructionId) {
-			if(DEBUG)
-				System.out.println("OrInstruction.query " + instructionId + "/" + instructions.length);
-			Object continuation = instructions[instructionId].query(g, bindings);
-			if(continuation != IInstruction.FAILURE)
-				return new Continuation(continuation, instructionId);
-		}
-		return instructions[instructionId].query(g, bindings);
-	}
-	
-	@Override
-	public Object next(ReadGraph g, Object[] bindings, Object ret_) throws DatabaseException {
-		Continuation ret = (Continuation)ret_;
-		int instructionId = ret.instructionId;
-		Object continuation = ret.continuation;
-		
-		if(continuation != null) {
-			continuation = instructions[instructionId].next(g, bindings, continuation);
-			if(continuation != IInstruction.FAILURE) {
-				ret.continuation = continuation;
-				return ret;
-			}
-		}
-		
-		for(++instructionId;instructionId<instructions.length-1;++instructionId) {
-			continuation = instructions[instructionId].query(g, bindings);
-			if(continuation != IInstruction.FAILURE) {
-				ret.continuation = continuation;
-				ret.instructionId = instructionId;				
-				return ret;
-			}
-		}
-		return instructions[instructionId].query(g, bindings);
-	}
-
-	@Override
-	public void toString(StringBuilder b, int indent) {		
-		b.append("(    ");
-		boolean first = true;
-		for(IInstruction inst : instructions) {
-			if(first)
-				first = false;
-			else {
-				b.append(";\n");
-				for(int i=0;i<indent+1;++i)
-					b.append(INDENTATION);
-			}
-			inst.toString(b, indent + 1);			
-		}
-		b.append('\n');
-		for(int i=0;i<indent;++i)
-			b.append(INDENTATION);
-		b.append(")");		
-	}
-}
+/*******************************************************************************
+ * 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.mapping.constraint.instructions;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.exception.DatabaseException;
+
+public class OrInstruction extends CombinedInstruction {
+	
+	public OrInstruction(IInstruction... instructions) {
+		super(instructions);
+	}
+
+	static class Continuation {
+		Object continuation;
+		int instructionId;	
+		
+		public Continuation(Object continuation, int instructionId) {
+			this.continuation = continuation;
+			this.instructionId = instructionId;
+		}
+	}
+	
+	@Override
+	public Object query(ReadGraph g, Object[] bindings) throws DatabaseException {
+		int instructionId;
+		for(instructionId=0;instructionId<instructions.length-1;++instructionId) {
+			if(DEBUG)
+				System.out.println("OrInstruction.query " + instructionId + "/" + instructions.length);
+			Object continuation = instructions[instructionId].query(g, bindings);
+			if(continuation != IInstruction.FAILURE)
+				return new Continuation(continuation, instructionId);
+		}
+		return instructions[instructionId].query(g, bindings);
+	}
+	
+	@Override
+	public Object next(ReadGraph g, Object[] bindings, Object ret_) throws DatabaseException {
+		Continuation ret = (Continuation)ret_;
+		int instructionId = ret.instructionId;
+		Object continuation = ret.continuation;
+		
+		if(continuation != null) {
+			continuation = instructions[instructionId].next(g, bindings, continuation);
+			if(continuation != IInstruction.FAILURE) {
+				ret.continuation = continuation;
+				return ret;
+			}
+		}
+		
+		for(++instructionId;instructionId<instructions.length-1;++instructionId) {
+			continuation = instructions[instructionId].query(g, bindings);
+			if(continuation != IInstruction.FAILURE) {
+				ret.continuation = continuation;
+				ret.instructionId = instructionId;				
+				return ret;
+			}
+		}
+		return instructions[instructionId].query(g, bindings);
+	}
+
+	@Override
+	public void toString(StringBuilder b, int indent) {		
+		b.append("(    ");
+		boolean first = true;
+		for(IInstruction inst : instructions) {
+			if(first)
+				first = false;
+			else {
+				b.append(";\n");
+				for(int i=0;i<indent+1;++i)
+					b.append(INDENTATION);
+			}
+			inst.toString(b, indent + 1);			
+		}
+		b.append('\n');
+		for(int i=0;i<indent;++i)
+			b.append(INDENTATION);
+		b.append(")");		
+	}
+}