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

* commit 'd4e37210b7fb5459d8a61c209e4916989e257954':
  CHART-2409 地图资源配置界面
  update
  CHART-2525 词云 形状图片
  CHART-2407 图表配色

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

@@ -1,8 +1,6 @@
 package com.fr.design.mainframe.chart.gui.style;
 
 import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.ChartPreStyleManagerProvider;
-import com.fr.base.ChartPreStyleServerManager;
 import com.fr.base.Utils;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.base.ChartConstants;
@@ -199,7 +197,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
 		if(styleSelectBox.getSelectedIndex() == 0) {
 			condition.setColorStyle(ChartConstants.COLOR_DEFAULT);
 		} else if(styleSelectBox.getSelectedIndex() < styleSelectBox.getItemCount() - 1){
-            ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
+			ChartPreStyleConfig manager = ChartPreStyleConfig.getInstance();
 			Object preStyle = manager.getPreStyle(styleSelectBox.getSelectedItem());
 			if(preStyle instanceof ChartPreStyle) {
                 AttrFillStyle def = ((ChartPreStyle) preStyle).getAttrFillStyle();

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

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe.chart.gui.type;
 
-import com.fr.base.ChartPreStyleManagerProvider;
+import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.ChartPreStyleServerManager;
 import com.fr.base.FRContext;
 import com.fr.base.background.ColorBackground;
 import com.fr.chart.base.AttrContents;
@@ -26,9 +25,9 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.js.NameJavaScriptGroup;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 
 import javax.swing.JPanel;
@@ -224,7 +223,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
     }
 
     private void setPlotFillStyle(Chart chart){
-        ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
+        ChartPreStyleConfig manager = ChartPreStyleConfig.getInstance();
         Plot plot = chart.getPlot();
         Object preStyle = null;
         String name = "";

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

@@ -1,7 +1,5 @@
 package com.fr.design.module;
 
-import com.fr.base.ChartPreStyleManagerProvider;
-import com.fr.base.ChartPreStyleServerManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -41,14 +39,14 @@ public class ChartPreStyleAction extends UpdateAction {
 			@Override
 			public void doOk() {
 				pane.updateBean();
-				ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
+//				ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
-				manager.setStyleEditing(null);
+//				manager.setStyleEditing(null);
 			}                
 			
 			@Override
 			public void doCancel() {
-				ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
+//				ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
-				manager.setStyleEditing(null);
+//				manager.setStyleEditing(null);
 			}
         });
 

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

@@ -10,6 +10,7 @@ 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 java.util.ArrayList;
@@ -64,6 +65,8 @@ public class ChartPreStyleManagerPane extends JListControlPane {
 	public void updateBean() {
 		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
 
+		config.setPreStyleMap(new ListMap());
+
 		Nameable[] values = this.update();
 
 		config.setCurrentStyle(getSelectedName());

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

@@ -1,7 +1,5 @@
 package com.fr.design.module;
 
-import com.fr.base.ChartPreStyleManagerProvider;
-import com.fr.base.ChartPreStyleServerManager;
 import com.fr.chart.base.ChartPreStyle;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
@@ -15,8 +13,12 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.gui.style.ChartPreFillStylePane;
 import com.fr.general.Inter;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
 
 /**
  * 图表预定义风格界面,  服务器--图表风格.
@@ -78,8 +80,8 @@ public class ChartPreStylePane extends BasicBeanPane<ChartPreStyle>{
 	}
 	
 	private void refreshWhenStyleChange(ChartPreStyle preStyle) {
-		ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
+//		ChartPreStyleManagerProvider manager = ChartPreStyleServerManager.getProviderInstance();
-		manager.setStyleEditing(preStyle);
+//		manager.setStyleEditing(preStyle);
 		if(chartComponent != null) {
 			chartComponent.reset();
 		}

designer-chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java

@@ -24,8 +24,8 @@ public class ChartMapEditorAction extends UpdateAction {
     public void actionPerformed(ActionEvent evt) {
         int port = DesignerEnvManager.getEnvManager().getEmbedServerPort();
         String web = GeneralContext.getCurrentAppNameOfEnv();
-        String serverlet = ServerConfig.getInstance().getReportServletName();
+        String serverlet = ServerConfig.getInstance().getServletName();
-        ServerStarter.browserURLWithLocalEnv(WorkContext.getCurrent().isLocal() ? String.format("http://localhost:%d/%s/%s?op=map", port, web, serverlet) : WorkContext.getCurrent().getPath() + "?op=map");
+        ServerStarter.browserURLWithLocalEnv(WorkContext.getCurrent().isLocal() ? String.format("http://localhost:%d/%s/%s/view/report?op=map", port, web, serverlet) : WorkContext.getCurrent().getPath() + "/view/report?op=map");
     }
 
 }

designer-chart/src/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.wordcloud.designer.style;
 
 import com.fr.base.Utils;
 import com.fr.base.background.ImageBackground;
+import com.fr.base.background.ImageFileBackground;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -153,10 +154,10 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
                 CloudShapeType type = (CloudShapeType)cloudShape.getSelectedItem();
                 String path = type.getImageUrl();
                 if(path != null) {
-                    ImageBackground imageBackground = new ImageBackground(IOUtils.readImage(path));
+                    ImageFileBackground imageBackground = new ImageFileBackground(IOUtils.readImage(path));
                     imageBackgroundQuickPane.populateBean(imageBackground);
                 } else {
-                    imageBackgroundQuickPane.populateBean(new ImageBackground());
+                    imageBackgroundQuickPane.populateBean(new ImageFileBackground());
                 }
                 checkImagePane();
             }