Merge pull request #235 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit '1f10444b20ecfe83b53b0916dfa7730a3ebee0fa':
  配色
  move designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
  CHART-2521 图表配色

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java

@@ -1,10 +1,11 @@
 package com.fr.design.mainframe.chart.gui.style;
 
+import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
 import com.fr.base.Utils;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.base.ChartConstants;
-import com.fr.chart.base.ChartPreStyle;
+import com.fr.chart.base.ChartUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -199,9 +200,9 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
 		} else if(styleSelectBox.getSelectedIndex() < styleSelectBox.getItemCount() - 1){
 			ChartPreStyleConfig manager = ChartPreStyleConfig.getInstance();
 			Object preStyle = manager.getPreStyle(styleSelectBox.getSelectedItem());
-			if(preStyle instanceof ChartPreStyle) {
+			if (preStyle instanceof ChartColorMatching) {
-                AttrFillStyle def = ((ChartPreStyle) preStyle).getAttrFillStyle();
+				AttrFillStyle def = ChartUtils.chartColorMatching2AttrFillStyle((ChartColorMatching) preStyle);
-                def.setFillStyleName(Utils.objectToString(styleSelectBox.getSelectedItem()));
+				def.setFillStyleName(Utils.objectToString(styleSelectBox.getSelectedItem()));
                 return def;
             }else{
                 condition.setColorStyle(ChartConstants.COLOR_DEFAULT);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartPreFillStylePane.java

@@ -1,97 +0,0 @@
-package com.fr.design.mainframe.chart.gui.style;
-
-import java.awt.*;
-
-import com.fr.chart.base.AttrFillStyle;
-import com.fr.chart.base.ChartConstants;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.general.Inter;
-
-/**
- * 预定义的图表配色界面, 其中和属性表中ChartFillStylePane 主要的不同就是标签的位置.
- * @author kunsnat E-mail:kunsnat@gmail.com
- * @version 创建时间：2013-8-21 下午03:16:27
- */
-public class ChartPreFillStylePane extends ChartFillStylePane {
-	
-	public ChartPreFillStylePane() {
-		
-	}
-	
-	protected void initLayout() {// 仅仅是服务器预定 风格界面布局, 和属性表 有所不同.
-		customPane.setPreferredSize(new Dimension(200, 200));
-		colorGradient.setPreferredSize(new Dimension(120, 30));
-		
-		double p = TableLayout.PREFERRED;
-		double[] columnSize = {p, p };
-		double[] rowSize = { p, p, p};
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(" " + Inter.getLocText("ColorMatch")), null},
-                new Component[]{null, customPane},
-        };
-        
-        this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.WEST);
-	}
-
-    public void populateBean(AttrFillStyle condition) {
-        styleSelectBox.setSelectedIndex(styleSelectBox.getItemCount()-1);
-
-        if(condition == null || condition.getColorStyle() == ChartConstants.COLOR_DEFAULT) {
-            colorAcc.populateBean(ChartConstants.CHART_COLOR_ARRAY);// 新建时 保持默认样式
-            accButton.setSelected(true);
-            gradientButton.setSelected(false);
-            cardLayout.show(changeColorSetPane, "acc");
-
-            colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
-            colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);// 控件中的位置无效.
-        } else {
-            int colorStyle = condition.getColorStyle();
-            gradientButton.setSelected(colorStyle == ChartConstants.COLOR_GRADIENT);
-            accButton.setSelected(colorStyle == ChartConstants.COLOR_ACC);
-
-            int colorSize = condition.getColorSize();
-            if(colorSize == 2 && gradientButton.isSelected() ) {
-                cardLayout.show(changeColorSetPane, "gradient");
-
-                Color endColor = condition.getColorIndex(1);
-                Color startColor = condition.getColorIndex(0);
-                colorGradient.getSelectColorPointBtnP1().setColorInner(startColor);
-                colorGradient.getSelectColorPointBtnP2().setColorInner(endColor);
-                colorGradient.repaint();
-            } else if(colorSize > 2 && accButton.isSelected()){
-                cardLayout.show(changeColorSetPane, "acc");
-
-                Color[] colors = new Color[colorSize];
-                for(int i = 0; i < colorSize; i++) {
-                    colors[i] = condition.getColorIndex(i);
-                }
-                colorAcc.populateBean(colors);
-            }
-        }
-    }
-
-    @Override
-    public AttrFillStyle updateBean() {
-        AttrFillStyle condition = new AttrFillStyle();
-        condition.clearColors();
-
-        if(gradientButton.isSelected()) {
-            condition.setColorStyle(ChartConstants.COLOR_GRADIENT);
-            Color start = colorGradient.getSelectColorPointBtnP1().getColorInner();
-            Color end = colorGradient.getSelectColorPointBtnP2().getColorInner();
-            condition.addFillColor(start);
-            condition.addFillColor(end);
-        } else {
-            condition.setColorStyle(ChartConstants.COLOR_ACC);
-
-            Color[] colors = colorAcc.updateBean();
-            for(int i = 0, length = colors.length; i < length; i++) {
-                condition.addFillColor(colors[i]);
-            }
-        }
-
-        return condition;
-    }
-}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -1,12 +1,13 @@
 package com.fr.design.mainframe.chart.gui.type;
 
