X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.graph%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fgraph%2FSpreadsheetCell.java;h=0ee66cf075142e57f94f27405cfb1609e17c8785;hp=b4e83ede1ba0bf9ccff9e92bc7b438e99178436a;hb=5915c1bbd6d0c6125aa3c815c7843339190f28e4;hpb=dfa52ccefe2e4c36965ad3ccf5e19b778cae0d99

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 b4e83ede1..0ee66cf07 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
@@ -31,12 +31,24 @@ public class SpreadsheetCell implements SpreadsheetElement, SheetNode {
 	final private int column;
 	int style;
 	Object content;
+	final private Map<String, SheetNode> properties;
 	
 	public SpreadsheetCell(SpreadsheetLine line, int column) {
+		this.properties = createProperties();
 		this.line = line;
 		this.column = column;
 	}
 
+	//All SpreadsheetCells have these properties - create them when object is created
+	private Map<String, SheetNode> createProperties() {
+	    Map<String, SheetNode> p = new HashMap<>();	    
+	    p.put("typeURI", new SpreadsheetTypeNode(SpreadsheetResource.URIs.Cell));
+	    p.put("content", new SpreadsheetCellContent(this));
+        p.put("style", new SpreadsheetCellStyle(this));
+        p.put("editable", new SpreadsheetCellEditable(this));
+        return p;
+	}
+	
     public boolean hasExpression() {
 		return content instanceof SpreadsheetFormula || content instanceof SpreadsheetSCLConstant; 
 	}
@@ -66,16 +78,9 @@ public class SpreadsheetCell implements SpreadsheetElement, SheetNode {
 	
 	@Override
 	public Map<String, SheetNode> getProperties() {
-	    Map<String, SheetNode> properties = new HashMap<>();
-	    
 	    if (GraphUI.DEBUG)
 	        System.out.println("SpreadsheetCell.getProperties: " + this + " " + content + " " + style);
-	    
-	    properties.put("typeURI", new SpreadsheetTypeNode(SpreadsheetResource.URIs.Cell));
-	    properties.put("content", new SpreadsheetCellContent(this));
-        properties.put("style", new SpreadsheetCellStyle(this));
-        properties.put("editable", new SpreadsheetCellEditable(this));
-	    return properties;
+	    return properties; //Return this SpreadsheetCells's properties, rather than a new HashMap
 	}
 	
 	public SpreadsheetBook getBook() {