From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 29 Aug 2016 14:13:39 +0000 (+0300)
Subject: Merge "Reverted unintentional MANIFEST.MF change from c160c0a55f"
X-Git-Tag: v1.25.0~143
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=ad811ef47b6daa8aaa5b1011f2438bd55c29ae2a;hp=8ef1c0c55ded8c57677fdcdce5915226c9f340ab

Merge "Reverted unintentional MANIFEST.MF change from c160c0a55f"
---

diff --git a/bundles/org.simantics.scl.runtime/build.properties b/bundles/org.simantics.scl.runtime/build.properties
index cd7bc4044..cbbb8252d 100755
--- a/bundles/org.simantics.scl.runtime/build.properties
+++ b/bundles/org.simantics.scl.runtime/build.properties
@@ -3,4 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                scl/,\
-               schema/
+               schema/
\ No newline at end of file
diff --git a/bundles/org.simantics.scl.ui/plugin.xml b/bundles/org.simantics.scl.ui/plugin.xml
index 3a852b367..2a2f3d934 100755
--- a/bundles/org.simantics.scl.ui/plugin.xml
+++ b/bundles/org.simantics.scl.ui/plugin.xml
@@ -75,10 +75,6 @@
                style="push">
          </command>
       </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="org.simantics.scl.ui.menuContribution1">
-      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/CellValueVisitor.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/CellValueVisitor.java
index b0abb61b1..385af9938 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/CellValueVisitor.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/CellValueVisitor.java
@@ -434,7 +434,8 @@ public class CellValueVisitor implements AstValueVisitor<Object> {
 
 	@Override
 	public Object visit(AstIdentifier id) {
-		throw new IllegalStateException();
+		return FormulaError2.NAME.getString();
+		//throw new IllegalStateException();
 	}
 	
 	@Override
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/GraphUI.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/GraphUI.java
index 80e9656e3..9a3e87326 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/GraphUI.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/GraphUI.java
@@ -495,7 +495,13 @@ public class GraphUI implements Adaptable, ListenerSupport, AsyncListenerSupport
 				public <T> void edit(Transaction<Write> transaction, String location, String property, T value, Binding binding, Consumer<?> callback) {
 					
 				    if (ClientModel.ITERATION_ENABLED.equals(location)) {
-				        
+				        Simantics.getSession().asyncRequest(new ReadRequest() {
+							@Override
+							public void run(ReadGraph graph) throws DatabaseException {
+								getBook(graph).setIterationEnabled((boolean)value);
+							}
+						});
+				        return;
 				    }
 				    
 				    if (ClientModel.MODE.equals(location)) {
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
index caf3cd984..e292fd918 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
@@ -57,6 +57,8 @@ public class SpreadsheetBook implements SpreadsheetElement<SpreadsheetElement, S
 	
 	public Map<Integer, SpreadsheetElement> children = new HashMap<>();
 
+	private boolean iterationEnabled;
+
 	public int getNewId(SpreadsheetElement element) {
 		int result = idCounter++;
 		children.put(result, element);
@@ -401,4 +403,12 @@ public class SpreadsheetBook implements SpreadsheetElement<SpreadsheetElement, S
         
     }
 
+	public void setIterationEnabled(boolean value) {
+		this.iterationEnabled = value;
+	}
+	
+	public boolean isIterationEnabled() {
+		return iterationEnabled;
+	}
+
 }
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java
index 7d04e9b6e..b7536f83a 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetCell.java
@@ -101,22 +101,26 @@ public class SpreadsheetCell implements SpreadsheetElement, SheetNode {
 				AstValue value = ((SpreadsheetFormula)content).value;
 				if(this.inProgress == true) this.iterations++;
 				
-				if(env.iterationEnabled == false){
+				if(!env.getBook().isIterationEnabled()){
 					if(this.inProgress == false){
 						this.inProgress = true;
 						f.result = value.accept(visitor);
 					}
 					else f.result = FormulaError2.CIRCULAR_REF.getString();
 				}
-				else if(iterations<env.iterationLimit){
+				else if(this.iterations<env.iterationLimit){
 					this.inProgress = true;
 					f.result = value.accept(visitor);
 				}
-				else f.result = 0.0;
+				else {
+					if(f.result==null)
+						f.result = 0.0;
+				}
 				
 				env.getBook().registerReferences(makeReferenceKey(), visitor.getReferences());
 			}
 			this.inProgress = false;
+			this.iterations = 0;
 			return (T)f.result;
 		} else if (content instanceof SpreadsheetSCLConstant) {
 		    SpreadsheetSCLConstant sclConstant = (SpreadsheetSCLConstant) content;
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/SpreadsheetEvaluationEnvironment.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/SpreadsheetEvaluationEnvironment.java
index bb5a5d71b..b1b9ad0c6 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/SpreadsheetEvaluationEnvironment.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/SpreadsheetEvaluationEnvironment.java
@@ -11,8 +11,6 @@ public class SpreadsheetEvaluationEnvironment {
     final private SpreadsheetBook book;
     private Map<String, CellFormulaFunction<?>> functions = new HashMap<>();
     public int iterationLimit = 100;
-    public boolean iterationEnabled = false;
-    
 
     public SpreadsheetEvaluationEnvironment(SpreadsheetBook book) {
         this.book = book;
diff --git a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java
index 9b4ef34e3..d534c9488 100644
--- a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java
+++ b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java
@@ -753,6 +753,10 @@ public class SpreadsheetModel {
 		            @Override
 		            public void actionPerformed(ActionEvent e) {
 		                System.out.println("state is " + iterationEnabled.isSelected());
+		                CellEditor editor = serverInterface.getAdapter(CellEditor.class);
+		                if(editor != null) {
+		                    editor.edit(null, ClientModel.ITERATION_ENABLED, ClientModel.ITERATION_ENABLED, iterationEnabled.isSelected(), null, null);
+		                }
 		            }
 		        });
 		        
diff --git a/bundles/org.simantics.utils.datastructures/build.properties b/bundles/org.simantics.utils.datastructures/build.properties
index 12cb67a4b..05d60ae9b 100644
--- a/bundles/org.simantics.utils.datastructures/build.properties
+++ b/bundles/org.simantics.utils.datastructures/build.properties
@@ -12,5 +12,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
-
+               .
diff --git a/bundles/org.simantics/build.properties b/bundles/org.simantics/build.properties
index 6f20375d6..bc2101a72 100644
--- a/bundles/org.simantics/build.properties
+++ b/bundles/org.simantics/build.properties
@@ -2,4 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml
\ No newline at end of file
diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index 7c6d81044..a836df1a4 100644
--- a/bundles/winterwell.markdown/build.properties
+++ b/bundles/winterwell.markdown/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                .,\
                lib/
 src.includes = src/,\
-               plugin.xml,\
                icons/,\
                lib/,\
                .project,\