+import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
 import com.fr.base.FRContext;
 import com.fr.base.background.ColorBackground;
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.base.ChartConstants;
-import com.fr.chart.base.ChartPreStyle;
+import com.fr.chart.base.ChartUtils;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.base.TextAttr;
 import com.fr.chart.chartattr.Axis;
@@ -243,7 +244,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
         if(preStyle == null){
             plot.getPlotFillStyle().setColorStyle(ChartConstants.COLOR_DEFAULT);
         }else{
-            AttrFillStyle fillStyle = ((ChartPreStyle)preStyle).getAttrFillStyle();
+            AttrFillStyle fillStyle = ChartUtils.chartColorMatching2AttrFillStyle((ChartColorMatching) preStyle);
             fillStyle.setFillStyleName(name);
             plot.setPlotFillStyle(fillStyle);
         }

designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@@ -0,0 +1,165 @@
+package com.fr.design.module;
+
+import com.fr.base.ChartColorMatching;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.gui.style.ChartAccColorPane;
+import com.fr.design.style.background.gradient.FixedGradientBar;
+import com.fr.general.Inter;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 预定义的图表配色界面.
+ * @author kunsnat E-mail:kunsnat@gmail.com
+ * @version 创建时间：2013-8-21 下午03:16:27
+ */
+public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
+
+    private JPanel changeColorSetPane;
+    private CardLayout cardLayout;
+
+    private UIButton accButton;
+    private UIButton gradientButton;
+
+    private ChartAccColorPane colorAcc;
+    private FixedGradientBar colorGradient;
+
+    public ChartPreFillStylePane() {
+
+        initComponents();
+
+        initListener();
+    }
+
+    private void initComponents() {
+
+        JPanel customPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
+
+        JPanel buttonPane = new JPanel();
+        buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT));
+        buttonPane.add(accButton = new UIButton(Inter.getLocText("FR-Designer_Chart_Acc_Set")));
+        buttonPane.add(gradientButton = new UIButton(Inter.getLocText("FR-Designer_Gradient-Color")));
+        customPane.add(buttonPane, BorderLayout.NORTH);
+
+        changeColorSetPane = new JPanel(cardLayout = new CardLayout());
+        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
+        changeColorSetPane.add(colorAcc = new ChartAccColorPane(), "acc");
+        cardLayout.show(changeColorSetPane, "acc");
+        customPane.add(changeColorSetPane, BorderLayout.CENTER);
+
+        accButton.setSelected(true);
+
+        customPane.setPreferredSize(new Dimension(200, 200));
+        colorGradient.setPreferredSize(new Dimension(120, 30));
+        colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
+        colorGradient.getSelectColorPointBtnP2().setColorInner(Color.black);
+
+        double p = TableLayout.PREFERRED;
+        double[] columnSize = {p, p};
+        double[] rowSize = {p, p, p};
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(" " + Inter.getLocText("ColorMatch")), null},
+                new Component[]{null, customPane},
+        };
+
+        this.setLayout(new BorderLayout());
+        this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.WEST);
+    }
+
+    private void initListener() {
+
+        accButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                accButton.setSelected(true);
+                gradientButton.setSelected(false);
+                cardLayout.show(changeColorSetPane, "acc");
+            }
+        });
+
+        gradientButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                gradientButton.setSelected(true);
+                accButton.setSelected(false);
+                cardLayout.show(changeColorSetPane, "gradient");
+            }
+        });
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Inter.getLocText("ServerM-Predefined_Styles");
+    }
+
+    public void populateBean(ChartColorMatching condition) {
+        if (condition == null) {
+            return;
+        }
+
+        boolean isGradient = condition.getGradient();
+        List<Color> colorList = condition.getColorList();
+        if (isGradient) {
+            gradientButton.setSelected(true);
+            accButton.setSelected(false);
+            cardLayout.show(changeColorSetPane, "gradient");
+
+            if (colorList.size() == 2) {
+                colorGradient.getSelectColorPointBtnP1().setColorInner(colorList.get(0));
+                colorGradient.getSelectColorPointBtnP2().setColorInner(colorList.get(1));
+                colorGradient.repaint();
+            }
+        } else {
+            accButton.setSelected(true);
+            gradientButton.setSelected(false);
+            cardLayout.show(changeColorSetPane, "acc");
+
+            if (colorList.size() > 0) {
+                colorAcc.populateBean(colorList.toArray(new Color[colorList.size()]));
+            }
+        }
+    }
+
+    @Override
+    public ChartColorMatching updateBean() {
+        ChartColorMatching chartColorMatching = new ChartColorMatching();
+
+        List<Color> colorList = new ArrayList<Color>();
+
+        if(gradientButton.isSelected()) {
+            chartColorMatching.setGradient(true);
+
+            Color start = colorGradient.getSelectColorPointBtnP1().getColorInner();
+            Color end = colorGradient.getSelectColorPointBtnP2().getColorInner();
+            colorList.add(start);
+            colorList.add(end);
+        } else {
+            chartColorMatching.setGradient(false);
+
+            Color[] colors = colorAcc.updateBean();
+            for(Color color : colors) {
+                colorList.add(color);
+            }
+        }
+
+        chartColorMatching.setColorList(colorList);
+
+        return chartColorMatching;
+    }
+}

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java

