Adopt spreadsheet changes made in Balas development

[simantics/platform.git] / bundles / org.simantics.spreadsheet / src / org / simantics / spreadsheet / synchronization / StyleUpdater.java

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java b/bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/synchronization/StyleUpdater.java
similarity index 96%
rename from bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java
rename to bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/synchronization/StyleUpdater.java
index 4451d13140a6049d3b3271d90757b4bfcf2921ce..e3555fc31f89c393da8ad2f51dd6f1676ac6141b 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java
+++ b/bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/synchronization/StyleUpdater.java
@@ -1,4 +1,4 @@
-package org.simantics.spreadsheet.graph.synchronization;
+package org.simantics.spreadsheet.synchronization;
 
 import java.util.Collection;
 import java.util.Map;
@@ -6,8 +6,9 @@ import java.util.Map;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.datatypes.literal.Font;
 import org.simantics.datatypes.literal.RGB;
-import org.simantics.spreadsheet.graph.SpreadsheetBook;
-import org.simantics.spreadsheet.graph.SpreadsheetStyle;
+import org.simantics.spreadsheet.solver.SheetLineComponent;
+import org.simantics.spreadsheet.solver.SpreadsheetBook;
+import org.simantics.spreadsheet.solver.SpreadsheetStyle;
 import org.simantics.structural.synchronization.base.CommandBuilder;
 import org.simantics.structural.synchronization.base.ModuleUpdateContext;
 import org.simantics.structural.synchronization.base.ModuleUpdaterBase;
@@ -21,7 +22,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
         public String getPropertyName() {
             return "foreground";
         }
-        
+
         @Override
         public void apply(ModuleUpdateContext<SheetLineComponent> context, boolean isCreating, Map<String, Variant> propertyMap, Map<String, Collection<String>> connectionMap, Variant value) {
             StyleCommandBuilder builder = context.getConcreteCommand();
@@ -29,7 +30,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
             builder.foreground = color;
         }
     }
-    
+
     private static class BackgroundUpdateRule implements PropertyUpdateRule<SheetLineComponent> {
         @Override
         public String getPropertyName() {
@@ -43,7 +44,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
             builder.background = color;
         }
     }
-    
+
     private static class FontUpdateRule implements PropertyUpdateRule<SheetLineComponent> {
         @Override
         public String getPropertyName() {
@@ -71,7 +72,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
             builder.align = align;
         }
     }
-    
+
     private static class FormatStringUpdateRule implements PropertyUpdateRule<SheetLineComponent> {
         @Override
         public String getPropertyName() {
@@ -113,7 +114,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
             builder.border = border;
         }
     }
-    
+
     private static class LockedUpdateRule implements PropertyUpdateRule<SheetLineComponent> {
         @Override
         public String getPropertyName() {
@@ -127,7 +128,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
             builder.locked = locked;
         }
     }
-    
+
     private static class ColumnSpanUpdateRule implements PropertyUpdateRule<SheetLineComponent> {
         @Override
         public String getPropertyName() {
@@ -141,7 +142,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
             builder.columnSpan = columnSpan;
         }
     }
-    
+
     private static class RowSpanUpdateRule implements PropertyUpdateRule<SheetLineComponent> {
         @Override
         public String getPropertyName() {
@@ -156,10 +157,10 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
         }
     }
 
-    
+
     public StyleUpdater(String moduleType) {
         super(moduleType);
-        
+
         addPropertyUpdateRule(new ForegroundUpdateRule());
         addPropertyUpdateRule(new BackgroundUpdateRule());
         addPropertyUpdateRule(new FontUpdateRule());
@@ -181,7 +182,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
     public CommandBuilder createUpdateCommandBuilder(String name) {
         return new StyleCommandBuilder(name, true);
     }
-    
+
     private static class StyleCommandBuilder implements CommandBuilder {
 
         protected int rowSpan;
@@ -194,15 +195,13 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
         protected org.simantics.datatypes.literal.RGB.Integer foreground;
         protected Font font;
         protected int align;
-        
-        private boolean update;
+
         private String name;
-        
+
         public StyleCommandBuilder(String name, boolean update) {
             this.name = name.split("/")[1];
-            this.update = update;
         }
-        
+
         @Override
         public void apply(Solver solver) {
             SpreadsheetBook book = solver.getConcreteSolver();
@@ -211,7 +210,7 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
                     .columnSpan(columnSpan).formatIndex((short) formatIndex).formatString(formatString).build();
             if (book.getStyle(style.getStyleId()) == null)
                 book.addStyle(style);
-            
+
         }
 
         @SuppressWarnings("unchecked")
@@ -219,14 +218,14 @@ public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
         public <T> T getConcrete() {
             return (T) this;
         }
-        
+
         @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append("StyleCommandBuilder for ").append(name).append(" [background=").append(background).append(", foregroung=").append(foreground).append(", font=").append(font).append(", align=").append(align).append("]");
             return sb.toString();
         }
-        
+
     }
-    
+
 }