Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev

.gitignore

@@ -3,5 +3,6 @@ designer_base/bin
 designer_chart/bin
 designer_form/bin
 *.iml
+designer_base/src/com/fr/design/locale/.idea
 
 

designer/src/com/fr/design/widget/CellWidgetCardPane.java

@@ -67,7 +67,12 @@ public class CellWidgetCardPane extends BasicPane {
         treeTabPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        attriTabPane.add(widgetPropertyPane, BorderLayout.NORTH);
+        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
+        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
+        northPane.add(basic);
+        basic.add(widgetPropertyPane);
+        attriTabPane.add(northPane, BorderLayout.NORTH);
         attriCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
         attriTabPane.add(attriCardPane, BorderLayout.CENTER);
         attriCardLayout = (CardLayout) attriCardPane.getLayout();
@@ -88,15 +93,6 @@ public class CellWidgetCardPane extends BasicPane {
             this.tabbedPane.setEnabled(true);
         }
 
-        attriTabPane.remove(widgetPropertyPane);
-        widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
-        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
-        northPane.add(basic);
-        basic.add(widgetPropertyPane);
-        attriTabPane.add(northPane, BorderLayout.NORTH);
-
         WidgetDefinePaneFactory.RN rn = WidgetDefinePaneFactory.createWidgetDefinePane(cellWidget, new Operator() {
             @Override
             public void did(DataCreatorUI ui, String cardName) {

designer_base/src/com/fr/design/actions/server/ConnectionListAction.java

@@ -8,6 +8,7 @@ import com.fr.data.impl.Connection;
 import com.fr.dav.LocalEnv;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionManagerPane;
+import com.fr.design.data.datapane.connect.ConnectionShowPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -25,7 +26,6 @@ import java.util.HashMap;
  * DatasourceList Action
  */
 public class ConnectionListAction extends UpdateAction {
-    private static final int BYTENUM = 1444;
 
     public ConnectionListAction() {
         this.setMenuKeySet(DEFINE_DATA_CONNECTION);
@@ -92,7 +92,10 @@ public class ConnectionListAction extends UpdateAction {
     }
 
 
-    private void writeFile(DatasourceManagerProvider datasourceManager) {
+    /**
+     * @param datasourceManager
+     */
+    public static void writeFile(DatasourceManagerProvider datasourceManager) {
         Env currentEnv = FRContext.getCurrentEnv();
         try {
             boolean isSuccess = currentEnv.writeResource(datasourceManager);
@@ -106,15 +109,17 @@ public class ConnectionListAction extends UpdateAction {
     }
 
     /**
-     * 是否正常更新完datasourceManager
+     * 更新datasourceManager
      *
-     * @param datasourceManager
-     * @param databaseManagerPane
-     * @return
+     * @param datasourceManager  datasource管理对象
+     * @param backupManager      datasource管理对象备份
+     * @param connectionShowPane datasource面板
+     * @param databaseListDialog datasource管理对话框
+     * @return boolean 是否更新成功
      */
-    private boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager backupManager,
-                                            ConnectionManagerPane databaseManagerPane, BasicDialog databaseListDialog) {
-        databaseManagerPane.update(datasourceManager);
+    public static boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager
+            backupManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
+        connectionShowPane.update(datasourceManager);
         HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails();
         modifyDetails.clear();
         Env currentEnv = FRContext.getCurrentEnv();
@@ -139,7 +144,7 @@ public class ConnectionListAction extends UpdateAction {
                         localModifiedTable.removeConfilct();
                         modifyDetails.clear();
                         //更新面板
-                        databaseManagerPane.populate(datasourceManager);
+                        connectionShowPane.populate(datasourceManager);
                     } else {
                         //更新失败，继续停留页面
                         isFailed = true;
@@ -152,7 +157,7 @@ public class ConnectionListAction extends UpdateAction {
         int index = datasourceManager.isConnectionMapContainsRename();
         if (index != -1) {
             isFailed = true;
-            databaseManagerPane.setSelectedIndex(index);
+            connectionShowPane.setSelectedIndex(index);
         }
         databaseListDialog.setDoOKSucceed(!isFailed);
         //如果修改成功，则去远程端增量修改修改表

designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -1,11 +1,11 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fr.base.Env;
 import com.fr.base.FRContext;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.server.ConnectionListAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.file.DatasourceManager;
@@ -17,6 +17,7 @@ import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -31,7 +32,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      */
     private static final long serialVersionUID = 1L;
     private Class<? extends Connection> cls; // 所取的Connection都是cls及其子类
-    private java.util.List<String> nameList = new ArrayList<String>();
+    private List<String> nameList = new ArrayList<String>();
 
     public ConnectionComboBoxPanel(Class<? extends Connection> cls) {
         super();
@@ -53,11 +54,11 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     /*
      * 刷新ComboBox.items
      */
-    protected java.util.Iterator<String> items() {
+    protected Iterator<String> items() {
         nameList = new ArrayList<String>();
 
         DatasourceManagerProvider mgr = DatasourceManager.getProviderInstance();
-        java.util.Iterator<String> nameIt = mgr.getConnectionNameIterator();
+        Iterator<String> nameIt = mgr.getConnectionNameIterator();
         while (nameIt.hasNext()) {
             String conName = nameIt.next();
             Connection connection = mgr.getConnection(conName);
@@ -71,7 +72,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
     }
 
-
     public int getConnectionSize() {
         return nameList.size();
     }
@@ -86,25 +86,37 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     protected void editItems() {
         final ConnectionListPane connectionListPane = new ConnectionListPane();
         final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance();
+        final DatasourceManager backupManager = datasourceManager.getBackUpManager();
         connectionListPane.populate(datasourceManager);
-        BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
-                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), new DialogActionAdapter() {
+        final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
+                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
+        connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
             public void doOk() {
-                connectionListPane.update(datasourceManager);
+                if (!connectionListPane.isNamePermitted()) {
+                    connectionListDialog.setDoOKSucceed(false);
+                    return;
+                }
+                if (!ConnectionListAction.doWithDatasourceManager(datasourceManager, backupManager, connectionListPane,
+                        connectionListDialog)) {
+                    //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
+                    return;
+                }
                 // marks:保存数据
-                Env currentEnv = FRContext.getCurrentEnv();
-                try {
-                    currentEnv.writeResource(datasourceManager);
-                } catch (Exception ex) {
-                    FRContext.getLogger().error(ex.getMessage(), ex);
+                ConnectionListAction.writeFile(datasourceManager);
             }
+
+            public void doCancel() {
+                datasourceManager.synchronizedWithServer();
             }
         });
         connectionListDialog.setVisible(true);
         refreshItems();
     }
 
-    public void populate(com.fr.data.impl.Connection connection) {
+    /**
+     * @param connection 数据库链接
+     */
+    public void populate(Connection connection) {
         editButton.setEnabled(FRContext.getCurrentEnv().isRoot());
         if (connection instanceof NameDatabaseConnection) {
             this.setSelectedItem(((NameDatabaseConnection) connection).getName());

designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -23,7 +23,7 @@ import java.util.*;
 /**
  * Connection List Pane.
  */
-public class ConnectionListPane extends JListControlPane {
+public class ConnectionListPane extends JListControlPane implements ConnectionShowPane {
     public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection");
     private boolean isNamePermitted = true;
     private HashMap<String, String> renameMap = new HashMap<String, String>();

designer_base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java

@@ -14,7 +14,7 @@ import java.awt.*;
 import java.io.File;
 import java.util.HashMap;
 
-public class ConnectionManagerPane extends LoadingBasicPane {
+public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
     private UITextField connectionTextField;
     private ConnectionListPane connectionListPane;
 
@@ -69,6 +69,7 @@ public class ConnectionManagerPane extends LoadingBasicPane {
 
     /**
      * 名字是否允许
+     *
      * @return 允许返回true
      */
     public boolean isNamePermitted() {

designer_base/src/com/fr/design/data/datapane/connect/ConnectionShowPane.java

@@ -0,0 +1,15 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.file.DatasourceManagerProvider;
+
+/**
+ * Created by yaoh.wu on 2017/4/22.
+ * 数据链接显示面板
+ */
+public interface ConnectionShowPane {
+    void update(DatasourceManagerProvider datasourceManager);
+
+    void populate(DatasourceManagerProvider datasourceManager);
+
+    void setSelectedIndex(int index);
+}

designer_base/src/com/fr/design/formula/VariableResolverAdapter.java

@@ -4,12 +4,16 @@ import com.fr.base.ConfigManager;
 import com.fr.base.Parameter;
 import com.fr.design.DesignModelAdapter;
 import com.fr.base.ConfigManagerProvider;
+import com.fr.plugin.ExtraClassManager;
 import com.fr.script.ScriptConstants;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
+import com.fr.stable.fun.BuiltInParametersProvider;
 import com.fr.stable.script.CalculatorProvider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public abstract class VariableResolverAdapter implements VariableResolver {
 	private static final int TABLE_DATA_PARA = 0;
@@ -21,7 +25,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      * @return 内置参数
      */
 	public String[] resolveCurReportVariables() {
-		return new String[] { ScriptConstants.SUMMARY_TAG + "page_number",
+		String [] variables =  new String[] { ScriptConstants.SUMMARY_TAG + "page_number",
 				ScriptConstants.SUMMARY_TAG + "totalPage_number",
 				// 下面是权限相关的参数
 				ScriptConstants.DETAIL_TAG + Constants.P.PRIVILEGE_USERNAME, ScriptConstants.DETAIL_TAG + Constants.P.PRIVILEGE_AUTHORITY,
@@ -32,6 +36,13 @@ public abstract class VariableResolverAdapter implements VariableResolver {
 				CalculatorProvider.REPORT_NAME, CalculatorProvider.FORMLET_NAME, CalculatorProvider.SERVLET_URL, CalculatorProvider.SERVER_SCHEMA, CalculatorProvider.SERVER_NAME,
 				CalculatorProvider.SERVER_PORT, CalculatorProvider.SERVER_URL, CalculatorProvider.CONTEXT_PATH, CalculatorProvider.SESSION_ID
 		};
+		Set<BuiltInParametersProvider> set = ExtraClassManager.getInstance().getArray(BuiltInParametersProvider.XML_TAG);
+		for (BuiltInParametersProvider provider : set) {
+			return (String[]) ArrayUtils.addAll(variables, new String []{
+					ScriptConstants.DETAIL_TAG + provider.getParametersName()
+			});
+		}
+		return variables;
 	}
 	
 	private Parameter[] getCurrentModeParameters(int type) {

designer_base/src/com/fr/design/gui/style/BorderPane.java

@@ -51,34 +51,16 @@ public class BorderPane extends AbstractBasicStylePane {
 	}
 
 	protected void initComponents() {
-		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
-		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
-		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
-		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
-		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
-		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
-		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
-		this.currentLineColorPane = new NewColorSelectBox(100);
-
+		initButtonsWithIcon();
 		this.setLayout(new BorderLayout(0, 6));
-
-		double p = TableLayout.PREFERRED;
-		double f = TableLayout.FILL;
-
-		double[] columnSize1 = {p, f};
-		double[] rowSize1 = {p, p};
-
-
+		double p = TableLayout.PREFERRED, f = TableLayout.FILL;
+		double[] columnSize1 = {p, f}, rowSize1 = {p, p};
 		Component[][] components1 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("Style") + ":"), currentLineCombo},
-				new Component[]{new UILabel(Inter.getLocText("Color") + ":"), currentLineColorPane},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + ":"), currentLineCombo},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + ":"), currentLineColorPane},
 		};
-
 		JPanel northPane = TableLayoutHelper.createTableLayoutPane(components1, rowSize1, columnSize1);
-
-
-		double[] columnSize2 = {p, f};
-		double[] rowSize2 = {p, p};
+		double[] columnSize2 = {p, f}, rowSize2 = {p, p};
 		JPanel externalPane = new JPanel(new GridLayout(0, 4));
 		externalPane.add(topToggleButton);
 		externalPane.add(leftToggleButton);
@@ -87,23 +69,15 @@ public class BorderPane extends AbstractBasicStylePane {
 		JPanel insidePane = new JPanel(new GridLayout(0, 2));
 		insidePane.add(horizontalToggleButton);
 		insidePane.add(verticalToggleButton);
-
-
 		Component[][] components2 = new Component[][]{
 				new Component[]{outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png")), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
 				new Component[]{externalPane, insidePane,}
 		};
 		JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components2, rowSize2, columnSize2);
-
 		this.setLayout(new BorderLayout(0, 6));
 		this.add(northPane, BorderLayout.NORTH);
 		this.add(centerPane, BorderLayout.CENTER);
-
-
-		this.currentLineColorPane.setSelectObject(Color.BLACK);
-
 		outerToggleButton.addChangeListener(new ChangeListener() {
-
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				boolean value = outerToggleButton.isSelected();
@@ -113,9 +87,7 @@ public class BorderPane extends AbstractBasicStylePane {
 				rightToggleButton.setSelected(value);
 			}
 		});
-
 		innerToggleButton.addChangeListener(new ChangeListener() {
-
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				boolean value = innerToggleButton.isSelected();
@@ -123,12 +95,22 @@ public class BorderPane extends AbstractBasicStylePane {
 				verticalToggleButton.setSelected(value);
 			}
 		});
+	}
 
+	private void initButtonsWithIcon(){
+		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
+		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
+		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
+		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
+		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
+		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
+		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+		this.currentLineColorPane = new NewColorSelectBox(100);
 	}
 
 	@Override
 	public String title4PopupWindow() {
-		return Inter.getLocText("Border");
+		return Inter.getLocText("FR-Designer_Border");
 	}
 
 	public void populate(Style style) {

designer_base/src/com/fr/design/locale/designer.properties

@@ -596,3 +596,7 @@ FR-Designer_AxisReversed=AxisValue
 FR-Designer_Logarithmic=Logarithmic
 FR-Designer_Chart_Log_Base=Log Base
 FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis
+FR-Designer_Style=Style
+FR-Designer_Color=Color
+FR-Designer_Border=Border
+FR-Designer_Background-Pattern=Pattern

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -596,4 +596,8 @@ FR-Designer_AxisReversed=Axis in reverse order
 FR-Designer_Logarithmic=Log scale
 FR-Designer_Chart_Log_Base=Log Base
 FR-Designer_Chart_F_Radar_Axis=Value Axis
+FR-Designer_Style=Style
+FR-Designer_Color=Color
+FR-Designer_Border=Border
+FR-Designer_Background-Pattern=Pattern
 

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -561,3 +561,7 @@ FR-Designer_AxisReversed=\u8EF8\u9006\u9806
 FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
 FR-Designer_Chart_Log_Base=\u5E95\u6570
 FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8
+FR-Designer_Style=\u30B9\u30BF\u30A4\u30EB
+FR-Designer_Color=\u8272
+FR-Designer_Border=\u67A0
+FR-Designer_Background-Pattern=\u30D1\u30BF\u30FC\u30F3

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -556,3 +556,7 @@ FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
 FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
 FR-Designer_Chart_Log_Base=\uAE30\uC218
 FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95
+FR-Designer_Style=\uC591\uC2DD
+FR-Designer_Color=\uC0C9
+FR-Designer_Border=\uD14C\uB450\uB9AC
+FR-Designer_Background-Pattern=\uC774\uBBF8\uC9C0

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -596,3 +596,7 @@ FR-Designer_AxisReversed=\u8F74\u9006\u5E8F
 FR-Designer_Logarithmic=\u5BF9\u6570\u523B\u5EA6
 FR-Designer_Chart_Log_Base=\u5E95\u6570
 FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74
+FR-Designer_Style=\u6837\u5F0F
+FR-Designer_Color=\u989C\u8272
+FR-Designer_Border=\u8FB9\u6846
+FR-Designer_Background-Pattern=\u56FE\u6848

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -582,3 +582,7 @@ FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
 FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
 FR-Designer_Chart_Log_Base=\u5E95\u6578
 FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8
+FR-Designer_Style=\u6A23\u5F0F
+FR-Designer_Color=\u984F\u8272
+FR-Designer_Border=\u6846\u7DDA
+FR-Designer_Background-Pattern=\u5716\u6848

designer_base/src/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java

@@ -26,17 +26,16 @@ import java.awt.geom.Rectangle2D;
 public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 
 	private int patternIndex = 0; // pattern setIndex.
+	private final static int DEFAULT_DIM_HEIGHT = 190;
 	private ColorSelectBox foregroundColorPane;
 	private ColorSelectBox backgroundColorPane;
 	private PatternButton[] patternButtonArray;
 
 	public PatternBackgroundQuickPane() {
 		this.setLayout(new BorderLayout(0, 4));
-
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
 		this.add(contentPane, BorderLayout.NORTH);
 		contentPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
-
 		JPanel typePane2 = new JPanel();
 		contentPane.add(typePane2);
 		typePane2.setLayout(new GridLayout(0, 8, 1, 1));
@@ -48,15 +47,11 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 			patternButtonGroup.add(patternButtonArray[i]);
 			typePane2.add(patternButtonArray[i]);
 		}
-
 		JPanel colorPane = new JPanel(new GridLayout(0, 2));
 		foregroundColorPane = new ColorSelectBox(70);
 		backgroundColorPane = new ColorSelectBox(70);
-		foregroundColorPane.setSelectObject(Color.lightGray);
-		backgroundColorPane.setSelectObject(Color.black);
-
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("Foreground") + ":", foregroundColorPane));
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("Background") + ":", backgroundColorPane));
+		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Foreground") + ":", foregroundColorPane));
+		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Background") + ":", backgroundColorPane));
 		this.add(colorPane, BorderLayout.CENTER);
 		foregroundColorPane.addSelectChangeListener(colorChangeListener);
 		backgroundColorPane.addSelectChangeListener(colorChangeListener);
@@ -65,7 +60,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 	@Override
 	public Dimension getPreferredSize() {
 		Dimension dim = super.getPreferredSize();
-		dim.height = 190;
+		dim.height = DEFAULT_DIM_HEIGHT;
 		return dim;
 	}
 
@@ -206,6 +201,6 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 
 	@Override
 	public String title4PopupWindow() {
-		return Inter.getLocText("Background-Pattern");
+		return Inter.getLocText("FR-Designer_Background-Pattern");
 	}
 }

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

@@ -95,6 +95,8 @@ public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
             parameterList.toArray(parameters);
 
             formHyperlink.setParameters(parameters);
+        } else {
+            formHyperlink.setParameters(null);
         }
     }
 

designer_chart/src/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@@ -25,6 +25,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	
 	private ChartDataPane parent;
 
+	protected AbstractTableDataContentPane getDataContentPane() {
+		return dataContentPane;
+	}
+
 	public TableDataPane(ChartDataPane parent) {
 		this.parent = parent;
 		initDataPane();
@@ -103,15 +107,18 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @param collection 图表属性的集合
 	 */
 	public void refreshContentPane(ChartCollection collection) {
+		refreshContentPane(getContentPane(collection.getSelectedChart().getPlot()));
+	}
+
+	protected void refreshContentPane(AbstractTableDataContentPane contentPane) {
 		if(dataContentPane != null) {
 			remove(dataContentPane);
 		}
-		dataContentPane = getContentPane(collection.getSelectedChart().getPlot());
+		dataContentPane = contentPane;
 		if(dataContentPane != null) {
 			add(dataContentPane, BorderLayout.CENTER);
 		}
 	}
-
 	/**
 	 * 更新界面属性
 	 */
@@ -120,17 +127,21 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			return;
 		}
 		TableDataDefinition data = (TableDataDefinition)collection.getSelectedChart().getFilterDefinition();
+		populateDSName(data);
+		if(dataContentPane != null) {
+			dataContentPane.populateBean(collection);
+		}
+	}
+	protected void populateDSName(TableDataDefinition dataDefinition){
+
 		TableData tableData = null;
-		if(data != null) {
-			tableData = data.getTableData();
+		if(dataDefinition != null) {
+			tableData = dataDefinition.getTableData();
 		}
 		onSelectTableData();
 		checkBoxUse();
 		
 		tableDataPane.populateBean(tableData);
-		if(dataContentPane != null) {
-			dataContentPane.populateBean(collection);
-		}
 	}
 
 	/**
@@ -141,6 +152,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			dataContentPane.updateBean(collection);
 		}
 		TopDefinition dataDefinition = (TopDefinition)collection.getSelectedChart().getFilterDefinition();
+		updateDSName(dataDefinition);
+	}
+
+	protected void updateDSName(TopDefinition dataDefinition) {
 		if(dataDefinition instanceof  TableDataDefinition) {
 			TableDataWrapper tableDataWrapper = tableDataPane.getTableDataWrapper();
 			if (dataDefinition != null && tableDataWrapper != null){

designer_form/src/com/fr/design/designer/creator/XElementCase.java

@@ -10,9 +10,11 @@ import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.fun.impl.AbstractFormElementCaseEditorProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
+import com.fr.design.mainframe.widget.editors.BooleanEditor;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
+import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.FormProvider;
@@ -86,7 +88,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 
 					@Override
 					public void propertyChange() {
-						makeVisible(toData().isVisible());}
+						makeVisible(toData().isVisible());
+					}
 				}),
 				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
 						WLayoutBorderStyleEditor.class).setI18NName(
@@ -97,12 +100,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 					public void propertyChange() {
 						initStyle();
 					}
-							
 				}),
 				new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
 						.setI18NName(Inter.getLocText("FR-Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-				new CRPropertyDescriptor("ToolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
+				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java

@@ -14,7 +14,7 @@ public class TabMoveEndAction extends TabMoveAction {
     public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_End"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/rightright.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/end.png"));
     }
 
     //改变Tab的索引号

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java

@@ -14,7 +14,7 @@ public class TabMoveFirstAction extends TabMoveAction {
     public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_First"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/leftleft.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/first.png"));
     }
 
     @Override

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java

@@ -14,7 +14,7 @@ public class TabMoveNextAction extends TabMoveAction {
     public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_Next"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/right.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png"));
     }
 
     @Override

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java

@@ -14,7 +14,7 @@ public class TabMovePrevAction extends TabMoveAction {
     public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_Prev"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/left.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/prev.png"));
     }
 
     @Override

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -3,10 +3,6 @@
  */
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
@@ -17,12 +13,18 @@ import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.IOUtils;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.Inter;
 
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+
 /**
  * card布局主体框架
  * 

designer_form/src/com/fr/design/mainframe/ComponentTree.java

@@ -1,21 +1,14 @@
 package com.fr.design.mainframe;
 
 import java.awt.Component;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
 import javax.swing.DropMode;
-import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.designer.beans.AdapterBus;
-import com.fr.design.designer.beans.ComponentAdapter;
-import com.fr.design.designer.beans.events.DesignerEditListener;
-import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.treeview.ComponentTreeCellRenderer;
 import com.fr.design.designer.treeview.ComponentTreeModel;
@@ -92,9 +85,9 @@ public class ComponentTree extends JTree {
         }
     }
 
-    public void setAndScrollSelectionPath(TreePath treepath) {
-        setSelectionPath(treepath);
-        scrollPathToVisible(treepath);
+    public void setAndScrollSelectionPath(TreePath[] treepath) {
+        setSelectionPaths(treepath);
+        scrollPathToVisible(treepath[0]);
     }
 
 
@@ -112,7 +105,6 @@ public class ComponentTree extends JTree {
     public TreePath[] getSelectedTreePath() {
         XCreator[] creators = designer.getSelectionModel().getSelection().getSelectedCreators();
         TreePath[] paths = new TreePath[creators.length];
-
         for (int i = 0; i < paths.length; i++) {
             paths[i] = buildTreePath(creators[i]);
         }
@@ -141,7 +133,7 @@ public class ComponentTree extends JTree {
             paths[i] = buildTreePath(searchList.get(i));
         }
         if(paths.length > 0) {
-            setAndScrollSelectionPath(paths[0]);
+            setAndScrollSelectionPath(paths);
         } else {
             setSelectionPath();
         }
@@ -217,4 +209,5 @@ public class ComponentTree extends JTree {
         Object[] components = path.toArray();
         return new TreePath(components);
     }
+
 }

designer_form/src/com/fr/design/mainframe/FormDesigner.java

@@ -1018,7 +1018,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             }
 
             if (!BaseUtils.isAuthorityEditing()) {
-
                 selectionModel.setSelectedCreators(selected);
 
                 TreePath path = e.getNewLeadSelectionPath();

designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

@@ -259,8 +259,11 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
             xCreator = designer.getRootComponent();
         }
         XLayoutContainer container = XCreatorUtils.getHotspotContainer(xCreator);
-        //TODO container可能为空，引发空指针异常
-        return xCreator.acceptType(XWParameterLayout.class) || container.acceptType(XWParameterLayout.class);
+
+        boolean xCreatorAccept = xCreator.acceptType(XWParameterLayout.class);
+        boolean containerAccept = container!=null && container.acceptType(XWParameterLayout.class);
+
+        return xCreatorAccept || containerAccept;
     }
 
     public void setEditingFormDesigner(BaseFormDesigner editor) {

designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java

@@ -65,7 +65,6 @@ public class UITreeComboBox extends JComboBox{
      * @param o Object
      */
     public void setSelectedItem(Object o){
-        tree.setSelectionPath((TreePath)o);
         getModel().setSelectedItem(o);
     }
 
@@ -110,7 +109,7 @@ public class UITreeComboBox extends JComboBox{
                                                       int index, boolean isSelected, boolean cellHasFocus){
             if(tree != null && tree.getSelectedTreePath().length > 0){
                 TreePath path = tree.getSelectedTreePath()[0];
-                tree.setAndScrollSelectionPath(path);
+                tree.setAndScrollSelectionPath(tree.getSelectedTreePath());
                 Object node = path.getLastPathComponent();
                 value = node;
                 TreeCellRenderer r = tree.getCellRenderer();
@@ -132,7 +131,7 @@ public class UITreeComboBox extends JComboBox{
             if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                 TreePath[] paths = tree.getSelectedTreePath();
                 if (tree != null && paths.length > 0) {
-                    tree.setAndScrollSelectionPath(paths[0]);
+                    tree.setAndScrollSelectionPath(paths);
                     setSelectedItem(paths[0]);
                     MenuSelectionManager.defaultManager().clearSelectedPath();
                 }
@@ -141,7 +140,7 @@ public class UITreeComboBox extends JComboBox{
                 tree.refreshUI();
                 TreePath[] paths = tree.getSelectedTreePath();
                 if (tree != null && paths.length > 0) {
-                    tree.setAndScrollSelectionPath(paths[0]);
+                    tree.setAndScrollSelectionPath(paths);
                     setSelectedItem(paths[0]);
                     MenuSelectionManager.defaultManager().clearSelectedPath();
                 }