@@ -39,14 +39,10 @@ public class ChartPreStyleAction extends UpdateAction {
 			@Override
 			public void doOk() {
 				pane.updateBean();
-//				ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
-//				manager.setStyleEditing(null);
 			}                
 			
 			@Override
 			public void doCancel() {
-//				ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
-//				manager.setStyleEditing(null);
 			}
         });
 

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java

@@ -1,8 +1,9 @@
 package com.fr.design.module;
 
+import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
 import com.fr.base.Utils;
-import com.fr.chart.base.ChartPreStyle;
+import com.fr.config.Configuration;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
@@ -10,8 +11,9 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
-import com.fr.stable.ListMap;
 import com.fr.stable.Nameable;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.Worker;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -32,7 +34,7 @@ public class ChartPreStyleManagerPane extends JListControlPane {
 	public NameableCreator[] createNameableCreators() {
 		return new NameableCreator[]{
 				new NameObjectCreator(Inter.getLocText("FR-Designer_PreStyle"),
-						ChartPreStyle.class, ChartPreStylePane.class)
+						ChartColorMatching.class, ChartPreStylePane.class)
 		};
 	}
 
@@ -42,15 +44,14 @@ public class ChartPreStyleManagerPane extends JListControlPane {
 	}
 	
 	public void populateBean() {
-		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance().mirror();
-		
 		ArrayList list = new ArrayList();
 		
 		Iterator keys = config.names();
 		while(keys.hasNext()) {
 			Object key = keys.next();
-			ChartPreStyle value = (ChartPreStyle)config.getPreStyle(key);
+			ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key);
-			
+
 			list.add(new NameObject(Utils.objectToString(key), value));
 		}
 		
@@ -63,24 +64,33 @@ public class ChartPreStyleManagerPane extends JListControlPane {
 	}
 	
 	public void updateBean() {
-		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+		Configurations.update(new Worker() {
+			@Override
+			public void run() {
+				ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
 
-		config.setPreStyleMap(new ListMap());
+				config.setCurrentStyle(getSelectedName());
 
-		Nameable[] values = this.update();
+				Nameable[] values = update();
+				config.clearAllPreStyle();
 
-		config.setCurrentStyle(getSelectedName());
+				for(Nameable value : values) {
-		
+					config.putPreStyle(value.getName(), ((NameObject) value).getObject());
-		for(int i = 0; i < values.length; i++) {
+				}
-			Nameable value = values[i];
+
-			config.putPreStyle(value.getName(), ((NameObject)value).getObject());
+				// 通知报表整个刷新.
-		}
+				DesignerFrame frame = DesignerContext.getDesignerFrame();
+				if(frame != null) {
+					frame.repaint();
+				}
+			}
+
+			@Override
+			public Class<? extends Configuration>[] targets() {
+				return new Class[]{ChartPreStyleConfig.class};
+			}
+		});
 
-		// 通知报表整个刷新. 
-		DesignerFrame frame = DesignerContext.getDesignerFrame();
-		if(frame != null) {
-			frame.repaint();
-		}
 	}
 
 }

designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java

@@ -1,16 +1,17 @@
 package com.fr.design.module;
 
-import com.fr.chart.base.ChartPreStyle;
+import com.fr.base.ChartColorMatching;
+import com.fr.chart.base.ChartUtils;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.gui.ChartComponent;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.chart.gui.style.ChartPreFillStylePane;
 import com.fr.general.Inter;
 
 import javax.swing.JPanel;
@@ -25,8 +26,8 @@ import java.awt.FlowLayout;
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2013-8-20 下午05:02:00
  */
-public class ChartPreStylePane extends BasicBeanPane<ChartPreStyle>{
+public class ChartPreStylePane extends BasicBeanPane<ChartColorMatching> {
-	
+
 	private ChartPreFillStylePane fillStylePane;
 	private ChartComponent chartComponent;
 	
@@ -78,28 +79,26 @@ public class ChartPreStylePane extends BasicBeanPane<ChartPreStyle>{
 			}
 		}
 	}
-	
+
-	private void refreshWhenStyleChange(ChartPreStyle preStyle) {
+	private void refreshWhenStyleChange(ChartColorMatching preStyle) {
-//		ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
-//		manager.setStyleEditing(preStyle);
 		if(chartComponent != null) {
+			Plot plot = (Plot) chartComponent.getEditingChart().getBasePlot();
+			plot.setPlotFillStyle(ChartUtils.chartColorMatching2AttrFillStyle(preStyle));
 			chartComponent.reset();
 		}
 	}
 	
 	@Override
-	public void populateBean(ChartPreStyle preStyle) {
+	public void populateBean(ChartColorMatching preStyle) {
+
+		fillStylePane.populateBean(preStyle);
 
-		fillStylePane.populateBean(preStyle.getAttrFillStyle());
-		
 		refreshWhenStyleChange(preStyle);
 	}
 
 	@Override
-	public ChartPreStyle updateBean() {
+	public ChartColorMatching updateBean() {
-		ChartPreStyle preStyle = new ChartPreStyle();
+		return fillStylePane.updateBean();
-		preStyle.setAttrFillStyle(fillStylePane.updateBean());
-		return preStyle;
 	}
 
 	@Override