Merge pull request #866 in BA/design from ~PAUL/design:master to master

* commit 'ee78c63f92afe56ea6112748becef733305a637b': (72 commits)
  国际化
  无JIRA任务，国际化翻译更新
  无JIRA任务，国际化翻译更新
  REPORT-2626 移除国际化文件中的无效key
  REPORT-2626 移除国际化文件中的无效key
  国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
  Signed-off-by: unknown <李晓丽>
  国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
  REPORT-2483 & REPORT-2484 国际化key转移；外文版的国际化文件和中文版不一致
  无JIRA任务  新release合并遗漏
  无任务，line separator
  REPORT-2537
  无任务，冲突调整，release到dev
  无JIRA任务，国际化，把release、master中的key合并到dev中
  无JIRA任务，解决冲突
  ct
  ct
  ct
  ct
  1
  ...

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 datasourceManager  datasource管理对象
-     * @param databaseManagerPane
+     * @param backupManager      datasource管理对象备份
-     * @return
+     * @param connectionShowPane datasource面板
+     * @param databaseListDialog datasource管理对话框
+     * @return boolean 是否更新成功
      */
-    private boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager backupManager,
+    public static boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager
-                                            ConnectionManagerPane databaseManagerPane, BasicDialog databaseListDialog) {
+            backupManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
-        databaseManagerPane.update(datasourceManager);
+        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/beans/location/WidgetForbidWindow.java

@@ -1,45 +0,0 @@
-package com.fr.design.beans.location;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.icon.IconPathConstants;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-
-/**
- * Created by zhouping on 2016/7/24.
- */
-public class WidgetForbidWindow extends JWindow {
-
-    private static final int WIDTH = 150;
-    private static final int HEIGHT = 20;
-
-    private UIButton promptButton = new UIButton(Inter.getLocText("FR-Designer_Forbid_Widgets_Intersects"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH));
-
-    /**
-     * 构造函数
-     */
-    public WidgetForbidWindow() {
-        this.add(promptButton);
-        this.setSize(WIDTH, HEIGHT);
-    }
-
-    /**
-     * 在指定位置显示窗口, 默认将window的中心点放到指定位置上
-     *
-     * @param x x坐标
-     * @param y y坐标
-     */
-    public void showWindow(int x, int y) {
-        this.setLocation(x - WIDTH / 2, y - HEIGHT / 2);
-        this.setVisible(true);
-    }
-
-    /**
-     * 隐藏当前窗口
-     */
-    public void hideWindow() {
-        this.setVisible(false);
-    }
-}

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(
+        final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
-                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), new DialogActionAdapter() {
+                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
+        connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
             public void doOk() {
-                connectionListPane.update(datasourceManager);
+                if (!connectionListPane.isNamePermitted()) {
-                // marks:保存数据
+                    connectionListDialog.setDoOKSucceed(false);
-                Env currentEnv = FRContext.getCurrentEnv();
+                    return;
-                try {
-                    currentEnv.writeResource(datasourceManager);
-                } catch (Exception ex) {
-                    FRContext.getLogger().error(ex.getMessage(), ex);
                 }
+                if (!ConnectionListAction.doWithDatasourceManager(datasourceManager, backupManager, connectionListPane,
+                        connectionListDialog)) {
+                    //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
+                    return;
+                }
+                // marks:保存数据
+                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;
 
@@ -30,10 +30,10 @@ public class ConnectionManagerPane extends LoadingBasicPane {
         this.connectionTextField = new UITextField();
         connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
         this.connectionTextField.setEditable(false);
-        connectionListPane = new ConnectionListPane(){
+        connectionListPane = new ConnectionListPane() {
-            protected void rename(String oldName,String newName) {
+            protected void rename(String oldName, String newName) {
-                super.rename(oldName,newName);
+                super.rename(oldName, newName);
-                renameConnection(oldName,newName);
+                renameConnection(oldName, newName);
             }
         };
         container.add(connectionListPane, BorderLayout.CENTER);
@@ -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/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"));
+		initButtonsWithIcon();
-		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);
-
 		this.setLayout(new BorderLayout(0, 6));
-
+		double p = TableLayout.PREFERRED, f = TableLayout.FILL;
-		double p = TableLayout.PREFERRED;
+		double[] columnSize1 = {p, f}, rowSize1 = {p, p};
-		double f = TableLayout.FILL;
-
-		double[] columnSize1 = {p, f};
-		double[] rowSize1 = {p, p};
-
-
 		Component[][] components1 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("Style") + ":"), currentLineCombo},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + ":"), currentLineCombo},
-				new Component[]{new UILabel(Inter.getLocText("Color") + ":"), currentLineColorPane},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + ":"), currentLineColorPane},
 		};
-
 		JPanel northPane = TableLayoutHelper.createTableLayoutPane(components1, rowSize1, columnSize1);
-
+		double[] columnSize2 = {p, f}, rowSize2 = {p, p};
-
-		double[] columnSize2 = {p, f};
-		double[] 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/mainframe/JTemplate.java

@@ -372,7 +372,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     protected boolean accept(Object o){
-    	return true;
+        return true;
     }
 
     private void fireSuperTargetModified() {
@@ -490,13 +490,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     private boolean isCancelOperation(int operation){
-    	return operation == FILEChooserPane.CANCEL_OPTION ||
+        return operation == FILEChooserPane.CANCEL_OPTION ||
-    	       operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
+                operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
     }
 
     private boolean isOkOperation(int operation){
-    	return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
+        return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
-    		   operation == FILEChooserPane.OK_OPTION;
+                operation == FILEChooserPane.OK_OPTION;
     }
 
     private boolean saveAsTemplate(boolean isShowLoc) {
@@ -545,20 +545,20 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     protected void mkNewFile(FILE file){
         try {
-        	file.mkfile();
+            file.mkfile();
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
         }
     }
 
     /**
-	 * 将模板另存为可以分享出去的混淆后内置数据集模板
+     * 将模板另存为可以分享出去的混淆后内置数据集模板
-	 * 
+     *
-	 * @return 是否另存成功
+     * @return 是否另存成功
-	 * 
+     *
-	 */
+     */
     public boolean saveShareFile(){
-    	return true;
+        return true;
     }
     public Widget getSelectElementCase(){
         return new NoneWidget();
@@ -787,11 +787,11 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     private boolean isLowerThanCurrent(String versionString) {
-    	return getVersionCompare(versionString) < 0;
+        return getVersionCompare(versionString) < 0;
     }
 
     private boolean isLowerThanHBB(String versionString) {
-    	return getVersionCompareHBB(versionString) < 0;
+        return getVersionCompareHBB(versionString) < 0;
     }
 
     /**
@@ -801,7 +801,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     public boolean isNewDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isLowerThanHBB(xmlDesignerVersion)) {
-        	String info = Inter.getLocText("FR-Designer_open-new-form-tip");
+            String info = Inter.getLocText("FR-Designer_open-new-form-tip");
             String moreInfo = Inter.getLocText("FR-Designer_Server-version-tip-moreInfo");
             new InformationWarnPane(info, moreInfo, Inter.getLocText("FR-Designer_Tooltips")).show();
             return true;
@@ -861,7 +861,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * @return 超链连接界面
      */
     public HyperlinkGroupPane getHyperLinkPane() {
-    	return new HyperlinkGroupPane();
+        return new HyperlinkGroupPane();
     }
 
     /**
@@ -918,15 +918,15 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     /**
-	 * 创建内置sql提交的pane
+     * 创建内置sql提交的pane
-	 * 
+     *
-	 * @return 内置sql提交的pane
+     * @return 内置sql提交的pane
-	 * 
+     *
-	 *
+     *
-	 * @date 2014-10-14-下午7:39:27
+     * @date 2014-10-14-下午7:39:27
-	 */
+     */
     public DBManipulationPane createDBManipulationPane(){
-    	return new DBManipulationPane();
+        return new DBManipulationPane();
     }
 
     /**
@@ -938,7 +938,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * @date 2014-10-14-下午7:39:27
      */
     public DBManipulationPane createDBManipulationPaneInWidget(){
-    	return new DBManipulationInWidgetEventPane();
+        return new DBManipulationInWidgetEventPane();
     }
 
     /**
@@ -968,13 +968,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     /**
-	 * 创建分享模板的按钮, 目前只有jworkbook实现了
+     * 创建分享模板的按钮, 目前只有jworkbook实现了
-	 * 
+     *
-	 * @return 分享模板按钮
+     * @return 分享模板按钮
-	 * 
+     *
-	 */
+     */
     public UIButton[] createShareButton(){
-    	return new UIButton[0]; 
+        return new UIButton[0];
     }
 
     /**

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);
+		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Foreground") + ":", foregroundColorPane));
-		backgroundColorPane.setSelectObject(Color.black);
+		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Background") + ":", backgroundColorPane));
-
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("Foreground") + ":", foregroundColorPane));
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("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_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java

@@ -6,32 +6,56 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.env.RemoteEnv;
-import com.fr.general.ComparatorUtils;
+import com.fr.general.*;
-import com.fr.general.FRLogger;
-import com.fr.general.GeneralUtils;
-import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.stable.*;
-import org.json.JSONObject;
+import com.fr.stable.xml.*;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import com.fr.json.JSONObject;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.HashMap;
 
 /**
  * 做模板的过程和耗时收集，辅助类
  * Created by plough on 2017/2/21.
  */
-public class TemplateInfoCollector<T extends IOFile> implements Serializable {
+public class TemplateInfoCollector<T extends IOFile> implements Serializable, XMLReadable, XMLWriter {
-    private static final String FILE_NAME = "tplInfo.ser";
+    private static final String FILE_NAME = "tpl.info";
+    private static final String OBJECT_FILE_NAME = "tplInfo.ser";
     private static TemplateInfoCollector instance;
-    private HashMap<String, HashMap<String, Object>> templateInfoList;
+    private Map<String, HashMap<String, Object>> templateInfoList;
     private String designerOpenDate;  //设计器最近一次打开日期
     private static final int VALID_CELL_COUNT = 5;  // 有效报表模板的格子数
     private static final int VALID_WIDGET_COUNT = 5;  // 有效报表模板的控件数
     private static final int COMPLETE_DAY_COUNT = 15;  // 判断模板是否完成的天数
     private static final int ONE_THOUSAND = 1000;
     static final long serialVersionUID = 2007L;
+    private static final String XML_DESIGNER_OPEN_DATE = "DesignerOpenDate";
+    private static final String XML_TEMPLATE_INFO_LIST = "TemplateInfoList";
+    private static final String XML_TEMPLATE_INFO = "TemplateInfo";
+    private static final String XML_PROCESS_MAP = "processMap";
+    private static final String XML_CONSUMING_MAP = "consumingMap";
+    private static final String ATTR_DAY_COUNT = "day_count";
+    private static final String ATTR_TEMPLATE_ID = "templateID";
+    private static final String ATTR_PROCESS = "process";
+    private static final String ATTR_FLOAT_COUNT = "float_count";
+    private static final String ATTR_WIDGET_COUNT = "widget_count";
+    private static final String ATTR_CELL_COUNT = "cell_count";
+    private static final String ATTR_BLOCK_COUNT = "block_count";
+    private static final String ATTR_REPORT_TYPE = "report_type";
+    private static final String ATTR_ACTIVITYKEY = "activitykey";
+    private static final String ATTR_JAR_TIME = "jar_time";
+    private static final String ATTR_CREATE_TIME = "create_time";
+    private static final String ATTR_UUID = "uuid";
+    private static final String ATTR_TIME_CONSUME = "time_consume";
+    private static final String ATTR_VERSION = "version";
+    private static final String ATTR_USERNAME = "username";
+    private static final String JSON_CONSUMING_MAP = "jsonConsumingMap";
+    private static final String JSON_PROCESS_MAP = "jsonProcessMap";
+
 
     @SuppressWarnings("unchecked")
     private TemplateInfoCollector() {
@@ -61,27 +85,57 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FILE_NAME));
     }
 
+    private static File getObjectInfoFile() {
+        return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), OBJECT_FILE_NAME));
+    }
+
     public static TemplateInfoCollector getInstance() {
         if (instance == null) {
-            // 先尝试从文件读取
+            instance = new TemplateInfoCollector();
-            try{
+            readXMLFile(instance, getInfoFile());
-                ObjectInputStream is = new ObjectInputStream(new FileInputStream(getInfoFile()));
+            // 兼容过渡。如果没有新文件，则从老文件读取数据。以后都是读写新的 xml 文件
-                instance = (TemplateInfoCollector) is.readObject();
+            if (!getInfoFile().exists() && getObjectInfoFile().exists()) {
-            } catch (FileNotFoundException ex) {
+                try {
-                // 如果之前没有存储过，则创建新对象
+                    ObjectInputStream is = new ObjectInputStream(new FileInputStream(getObjectInfoFile()));
-                instance = new TemplateInfoCollector();
+                    instance = (TemplateInfoCollector) is.readObject();
-            } catch (InvalidClassException ex) {
+                } catch (Exception ex) {
-                // 如果 TemplateInfoCollecor 类结构有改动，则放弃之前收集的数据（下次保存时覆盖）
+                    // 什么也不做，instance 使用新值
-                // 这种情况主要在开发、测试过程中遇到，正式上线后不应该出现
+                }
-                instance = new TemplateInfoCollector();
-            }
-            catch (Exception ex) {
-                FRLogger.getLogger().error(ex.getMessage(), ex);
             }
         }
         return instance;
     }
 
+    private static void readXMLFile(XMLReadable xmlReadable, File xmlFile){
+        if (xmlFile == null || !xmlFile.exists()) {
+            return;
+        }
+        String charset = EncodeConstants.ENCODING_UTF_8;
+        try {
+            String fileContent = getFileContent(xmlFile);
+            InputStream xmlInputStream = new ByteArrayInputStream(fileContent.getBytes(charset));
+            InputStreamReader inputStreamReader = new InputStreamReader(xmlInputStream, charset);
+            XMLableReader xmlReader = XMLableReader.createXMLableReader(inputStreamReader);
+
+            if (xmlReader != null) {
+                xmlReader.readXMLObject(xmlReadable);
+            }
+            xmlInputStream.close();
+        } catch (FileNotFoundException e) {
+            FRContext.getLogger().error(e.getMessage());
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        } catch (XMLStreamException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+
+    }
+
+    private static String getFileContent(File xmlFile) throws FileNotFoundException, UnsupportedEncodingException{
+        InputStream is = new FileInputStream(xmlFile);
+        return IOUtils.inputStream2String(is);
+    }
+
     private boolean shouldCollectInfo() {
         if (FRContext.getCurrentEnv() instanceof RemoteEnv) {  // 远程设计不收集数据
             return false;
@@ -104,8 +158,8 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
      */
     @SuppressWarnings("unchecked")
     public String loadProcess(T t) {
-        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfoList.get(t.getTemplateID()).get("processMap");
+        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfoList.get(t.getTemplateID()).get(XML_PROCESS_MAP);
-        return (String)processMap.get("process");
+        return (String)processMap.get(ATTR_PROCESS);
     }
 
     /**
@@ -120,9 +174,8 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
      */
     private void saveInfo() {
         try {
-            ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream(getInfoFile()));
+            FileOutputStream out = new FileOutputStream(getInfoFile());
-            os.writeObject(instance);
+            XMLTools.writeOutputStreamXML(this, out);
-            os.close();
         } catch (Exception ex) {
             FRLogger.getLogger().error(ex.getMessage());
         }
@@ -135,8 +188,8 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         if (designerOpenFirstTime()) {
             for (String key : templateInfoList.keySet()) {
                 HashMap<String, Object> templateInfo = templateInfoList.get(key);
-                int dayCount = (int)templateInfo.get("day_count") + 1;
+                int dayCount = (int)templateInfo.get(ATTR_DAY_COUNT) + 1;
-                templateInfo.put("day_count", dayCount);
+                templateInfo.put(ATTR_DAY_COUNT, dayCount);
             }
             setDesignerOpenDate();
         }
@@ -160,21 +213,20 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         if (inList(t)) { // 已有记录
             templateInfo = templateInfoList.get(t.getTemplateID());
             // 更新 conusmingMap
-            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get("consumingMap");
+            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get(XML_CONSUMING_MAP);
-            timeConsume += (long)consumingMap.get("time_consume");  // 加上之前的累计编辑时间
+            timeConsume += (long)consumingMap.get(ATTR_TIME_CONSUME);  // 加上之前的累计编辑时间
-            consumingMap.put("time_consume", timeConsume);
+            consumingMap.put(ATTR_TIME_CONSUME, timeConsume);
         }
         else {  // 新增
             templateInfo = new HashMap<>();
-            templateInfo.put("consumingMap", getNewConsumingMap(templateID, openTime, timeConsume));
+            templateInfo.put(XML_CONSUMING_MAP, getNewConsumingMap(templateID, openTime, timeConsume));
         }
 
         // 直接覆盖 processMap
-        templateInfo.put("processMap", getProcessMap(templateID, jt));
+        templateInfo.put(XML_PROCESS_MAP, getProcessMap(templateID, jt));
 
         // 保存模板时，让 day_count 归零
-        templateInfo.put("day_count", 0);
+        templateInfo.put(ATTR_DAY_COUNT, 0);
-
 
         templateInfoList.put(templateID, templateInfo);
 
@@ -190,14 +242,14 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(Calendar.getInstance().getTime());
         String jarTime = GeneralUtils.readBuildNO();
         String version = ProductConstants.VERSION;
-        consumingMap.put("username", username);
+        consumingMap.put(ATTR_USERNAME, username);
-        consumingMap.put("uuid", uuid);
+        consumingMap.put(ATTR_UUID, uuid);
-        consumingMap.put("activitykey", activitykey);
+        consumingMap.put(ATTR_ACTIVITYKEY, activitykey);
-        consumingMap.put("templateID", templateID);
+        consumingMap.put(ATTR_TEMPLATE_ID, templateID);
-        consumingMap.put("create_time", createTime);
+        consumingMap.put(ATTR_CREATE_TIME, createTime);
-        consumingMap.put("time_consume", timeConsume);
+        consumingMap.put(ATTR_TIME_CONSUME, timeConsume);
-        consumingMap.put("jar_time", jarTime);
+        consumingMap.put(ATTR_JAR_TIME, jarTime);
-        consumingMap.put("version", version);
+        consumingMap.put(ATTR_VERSION, version);
 
         return consumingMap;
     }
@@ -205,15 +257,15 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
     private HashMap<String, Object> getProcessMap(String templateID, JTemplate jt) {
         HashMap<String, Object> processMap = new HashMap<>();
 
-        processMap.put("templateID", templateID);
+        processMap.put(ATTR_TEMPLATE_ID, templateID);
-        processMap.put("process", jt.getProcess());
+        processMap.put(ATTR_PROCESS, jt.getProcess());
 
         TemplateProcessInfo info = jt.getProcessInfo();
-        processMap.put("report_type", info.getReportType());
+        processMap.put(ATTR_REPORT_TYPE, info.getReportType());
-        processMap.put("cell_count", info.getCellCount());
+        processMap.put(ATTR_CELL_COUNT, info.getCellCount());
-        processMap.put("float_count", info.getFloatCount());
+        processMap.put(ATTR_FLOAT_COUNT, info.getFloatCount());
-        processMap.put("block_count", info.getBlockCount());
+        processMap.put(ATTR_BLOCK_COUNT, info.getBlockCount());
-        processMap.put("widget_count", info.getWidgetCount());
+        processMap.put(ATTR_WIDGET_COUNT, info.getWidgetCount());
 
         return processMap;
     }
@@ -227,11 +279,11 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         String processUrl = SiteCenter.getInstance().acquireUrlByKind("tempinfo.process") + "/single";
         ArrayList<HashMap<String, String>> completeTemplatesInfo = getCompleteTemplatesInfo();
         for (HashMap<String, String> templateInfo : completeTemplatesInfo) {
-            String jsonConsumingMap = templateInfo.get("jsonConsumingMap");
+            String jsonConsumingMap = templateInfo.get(JSON_CONSUMING_MAP);
-            String jsonProcessMap = templateInfo.get("jsonProcessMap");
+            String jsonProcessMap = templateInfo.get(JSON_PROCESS_MAP);
             if (sendSingleTemplateInfo(consumingUrl, jsonConsumingMap) && sendSingleTemplateInfo(processUrl, jsonProcessMap)) {
                 // 清空记录
-                removeFromTemplateInfoList(templateInfo.get("templateID"));
+                removeFromTemplateInfoList(templateInfo.get(ATTR_TEMPLATE_ID));
             }
         }
         saveInfo();
@@ -251,7 +303,12 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         }
 
         String res =  httpClient.getResponseText();
-        boolean success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        boolean success;
+        try {
+            success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        } catch (Exception ex) {
+            success = false;
+        }
         return success;
     }
 
@@ -264,21 +321,21 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         ArrayList<String> testTemplateKeys = new ArrayList<>();  // 保存测试模板的key
         for (String key : templateInfoList.keySet()) {
             HashMap<String, Object> templateInfo = templateInfoList.get(key);
-            if ((int)templateInfo.get("day_count") <= COMPLETE_DAY_COUNT) {  // 未完成模板
+            if ((int)templateInfo.get(ATTR_DAY_COUNT) <= COMPLETE_DAY_COUNT) {  // 未完成模板
                 continue;
             }
             if (isTestTemplate(templateInfo)) {
                 testTemplateKeys.add(key);
                 continue;
             }
-            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get("consumingMap");
+            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get(XML_CONSUMING_MAP);
-            HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get("processMap");
+            HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get(XML_PROCESS_MAP);
             String jsonConsumingMap = new JSONObject(consumingMap).toString();
             String jsonProcessMap = new JSONObject(processMap).toString();
             HashMap<String, String> jsonTemplateInfo = new HashMap<>();
-            jsonTemplateInfo.put("jsonConsumingMap", jsonConsumingMap);
+            jsonTemplateInfo.put(JSON_CONSUMING_MAP, jsonConsumingMap);
-            jsonTemplateInfo.put("jsonProcessMap", jsonProcessMap);
+            jsonTemplateInfo.put(JSON_PROCESS_MAP, jsonProcessMap);
-            jsonTemplateInfo.put("templateID", key);
+            jsonTemplateInfo.put(ATTR_TEMPLATE_ID, key);
             completeTemplatesInfo.add(jsonTemplateInfo);
         }
         // 删除测试模板
@@ -294,12 +351,12 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
 
     @SuppressWarnings("unchecked")
     private boolean isTestTemplate(HashMap<String, Object> templateInfo) {
-        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get("processMap");
+        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get(XML_PROCESS_MAP);
-        int reportType = (int)processMap.get("report_type");
+        int reportType = (int)processMap.get(ATTR_REPORT_TYPE);
-        int cellCount = (int)processMap.get("cell_count");
+        int cellCount = (int)processMap.get(ATTR_CELL_COUNT);
-        int floatCount = (int)processMap.get("float_count");
+        int floatCount = (int)processMap.get(ATTR_FLOAT_COUNT);
-        int blockCount = (int)processMap.get("block_count");
+        int blockCount = (int)processMap.get(ATTR_BLOCK_COUNT);
-        int widgetCount = (int)processMap.get("widget_count");
+        int widgetCount = (int)processMap.get(ATTR_WIDGET_COUNT);
         boolean isTestTemplate = false;
         if (reportType == 0) {  // 普通报表
             isTestTemplate = cellCount <= VALID_CELL_COUNT && floatCount <= 1 && widgetCount <= VALID_WIDGET_COUNT;
@@ -311,6 +368,157 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         return isTestTemplate;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void readXML(XMLableReader reader) {
+        if (reader.isChildNode()) {
+            try {
+                String name = reader.getTagName();
+                if (XML_DESIGNER_OPEN_DATE.equals(name)) {
+                    this.designerOpenDate = reader.getElementValue();
+                } else if(XML_TEMPLATE_INFO_LIST.equals(name)){
+                    readTemplateInfoList(reader);
+                }
+            } catch (Exception ex) {
+                // 什么也不做，使用默认值
+            }
+        }
+    }
+
+    private void readTemplateInfoList(XMLableReader reader) {
+        reader.readXMLObject(new XMLReadable() {
+            public void readXML(XMLableReader reader) {
+                if (XML_TEMPLATE_INFO.equals(reader.getTagName())) {
+                    TemplateInfo templateInfo = new TemplateInfo();
+                    reader.readXMLObject(templateInfo);
+                    templateInfoList.put(templateInfo.getTemplateID(), templateInfo.getTemplateInfo());
+                }
+            }
+        });
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG("TplInfo");
+
+        writer.startTAG(XML_DESIGNER_OPEN_DATE);
+        writer.textNode(designerOpenDate);
+        writer.end();
+
+        writeTemplateInfoList(writer);
+
+        writer.end();
+    }
+
+    private void writeTemplateInfoList(XMLPrintWriter writer){
+        //启停
+        writer.startTAG(XML_TEMPLATE_INFO_LIST);
+        for (String templateID : templateInfoList.keySet()) {
+            new TemplateInfo(templateInfoList.get(templateID)).writeXML(writer);
+        }
+        writer.end();
+    }
+
+    private class TemplateInfo implements XMLReadable, XMLWriter {
+
+        private int dayCount;
+        private String templateID;
+        private HashMap<String, Object> processMap = new HashMap<>();
+        private HashMap<String, Object> consumingMap = new HashMap<>();
+
+        @SuppressWarnings("unchecked")
+        public TemplateInfo(HashMap<String, Object> templateInfo) {
+            this.dayCount = (int)templateInfo.get(ATTR_DAY_COUNT);
+            this.processMap = (HashMap<String, Object>) templateInfo.get(XML_PROCESS_MAP);
+            this.consumingMap = (HashMap<String, Object>) templateInfo.get(XML_CONSUMING_MAP);
+            this.templateID = (String) processMap.get(ATTR_TEMPLATE_ID);
+        }
+
+        public TemplateInfo() {}
+
+        public String getTemplateID() {
+            return templateID;
+        }
+
+        public HashMap<String, Object> getTemplateInfo() {
+            HashMap<String, Object> templateInfo = new HashMap<>();
+            templateInfo.put(XML_PROCESS_MAP, processMap);
+            templateInfo.put(XML_CONSUMING_MAP, consumingMap);
+            templateInfo.put(ATTR_DAY_COUNT, dayCount);
+            return templateInfo;
+        }
+
+        public void writeXML(XMLPrintWriter writer) {
+            writer.startTAG(XML_TEMPLATE_INFO);
+            if (StringUtils.isNotEmpty(templateID)) {
+                writer.attr(ATTR_TEMPLATE_ID, this.templateID);
+            }
+            if (dayCount >= 0) {
+                writer.attr(ATTR_DAY_COUNT, this.dayCount);
+            }
+            writeProcessMap(writer);
+            writeConsumingMap(writer);
+
+            writer.end();
+        }
+
+        private void writeProcessMap(XMLPrintWriter writer) {
+            writer.startTAG(XML_PROCESS_MAP);
+            writer.attr(ATTR_PROCESS, (String)processMap.get(ATTR_PROCESS));
+            writer.attr(ATTR_FLOAT_COUNT, (int)processMap.get(ATTR_FLOAT_COUNT));
+            writer.attr(ATTR_WIDGET_COUNT, (int)processMap.get(ATTR_WIDGET_COUNT));
+            writer.attr(ATTR_CELL_COUNT, (int)processMap.get(ATTR_CELL_COUNT));
+            writer.attr(ATTR_BLOCK_COUNT, (int)processMap.get(ATTR_BLOCK_COUNT));
+            writer.attr(ATTR_REPORT_TYPE, (int)processMap.get(ATTR_REPORT_TYPE));
+            writer.end();
+        }
+
+        private void writeConsumingMap(XMLPrintWriter writer) {
+            writer.startTAG(XML_CONSUMING_MAP);
+            writer.attr(ATTR_ACTIVITYKEY, (String)consumingMap.get(ATTR_ACTIVITYKEY));
+            writer.attr(ATTR_JAR_TIME, (String)consumingMap.get(ATTR_JAR_TIME));
+            writer.attr(ATTR_CREATE_TIME, (String)consumingMap.get(ATTR_CREATE_TIME));
+            writer.attr(ATTR_UUID, (String)consumingMap.get(ATTR_UUID));
+            writer.attr(ATTR_TIME_CONSUME, (long)consumingMap.get(ATTR_TIME_CONSUME));
+            writer.attr(ATTR_VERSION, (String)consumingMap.get(ATTR_VERSION));
+            writer.attr(ATTR_USERNAME, (String)consumingMap.get(ATTR_USERNAME));
+            writer.end();
+        }
+
+        public void readXML(XMLableReader reader) {
+            if (!reader.isChildNode()) {
+                dayCount = reader.getAttrAsInt(ATTR_DAY_COUNT, 0);
+                templateID = reader.getAttrAsString(ATTR_TEMPLATE_ID, StringUtils.EMPTY);
+            } else {
+                try {
+                    String name = reader.getTagName();
+                    if (XML_PROCESS_MAP.equals(name)) {
+                        processMap.put(ATTR_PROCESS, reader.getAttrAsString(ATTR_PROCESS, StringUtils.EMPTY));
+                        processMap.put(ATTR_FLOAT_COUNT, reader.getAttrAsInt(ATTR_FLOAT_COUNT, 0));
+                        processMap.put(ATTR_WIDGET_COUNT, reader.getAttrAsInt(ATTR_WIDGET_COUNT, 0));
+                        processMap.put(ATTR_CELL_COUNT, reader.getAttrAsInt(ATTR_CELL_COUNT, 0));
+                        processMap.put(ATTR_BLOCK_COUNT, reader.getAttrAsInt(ATTR_BLOCK_COUNT, 0));
+                        processMap.put(ATTR_REPORT_TYPE, reader.getAttrAsInt(ATTR_REPORT_TYPE, 0));
+                        processMap.put(ATTR_TEMPLATE_ID, templateID);
+                    } else if(XML_CONSUMING_MAP.equals(name)){
+                        consumingMap.put(ATTR_ACTIVITYKEY, reader.getAttrAsString(ATTR_ACTIVITYKEY, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_JAR_TIME, reader.getAttrAsString(ATTR_JAR_TIME, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_CREATE_TIME, reader.getAttrAsString(ATTR_CREATE_TIME, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_TEMPLATE_ID, templateID);
+                        consumingMap.put(ATTR_UUID, reader.getAttrAsString(ATTR_UUID, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_TIME_CONSUME, reader.getAttrAsLong(ATTR_TIME_CONSUME, 0));
+                        consumingMap.put(ATTR_VERSION, reader.getAttrAsString(ATTR_VERSION, "8.0"));
+                        consumingMap.put(ATTR_USERNAME, reader.getAttrAsString(ATTR_USERNAME, StringUtils.EMPTY));
+                    }
+                } catch (Exception ex) {
+                    // 什么也不做，使用默认值
+                }
+            }
+        }
+
+    }
+
+
     public static void main(String[] args) {
         TemplateInfoCollector tic = TemplateInfoCollector.getInstance();
         tic.sendTemplateInfo();

designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java

@@ -84,6 +84,9 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
      * @param color 颜色
      */
     public void addToColorQueue(Color color) {
+        if(color == null){
+            return;
+        }
         // 过滤重复的最近使用颜色
         // 因为有个后进先出的问题，最近使用的颜色需要放到最前面所以没用set
         if (colors.contains(color)) {

designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java

@@ -1,112 +1,104 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
+import com.fr.design.dialog.BasicPane;
-import java.awt.Color;
+import com.fr.design.layout.FRGUIPaneFactory;
-import java.awt.Dimension;
+import com.fr.general.Inter;
 
-import javax.swing.JColorChooser;
+import javax.swing.*;
-import javax.swing.JPanel;
 import javax.swing.colorchooser.AbstractColorChooserPanel;
 import javax.swing.colorchooser.ColorSelectionModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-
+import java.awt.*;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.Inter;
 
 /**
  * 颜色选择器更多颜色面板
- * @author focus
  *
+ * @author focus
  */
-public class ColorSelectDetailPane extends BasicPane{
+public class ColorSelectDetailPane extends BasicPane {
-	private static final int  SELECT_PANEL_HEIGHT = 245;
+    private static final int SELECT_PANEL_HEIGHT = 245;
-	// Selected color
+    // Selected color
-	private Color color;
+    private Color color;
-	
+
-	// 颜色选择器面板
+    // 颜色选择器面板
-	JColorChooser selectedPanel;
+    private JColorChooser selectedPanel;
-	
+
-	// 最近使用颜色面板
+    // 最近使用颜色面板
-	JPanel recentUsePanel;
+    private JPanel recentUsePanel;
-	
+
-	// 预览
+    // 预览
-	JPanel previewPanel;
+    private JPanel previewPanel;
-	
+
-	public JColorChooser getSelectedPanel() {
+    public JColorChooser getSelectedPanel() {
-		return selectedPanel;
+        return selectedPanel;
-	}
+    }
-
+
-	public void setSelectedPanel(JColorChooser selectedPanel) {
+    public void setSelectedPanel(JColorChooser selectedPanel) {
-		this.selectedPanel = selectedPanel;
+        this.selectedPanel = selectedPanel;
-	}
+    }
-	
+
-	public Color getColor() {
+    public Color getColor() {
-		return color;
+        return color;
-	}
+    }
-
+
-	public void setColor(Color color) {
+    public void setColor(Color color) {
-		this.color = color;
+        this.color = color;
-	}
+    }
-
+
-	public ColorSelectDetailPane() {
+    public ColorSelectDetailPane(Color color) {
-		super();
+        if (color == null) {
-	}
+            color = Color.white;
-	
+        }
-	public ColorSelectDetailPane(Color color){
+        this.color = color;
-		if(color == null){
+        initComponents();
-			color = Color.white;
+    }
-		}
+
-		this.color = color;
+    @Override
-		initComponents();
+    protected String title4PopupWindow() {
-	}
+        return null;
-
+    }
-	@Override
+
-	protected String title4PopupWindow() {
+    protected void initComponents() {
-		return null;
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-	}
+
-	
+        // 颜色选择器面板
-	protected void initComponents() {
+        selectedPanel = new JColorChooser(this.color);
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(), SELECT_PANEL_HEIGHT));
-		
+        AbstractColorChooserPanel[] choosers = selectedPanel.getChooserPanels();
-		// 颜色选择器面板
+        for (int i = 0; i < choosers.length; i++) {
-		selectedPanel = new JColorChooser(this.color);
+            selectedPanel.removeChooserPanel(choosers[i]);
-		selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(),SELECT_PANEL_HEIGHT));
+        }
-		AbstractColorChooserPanel[] choosers = selectedPanel.getChooserPanels();
+        selectedPanel.setPreviewPanel(new JPanel());
-		for(int i=0;i<choosers.length;i++){
+
-			selectedPanel.removeChooserPanel(choosers[i]);
+        AbstractColorChooserPanel swatchChooserPanel = new SwatchChooserPanel();
-		}
+        AbstractColorChooserPanel customChooserPanel = new CustomChooserPanel();
-		selectedPanel.setPreviewPanel(new JPanel());
+        selectedPanel.addChooserPanel(swatchChooserPanel);
-		
+        selectedPanel.addChooserPanel(customChooserPanel);
-		AbstractColorChooserPanel swatchChooserPanel = new SwatchChooserPanel();
+        this.add(selectedPanel, BorderLayout.NORTH);
-		AbstractColorChooserPanel customChooserPanel = new CustomChooserPanel();
+
-		selectedPanel.addChooserPanel(swatchChooserPanel);
+        // 最近使用面板
-		selectedPanel.addChooserPanel(customChooserPanel);
+        recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Used"));
-		this.add(selectedPanel, BorderLayout.NORTH);
+        RecentUseColorPane recent = new RecentUseColorPane(selectedPanel);
-		
+        recentUsePanel.add(recent);
-		// 最近使用面板
+
-		recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Used"));
+        this.add(recentUsePanel, BorderLayout.CENTER);
-		RecentUseColorPane recent = new RecentUseColorPane(selectedPanel);
+
-		recentUsePanel.add(recent);
+        selectedPanel.setPreviewPanel(new JPanel());
-		
+
-		this.add(recentUsePanel,BorderLayout.CENTER);
+        // 预览
-		
+        previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(Inter.getLocText("FR-Designer_Preview"));
-		selectedPanel.setPreviewPanel(new JPanel());
+        final ColorChooserPreview colorChooserPreview = new ColorChooserPreview();
-
+        ColorSelectionModel model = selectedPanel.getSelectionModel();
-		// 预览
+        model.addChangeListener(new ChangeListener() {
-		previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(Inter.getLocText("FR-Designer_Preview"));
+            @Override
-		final ColorChooserPreview colorChooserPreview = new ColorChooserPreview();
+            public void stateChanged(ChangeEvent e) {
-		ColorSelectionModel model = selectedPanel.getSelectionModel();
+                ColorSelectionModel model = (ColorSelectionModel) e.getSource();
-		model.addChangeListener(new ChangeListener() {
+                colorChooserPreview.setMyColor(model.getSelectedColor());
-			@Override
+                colorChooserPreview.paint(colorChooserPreview.getGraphics());
-			public void stateChanged(ChangeEvent e) {
+            }
-				ColorSelectionModel model = (ColorSelectionModel) e.getSource();
+        });
-				colorChooserPreview.setMyColor(model.getSelectedColor());
+        previewPanel.add(colorChooserPreview);
-				colorChooserPreview.paint(colorChooserPreview.getGraphics());
+        this.add(previewPanel, BorderLayout.SOUTH);
-			}
+    }
-		});
-		previewPanel.add(colorChooserPreview);
-		this.add(previewPanel, BorderLayout.SOUTH);
-	}
 }

designer_base/src/com/fr/design/style/color/ColorSelectPane.java

@@ -3,26 +3,23 @@
  */
 package com.fr.design.style.color;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.general.Inter;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 
 /**
  * The pane used to select color
@@ -30,18 +27,19 @@ import com.fr.design.utils.gui.GUICoreUtils;
 public class ColorSelectPane extends TransparentPane implements ColorSelectable {
     private static final long serialVersionUID = -8634152305687249392L;
 
-	private Color color = null; //color
+    private Color color = null; //color
     //color setting action.
     private ArrayList<ChangeListener> colorChangeListenerList = new ArrayList<ChangeListener>();
 
-    ColorSelectDetailPane pane;
+
+    /* default */ ColorSelectDetailPane pane;
 
     /**
      * Constructor.
      */
     public ColorSelectPane() {
-    	super(true);
+        super(true);
-    	initialCompents(true);
+        initialCompents(true);
     }
 
     public ColorSelectPane(boolean isSupportTransparent) {
@@ -51,73 +49,73 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 
     private void initialCompents(boolean isSupportTransparent) {
 
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
+        this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
-		if (isSupportTransparent) {
+        if (isSupportTransparent) {
-			UIButton transpanrentButton = new UIButton(Inter.getLocText("FR-Designer_ChartF-Transparency"));
+            UIButton transpanrentButton = new UIButton(Inter.getLocText("FR-Designer_ChartF-Transparency"));
-			this.add(transpanrentButton, BorderLayout.NORTH);
+            this.add(transpanrentButton, BorderLayout.NORTH);
-			transpanrentButton.addActionListener(new ActionListener() {
+            transpanrentButton.addActionListener(new ActionListener() {
-
+
-				@Override
+                @Override
-				public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent e) {
-					doTransparent();
+                    doTransparent();
-				}
+                }
-			});
+            });
-		}
+        }
 
-		// center
+        // center
-		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
+        JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-		this.add(centerPane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
 
-		centerPane.add(getRow1Pane());
+        centerPane.add(getRow1Pane());
 
-		JPanel menuColorPane1 = getMenuColorPane();
+        JPanel menuColorPane1 = getMenuColorPane();
-		centerPane.add(menuColorPane1);
+        centerPane.add(menuColorPane1);
         Color[] colorArray = this.getColorArray();
-		for (int i = 0; i < colorArray.length; i++) {
+        for (int i = 0; i < colorArray.length; i++) {
-			Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i];
+            Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i];
-			menuColorPane1.add(new ColorCell(color, this));
+            menuColorPane1.add(new ColorCell(color, this));
-		}
+        }
-
+
-		centerPane.add(Box.createVerticalStrut(1));
+        centerPane.add(Box.createVerticalStrut(1));
-
+
-		UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color"));
+        UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color"));
-		
+
-		customButton.addMouseListener(new MouseAdapter() {
+        customButton.addMouseListener(new MouseAdapter() {
-			@Override
+            @Override
-			public void mousePressed(MouseEvent e) {
+            public void mousePressed(MouseEvent e) {
-				customButtonPressed();
+                customButtonPressed();
-			}
+            }
-		});
+        });
-		customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
-		JPanel centerPane1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel centerPane1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		centerPane1.setBorder(BorderFactory.createEmptyBorder(2, 8, 8, 8));
+        centerPane1.setBorder(BorderFactory.createEmptyBorder(2, 8, 8, 8));
-		centerPane1.add(customButton, BorderLayout.NORTH);
+        centerPane1.add(customButton, BorderLayout.NORTH);
-		centerPane.add(centerPane1);
+        centerPane.add(centerPane1);
-	}
+    }
-
+
-	protected JPanel getMenuColorPane() {
+    protected JPanel getMenuColorPane() {
-		JPanel menuColorPane = new JPanel();
+        JPanel menuColorPane = new JPanel();
-		menuColorPane.setLayout(new GridLayout(5, 8, 1, 1));
+        menuColorPane.setLayout(new GridLayout(5, 8, 1, 1));
-		menuColorPane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
+        menuColorPane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
-
+
-		return menuColorPane;
+        return menuColorPane;
-	}
+    }
-
+
-	// 第一行，1个取色按钮 + 7个最近使用的颜色
+    // 第一行，1个取色按钮 + 1个留空的单元格 + 6个最近使用的颜色
-	protected JPanel getRow1Pane() {
+    protected JPanel getRow1Pane() {
-		JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
+        JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
-		row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
+        row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
-		row1Pane.setPreferredSize(new Dimension(135, 24));  // 宽度为 16 * 8 + 7
+        row1Pane.setPreferredSize(new Dimension(135, 24));  // 宽度为 16 * 8 + 7
-
+
-		// 最近使用
+        // 最近使用
-		UsedColorPane usedColorPane = new UsedColorPane(1, 8, 1, ColorSelectConfigManager.getInstance().getColors(), this, true, true);
+        UsedColorPane usedColorPane = new UsedColorPane(1, 8, 1, this, true, true);
-		usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
+        usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
-		row1Pane.add(usedColorPane.getPane());
+        row1Pane.add(usedColorPane.getPane());
-		return row1Pane;
+        return row1Pane;
-	}
+    }
-
+
-    protected Color[] getColorArray(){
+    protected Color[] getColorArray() {
         return ColorFactory.MenuColors;
     }
 
@@ -125,7 +123,8 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
     /**
      * Add change listener.
      * 增加监听
-     * @param 监听
+     *
+     * @param changeListener
      */
     public void addChangeListener(ChangeListener changeListener) {
         this.colorChangeListenerList.add(changeListener);
@@ -133,7 +132,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 
     @Override
     protected String title4PopupWindow() {
-    	return "Color";
+        return "Color";
     }
 
     /**
@@ -166,38 +165,36 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 
     /**
      * 选中颜色
-     * @param 颜色单元格
+     */
+    @Override
+    public void colorSetted(ColorCell colorCell) {
+        colorCell.repaint();
+    }
+
+    /**
+     * 初始化中央面板
      *
+     * @param centerPane 中央面板
      */
-	@Override
+    @Override
-	public void colorSetted(ColorCell colorCell) {
+    public void initCenterPaneChildren(JPanel centerPane) {
-		colorCell.repaint();
+        GUICoreUtils.initCenterPaneChildren(centerPane, this);
-	}
+    }
-
+
-	/**
+    /**
-	 * 初始化中央面板
+     * 透明
-	 * @param centerPane 中央面板
+     */
-	 * 
+    @Override
-	 */
+    public void doTransparent() {
-	@Override
+        this.setColor(null);
-	public void initCenterPaneChildren(JPanel centerPane) {
+    }
-		GUICoreUtils.initCenterPaneChildren(centerPane, this);
+
-	}
+    /**
-
+     * 更多颜色
-	/**
+     */
-	 * 透明
+    @Override
-	 */
+    public void customButtonPressed() {
-	@Override
+        pane = new ColorSelectDetailPane(Color.WHITE);
-	public void doTransparent() {
+        ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
-		this.setColor(null);
+    }
-	}
-
-	/**
-	 * 更多颜色
-	 */
-	@Override
-	public void customButtonPressed() {
-		pane = new ColorSelectDetailPane(Color.WHITE);
-		ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
-	}
 }

designer_base/src/com/fr/design/style/color/NewColorSelectPane.java

@@ -1,215 +1,205 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import com.fr.design.constants.UIConstants;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.BasicPane;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+
 
 /**
- * 
  * @author zhou
  * @since 2012-5-29上午10:39:35
  */
 public class NewColorSelectPane extends BasicPane implements ColorSelectable {
-	private static final long serialVersionUID = -8634152305687249392L;
+    private static final long serialVersionUID = -8634152305687249392L;
-	
+
-	private Color color = null; // color
+    private Color color = null; // color
-	// color setting action.
+    // color setting action.
-	private ArrayList<ChangeListener> colorChangeListenerList = new ArrayList<ChangeListener>();
+    private ArrayList<ChangeListener> colorChangeListenerList = new ArrayList<ChangeListener>();
-	
+
-	// 颜色选择器
+    // 颜色选择器
-	private ColorSelectDetailPane pane;
+    private ColorSelectDetailPane pane;
-	// 是否支持透明
+    // 是否支持透明
-	private boolean isSupportTransparent;
+    private boolean isSupportTransparent;
-	
+
-	private final static int TRANSPANENT_WINDOW_HEIGHT = 165;
+    private final static int TRANSPANENT_WINDOW_HEIGHT = 165;
-	private final static int WINDWO_HEIGHT = 150;
+    private final static int WINDWO_HEIGHT = 150;
-	
+
-	// 最近使用颜色
+    // 最近使用颜色
-	UsedColorPane usedColorPane;
+    private UsedColorPane usedColorPane;
-
+
-	/**
+    /**
-	 * Constructor.
+     * Constructor.
-	 */
+     */
-	public NewColorSelectPane() {
+    public NewColorSelectPane() {
-		this(false);
+        this(false);
-	}
+    }
-
+
-	/**
+    /**
-	 * Constructor.
+     * Constructor.
-	 */
+     */
-	public NewColorSelectPane(boolean isSupportTransparent) {
+    public NewColorSelectPane(boolean isSupportTransparent) {
-		this.isSupportTransparent = isSupportTransparent;
+        this.isSupportTransparent = isSupportTransparent;
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
+        this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
-		if (isSupportTransparent) {
+        if (isSupportTransparent) {
-			UIButton transpanrentButton = new UIButton(Inter.getLocText("FR-Designer_ChartF-Transparency"));
+            UIButton transpanrentButton = new UIButton(Inter.getLocText("FR-Designer_ChartF-Transparency"));
-			this.add(transpanrentButton, BorderLayout.NORTH);
+            this.add(transpanrentButton, BorderLayout.NORTH);
-			transpanrentButton.addActionListener(new ActionListener() {
+            transpanrentButton.addActionListener(new ActionListener() {
-
+
-				@Override
+                @Override
-				public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent e) {
-					doTransparent();
+                    doTransparent();
-				}
+                }
-			});
+            });
-		}
+        }
-
+
-		// center
+        // center
-		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
+        JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-		this.add(centerPane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
-
+
-		// 第一行
+        // 第一行
-		JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
+        JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
-		row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
+        row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
-		row1Pane.setPreferredSize(new Dimension(135, 16));  // 宽度为 16 * 8 + 7
+        row1Pane.setPreferredSize(new Dimension(135, 16));  // 宽度为 16 * 8 + 7
-		centerPane.add(row1Pane);
+        centerPane.add(row1Pane);
-		// 最近使用
+        // 最近使用
-		usedColorPane = new UsedColorPane(1, 8, 1, ColorSelectConfigManager.getInstance().getColors(), this, true, false);
+        usedColorPane = new UsedColorPane(1, 8, 1, this, true, false);
-		usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
+        usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
-		row1Pane.add(usedColorPane.getPane());
+        row1Pane.add(usedColorPane.getPane());
-		
+
-		JPanel menuColorPane1 = new JPanel();
+        JPanel menuColorPane1 = new JPanel();
-		centerPane.add(menuColorPane1);
+        centerPane.add(menuColorPane1);
-
+
-		menuColorPane1.setLayout(new GridLayout(5, 8, 1, 1));
+        menuColorPane1.setLayout(new GridLayout(5, 8, 1, 1));
-		menuColorPane1.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
+        menuColorPane1.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
-		for (int i = 0; i < ColorFactory.MenuColors.length; i++) {
+        for (int i = 0; i < ColorFactory.MenuColors.length; i++) {
-			menuColorPane1.add(new ColorCell(ColorFactory.MenuColors[i], this));
+            menuColorPane1.add(new ColorCell(ColorFactory.MenuColors[i], this));
-		}
+        }
-
+
-		centerPane.add(Box.createVerticalStrut(1));
+        centerPane.add(Box.createVerticalStrut(1));
-
+
-		// mod by anchore 16/11/16
+        // mod by anchore 16/11/16
-		UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color"));
+        UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color"));
-		//UIButton customButton = new UIButton(Inter.getLocText(new String[]{"More", "Color"}) + "...");
+
-		
+        customButton.addMouseListener(new MouseAdapter() {
-		customButton.addMouseListener(new MouseAdapter() {
+            @Override
-			@Override
+            public void mousePressed(MouseEvent e) {
-			public void mousePressed(MouseEvent e) {
+                customButtonPressed();
-				customButtonPressed();
+            }
-			}
+        });
-		});
+        customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
-		customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        JPanel centerPane1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		JPanel centerPane1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        centerPane1.setBorder(BorderFactory.createEmptyBorder(2, 8, 0, 8));
-		centerPane1.setBorder(BorderFactory.createEmptyBorder(2, 8, 0, 8));
+        centerPane1.add(customButton, BorderLayout.NORTH);
-		centerPane1.add(customButton, BorderLayout.NORTH);
+        centerPane.add(centerPane1);
-		centerPane.add(centerPane1);
+    }
-	}
+
-	
+
-	
+    /**
-
+     * 添加监听
-	/**
+     *
-	 * 添加监听
+     * @param 监听列表 Add change listener.
-	 * @param 监听列表
+     */
-	 * Add change listener.
+    public void addChangeListener(ChangeListener changeListener) {
-	 */
+        this.colorChangeListenerList.add(changeListener);
-	public void addChangeListener(ChangeListener changeListener) {
+    }
-		this.colorChangeListenerList.add(changeListener);
+
-	}
+    @Override
-
+    protected String title4PopupWindow() {
-	@Override
+        return "Color";
-	protected String title4PopupWindow() {
+    }
-		return "Color";
+
-	}
+    /**
-
+     * 获取颜色
-	/**
+     *
-	 * 获取颜色
+     * @return 颜色
-	 * @return 颜色
+     * Return the color.
-	 * Return the color.
+     */
-	 */
+    public Color getColor() {
-	public Color getColor() {
+        return color;
-		return color;
+    }
-	}
+
-
+    /**
-	/**
+     * 获取颜色
-	 * 获取颜色
+     *
-	 * 
+     * @return 颜色
-	 * @return 颜色
+     */
-	 */
+    public Color getNotNoneColor() {
-	public Color getNotNoneColor() {
+        if (color == null) {
-		if (color == null) {
+            setColor(Color.WHITE);
-			setColor(Color.WHITE);
+            return Color.WHITE;
-			return Color.WHITE;
+        }
-		}
+        return color;
-		return color;
+    }
-	}
+
-
+    /**
-	/**
+     * Set the color.
-	 * Set the color.
+     *
-	 * 
+     * @param color the new color.
-	 * @param color
+     */
-	 *            the new color.
+    @Override
-	 */
+    public void setColor(Color color) {
-	@Override
+        this.color = color;
-	public void setColor(Color color) {
+
-		this.color = color;
+        // fire color change.
-
+        if (!colorChangeListenerList.isEmpty()) {
-		// fire color change.
+            ChangeEvent evt = new ChangeEvent(this);
-		if (!colorChangeListenerList.isEmpty()) {
+
-			ChangeEvent evt = new ChangeEvent(this);
+            for (int i = 0; i < colorChangeListenerList.size(); i++) {
-
+                this.colorChangeListenerList.get(i).stateChanged(evt);
-			for (int i = 0; i < colorChangeListenerList.size(); i++) {
+            }
-				this.colorChangeListenerList.get(i).stateChanged(evt);
+        }
-			}
+        ColorSelectConfigManager.getInstance().addToColorQueue(color);
-		}
+        this.repaint();
-		ColorSelectConfigManager.getInstance().addToColorQueue(color);
+    }
-		this.repaint();
+
-	}
+    /**
-
+     * 设置颜色
-	/**
+     *
-	 * 设置颜色
+     * @param 颜色位置
-	 * @param 颜色位置
+     */
-	 */
+    @Override
-	@Override
+    public void colorSetted(ColorCell colorCell) {
-	public void colorSetted(ColorCell colorCell) {
+        colorCell.repaint();
-		colorCell.repaint();
+    }
-	}
+
-
+    protected void doTransparent() {
-	protected void doTransparent() {
+        setColor(null);
-		setColor(null);
+    }
-	}
+
-	protected void customButtonPressed() {
+    protected void customButtonPressed() {
-		pane = new ColorSelectDetailPane(Color.WHITE);
+        pane = new ColorSelectDetailPane(Color.WHITE);
-		ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
+        ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
-	}
+    }
-
+
-	@Override
+    @Override
-	public Dimension getPreferredSize() {
+    public Dimension getPreferredSize() {
-		if(isSupportTransparent){
+        if (isSupportTransparent) {
-			return new Dimension(super.getPreferredSize().width, TRANSPANENT_WINDOW_HEIGHT);
+            return new Dimension(super.getPreferredSize().width, TRANSPANENT_WINDOW_HEIGHT);
-		}
+        }
-		return new Dimension(super.getPreferredSize().width, WINDWO_HEIGHT);
+        return new Dimension(super.getPreferredSize().width, WINDWO_HEIGHT);
-	}
+    }
-	
+
-	/**
+    /**
-	 * 更新最近使用颜色
+     * 更新最近使用颜色
-	 * 
+     */
-	 */
+    public void updateUsedColor() {
-	public void updateUsedColor(){
+        usedColorPane.updateUsedColor();
-		usedColorPane.updateUsedColor();
+    }
-	}
-
 
 
 }

designer_base/src/com/fr/design/style/color/RecentUseColorPane.java

@@ -1,55 +1,48 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-
-import javax.swing.JColorChooser;
-import javax.swing.JPanel;
-
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 
-public class RecentUseColorPane extends BasicPane implements ColorSelectable{
+import javax.swing.*;
+import java.awt.*;
+
+public class RecentUseColorPane extends BasicPane implements ColorSelectable {
 
-	JColorChooser chooser;
+    private JColorChooser chooser;
 
-	@Override
+    @Override
-	protected String title4PopupWindow() {
+    protected String title4PopupWindow() {
-		return null;
+        return null;
-	}
+    }
 
-	public RecentUseColorPane() {
-	}
 
-	public RecentUseColorPane(JColorChooser chooser) {
+    public RecentUseColorPane(JColorChooser chooser) {
-		this.chooser = chooser;
+        this.chooser = chooser;
 
-		// center
+        // center
-		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
+        JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-		this.add(centerPane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
-		// 最近使用
+        // 最近使用
-		UsedColorPane pane = new UsedColorPane(2, 10, ColorSelectConfigManager.getInstance().getColors(),this);
+        UsedColorPane pane = new UsedColorPane(2, 10, this);
-		centerPane.add(pane.getPane());
+        centerPane.add(pane.getPane());
-	}
+    }
 
-	/**
+    /**
-	 * 选中颜色
+     * 选中颜色
-	 * 
+     */
-	 * @param 颜色
+    @Override
-	 */
+    public void colorSetted(ColorCell color) {
-	@Override
-	public void colorSetted(ColorCell color) {
 
-	}
+    }
 
-	@Override
+    @Override
-	public Color getColor() {
+    public Color getColor() {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public void setColor(Color color) {
+    public void setColor(Color color) {
-		chooser.getSelectionModel().setSelectedColor(color);
+        chooser.getSelectionModel().setSelectedColor(color);
-	}
+    }
 
 }

designer_base/src/com/fr/design/style/color/UsedColorPane.java

@@ -1,119 +1,112 @@
 package com.fr.design.style.color;
 
-import java.awt.Color;
-import java.awt.GridLayout;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.SpecialUIButton;
 
-public class UsedColorPane extends BasicPane{
+import javax.swing.*;
-
+import java.awt.*;
-	public static final Color DEFAULT_COLOR = new Color(222,222,222);
+
-	
+public class UsedColorPane extends BasicPane {
-	// 最近使用面板列数
+
-	private int columns;
+    // 默认显示颜色
-	// 最近使用面板行数
+    public static final Color DEFAULT_COLOR = new Color(222, 222, 222);
-	private int rows;
+
-	// 留白的单元格数量
+    // 最近使用面板列数
-	private int reserveCells;
+    private int columns;
-	// 是否需要取色器按钮
+    // 最近使用面板行数
-	private boolean needPickColorButton;
+    private int rows;
-	// 是否在取色时实时设定颜色
+    // 留白的单元格数量
-	private boolean setColorRealTime;
+    private int reserveCells;
-	// 最近使用颜色
+    // 是否需要取色器按钮
-	private Object[] colors;
+    private boolean needPickColorButton;
-	// 最近使用面板
+    // 是否在取色时实时设定颜色
-	private JPanel pane;
+    private boolean setColorRealTime;
-	
+
-	private ColorSelectable selectable;
+    // 最近使用面板
-	
+    private JPanel pane;
-	public JPanel getPane() {
+
-		return pane;
+    private ColorSelectable selectable;
-	}
+
-
+    public JPanel getPane() {
-	public void setPane(JPanel pane) {
+        return pane;
-		this.pane = pane;
+    }
-	}
+
-	
+    public void setPane(JPanel pane) {
-	public UsedColorPane(){
+        this.pane = pane;
-		
+    }
-	}
+
-	
+
-	/**
+    /**
-	 * 构造函数
+     * 构造函数
-	 * 
+     *
-	 * @param rows 行
+     * @param rows                行
-	 * @param columns 列
+     * @param columns             列
-	 * @param reserveCells 留白的单元格个数
+     * @param reserveCells        留白的单元格个数
-	 * @param colors 最近使用的颜色
+     * @param colors              最近使用的颜色
-	 * @param needPickColorButton 是否需要加上取色器按钮
+     * @param needPickColorButton 是否需要加上取色器按钮
-	 * @param setColorRealTime 取色器是否实时设定颜色
+     * @param setColorRealTime    取色器是否实时设定颜色
-	 */
+     */
-	public UsedColorPane(int rows,int columns,int reserveCells, Object[] colors, ColorSelectable selectable, boolean needPickColorButton, boolean setColorRealTime){
+    public UsedColorPane(int rows, int columns, int reserveCells, ColorSelectable selectable, boolean needPickColorButton, boolean setColorRealTime) {
-		this.columns = columns;
+        this.columns = columns;
-		this.rows = rows;
+        this.rows = rows;
-		this.reserveCells = reserveCells;
+        this.reserveCells = reserveCells;
-		this.colors = colors;
+        this.selectable = selectable;
-		this.selectable = selectable;
+        this.needPickColorButton = needPickColorButton;
-		this.needPickColorButton = needPickColorButton;
+        this.setColorRealTime = setColorRealTime;
-		this.setColorRealTime = setColorRealTime;
+        initialComponents();
-		initialComponents();
+    }
-	}
+
-
+    public UsedColorPane(int rows, int columns, ColorSelectable selectable) {
-	public UsedColorPane(int rows,int columns, Object[] colors,ColorSelectable selectable){
+        this(rows, columns, 0, selectable, false, false);
-		this(rows, columns, 0, colors, selectable, false, false);
+    }
-	}
+
-	
+    private void initialComponents() {
-	private void initialComponents(){
+        int total = columns * rows;
-		int total = columns * rows;
+        JPanel panel = new JPanel();
-		JPanel panel = new JPanel();
+        panel.setLayout(new GridLayout(rows, columns, 1, 1));
-		panel.setLayout(new GridLayout(rows,columns, 1, 1));
+        panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
-		panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
+        //最近使用颜色
-		Color[] colors = ColorSelectConfigManager.getInstance().getColors();
+        Color[] colors = ColorSelectConfigManager.getInstance().getColors();
-		int size = colors.length;
+        int size = colors.length;
-
+
-		int i = 0;
+        int i = 0;
-		if (needPickColorButton) {
+        if (needPickColorButton) {
-			// 取色按钮
+            // 取色按钮
-			SpecialUIButton pickColorButton = PickColorButtonFactory.getPickColorButton(selectable, PickColorButtonFactory.IconType.ICON16, setColorRealTime);
+            SpecialUIButton pickColorButton = PickColorButtonFactory.getPickColorButton(selectable, PickColorButtonFactory.IconType.ICON16, setColorRealTime);
-			panel.add(pickColorButton);
+            panel.add(pickColorButton);
-			i++;
+            i++;
-			this.reserveCells += 1;
+            this.reserveCells += 1;
-		}
+        }
-		while (i < this.reserveCells) {
+        while (i < this.reserveCells) {
-			ColorCell cc = new ColorCell(DEFAULT_COLOR, selectable);
+            ColorCell cc = new ColorCell(DEFAULT_COLOR, selectable);
-			cc.setVisible(false);
+            cc.setVisible(false);
-			panel.add(cc);
+            panel.add(cc);
-			i++;
+            i++;
-		}
+        }
-		while (i < total) {
+        while (i < total) {
-			Color color = i < size ? colors[size-1-i]: DEFAULT_COLOR;
+            Color color = i < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
-			panel.add(new ColorCell(color == null ? DEFAULT_COLOR : color, selectable));
+            panel.add(new ColorCell(color == null ? DEFAULT_COLOR : color, selectable));
-			i++;
+            i++;
-		}
+        }
-		this.pane = panel;
+        this.pane = panel;
-	}
+    }
-	
+
-	/**
+    /**
-	 * 更新最近使用颜色
+     * 更新最近使用颜色
-	 * 
+     */
-	 */
+    public void updateUsedColor() {
-	public void updateUsedColor(){
+        int total = columns * rows;
-		int total = columns * rows;
+        Color[] colors = ColorSelectConfigManager.getInstance().getColors();
-		Color[] colors = ColorSelectConfigManager.getInstance().getColors();
+        int size = colors.length;
-		int size = colors.length;
+        for (int i = this.reserveCells; i < total; i++) {
-		for(int i=this.reserveCells; i<total; i++){
+            ColorCell cell = (ColorCell) this.pane.getComponent(i);
-			ColorCell cell = (ColorCell) this.pane.getComponent(i);
+            Color color = i < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
-			Color color = i < size ? colors[size-1-i]: DEFAULT_COLOR;
+            cell.setColor(color == null ? DEFAULT_COLOR : color);
-			cell.setColor(color == null ? DEFAULT_COLOR : color);
+        }
-		}
+    }
-	}
+
-
+    @Override
-	@Override
+    protected String title4PopupWindow() {
-	protected String title4PopupWindow() {
+        return null;
-		return null;
+    }
-	}
 }

designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@@ -31,17 +31,18 @@ public class MinMaxValuePane extends JPanel {
     protected UITextField secUnitField;
 
 	public MinMaxValuePane() {
-        minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
+		minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
-        minValueField = new UITextField(6);
+		minValueField = new UITextField(6);
-        maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"}));
+		maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"}));
-        maxValueField = new UITextField(6);
+		maxValueField = new UITextField(6);
-        isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit"));
+		isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit"));
-        mainUnitField = new UITextField(6);
+		mainUnitField = new UITextField(6);
-        isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
+		isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
-        secUnitField = new UITextField(6);
+		secUnitField = new UITextField(6);
+
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = { p, f };
+		double[] columnSize = {p, f};
 
 		Component[][] components = getPanelComponents();
 		JPanel panel = TableLayoutHelper.createTableLayoutPane(components, getRowSize(p), columnSize);
@@ -53,25 +54,26 @@ public class MinMaxValuePane extends JPanel {
 	protected double[] getRowSize(double p) {
 		return new double[]{p, p, p, p};
 	}
-    protected void addComponentListener(Component[][] components) {
-        for (int i = 0; i < components.length; i++) {
-            addListener((UICheckBox) components[i][0]);
-            ChartSwingUtils.addListener((UICheckBox) components[i][0], (UITextField) components[i][1]);
-        }
-    }
 
-    protected void  addListener(UICheckBox checkBox) {
+	protected void addComponentListener(Component[][] components) {
-        checkBox.addActionListener(new ActionListener() {
+		for (int i = 0; i < components.length; i++) {
+			addListener((UICheckBox) components[i][0]);
+			ChartSwingUtils.addListener((UICheckBox) components[i][0], (UITextField) components[i][1]);
+		}
+	}
+
+	protected void  addListener(UICheckBox checkBox) {
+		checkBox.addActionListener(new ActionListener() {
 
-            @Override
+			@Override
-            public void actionPerformed(ActionEvent e) {
+			public void actionPerformed(ActionEvent e) {
-                checkBoxUse();
+				checkBoxUse();
-            }
+			}
-        });
+		});
-    }
+	}
 
 	protected Component[][] getPanelComponents() {
-		return 	new Component[][]{
+		return new Component[][]{
 				new Component[]{minCheckBox, minValueField},
 				new Component[]{maxCheckBox, maxValueField},
 				new Component[]{isCustomMainUnitBox, mainUnitField},

designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java

@@ -77,17 +77,17 @@ public class ChartTextAttrPane extends BasicPane {
     public void populate(FRFont frFont) {
         UIObserverListener listener = fontNameComboBox == null ? null : fontNameComboBox.getUiObserverListener();
         removeAllComboBoxListener();
-        if (frFont == null) {
+
-            return;
+        if (frFont != null) {
-        }
+            fontNameComboBox.setSelectedItem(frFont.getFamily());
-        fontNameComboBox.setSelectedItem(frFont.getFamily());
+            bold.setSelected(frFont.isBold());
-        bold.setSelected(frFont.isBold());
+            italic.setSelected(frFont.isItalic());
-        italic.setSelected(frFont.isItalic());
+            if(fontSizeComboBox != null) {
-        if(fontSizeComboBox != null) {
+                fontSizeComboBox.setSelectedItem(frFont.getSize());
-        	fontSizeComboBox.setSelectedItem(frFont.getSize());
+            }
-        }
+            if (fontColor != null) {
-        if (fontColor != null) {
+                fontColor.setColor(frFont.getForeground());
-            fontColor.setColor(frFont.getForeground());
+            }
         }
 
         //更新结束后，注册监听器

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@@ -16,78 +16,77 @@ import com.fr.general.FRLogger;
 import java.awt.*;
 
 public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
-    //是不是添加到父容器上
+	//是不是添加到父容器上
-    private boolean isAdd2ParentLayout = false;
+	private boolean isAdd2ParentLayout = false;
-    private HoverPainter painter;
+	private HoverPainter painter;
 
     public FRAbsoluteLayoutAdapter(XLayoutContainer container) {
         super(container);
-        painter = new FRAbsoluteLayoutPainter(container);
+		painter = new FRAbsoluteLayoutPainter(container);
-        initMinSize();
+		initMinSize();
     }
 
-    private void initMinSize() {
+	private void initMinSize() {
-        XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
+		XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
-        minWidth = layout.getActualMinWidth();
+		minWidth = layout.getActualMinWidth();
-        minHeight = layout.getActualMinHeight();
+		minHeight = layout.getActualMinHeight();
-        actualVal = layout.getAcualInterval();
+		actualVal = layout.getAcualInterval();
-        margin = layout.toData().getMargin();
+		margin = layout.toData().getMargin();
-    }
+	}
 
-    @Override
+	@Override
-    public HoverPainter getPainter() {
+	public HoverPainter getPainter() {
-        return painter;
+		return painter;
-    }
+	}
     
     /**
      * 是否能在指定位置添加组件
-     *
      * @param creator 组件
-     * @param x       坐标x
+     * @param x 坐标x
-     * @param y       坐标y
+     * @param y 坐标y
      * @return 能则返回true
      */
-    //这个地方的逻辑非常复杂，
+	//这个地方的逻辑非常复杂，
-    // 1.当前绝对布局是不可编辑且是最外层，那么其他控件添加在它周围，
+	// 1.当前绝对布局是不可编辑且是最外层，那么其他控件添加在它周围，
-    // 2.当前绝对布局是不可编辑且不是最外层，那么控件不可添加，（嵌套）
+	// 2.当前绝对布局是不可编辑且不是最外层，那么控件不可添加，（嵌套）
-    // 3.当前绝对布局可编辑，那么控件添加
+	// 3.当前绝对布局可编辑，那么控件添加
     @Override
-    public boolean accept(XCreator creator, int x, int y) {
+	public boolean accept(XCreator creator, int x, int y) {
-        Component comp = container.getComponentAt(x, y);
+		Component comp = container.getComponentAt(x, y);
-        //布局控件要先判断是不是可编辑
+		//布局控件要先判断是不是可编辑
-        //可以编辑，按原有逻辑判断
+		//可以编辑，按原有逻辑判断
-        //不可编辑，当成一整个控件处理
+		//不可编辑，当成一整个控件处理
-        if (comp == null) {
+		if (comp == null){
-            return false;
+			return false;
-        }
+		}
-        //参数面板内的组件不允许拖往绝对布局中
+		//参数面板内的组件不允许拖往绝对布局中
-        if (creator.getParent() != null && ((XCreator) creator.getParent()).acceptType(XWParameterLayout.class)) {
+		if (creator.getParent() != null && ((XCreator)creator.getParent()).acceptType(XWParameterLayout.class)){
-            Rectangle rec = creator.getBounds();
+			Rectangle rec = creator.getBounds();
-            rec.y = creator.getParent().getHeight() - rec.height;
+			rec.y = creator.getParent().getHeight() - rec.height;
-            creator.setBounds(rec);
+			creator.setBounds(rec);
-            return false;
+			return false;
-        }
+		}
-        //判断组件能不能拖入绝对布局
+		//判断下组件能不能拖入绝对布局
-        if (!creator.canEnterIntoAbsolutePane()) {
+		if (!creator.canEnterIntoAbsolutePane()){
-            return false;
+			return false;
-        }
+		}
-        XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator) comp).getTopLayout();
+		XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator)comp).getTopLayout();
-        if (topLayout != null) {
+		if(topLayout != null){
-            if (topLayout.isEditable()) {
+			if (topLayout.isEditable()){
                 return topLayoutAccept(creator, x, y);
-            }
+			}
-            //绝对布局嵌套，处于内层，不可编辑，不添加，topLayout只能获取到最外层可编辑的布局
+			//绝对布局嵌套，处于内层，不可编辑，不添加，topLayout只能获取到最外层可编辑的布局
-            else if (((XLayoutContainer) topLayout.getParent()).acceptType(XWAbsoluteLayout.class)) {
+			else if (((XLayoutContainer)topLayout.getParent()).acceptType(XWAbsoluteLayout.class)) {
-                return false;
+				return false;
             } else {
                 return acceptWidget(x, y);
-            }
+			}
         } else {
-            FRLogger.getLogger().error("top layout is null!");
+			FRLogger.getLogger().error("top layout is null!");
-        }
+		}
 
-        return false;
+		return false;
-    }
+	}
 
     //topLayout假如可以编辑的话就往里面添加组件
     private boolean topLayoutAccept(XCreator creator, int x, int y) {
@@ -108,57 +107,56 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
             creatorX = x - w;
             creatorY = y - h;
         }
-        if (creatorX < 0 || creatorX + creator.getWidth() > container.getWidth()) {
+		if (creatorX < 0 || creatorX + creator.getWidth() > container.getWidth()) {
             return false;
         }
-        if (creatorY < 0 || creatorY + creator.getHeight() > container.getHeight()) {
+		if (creatorY < 0 || creatorY + creator.getHeight() > container.getHeight()){
             return false;
         }
-        return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
+		return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
                 && creator.getWidth() <= container.getWidth();
-    }
+	}
 
-    /**
+	/**
-     * 判断是否鼠标在组件的三等分区域，如果组件在布局管理器中间，上下左右都可能会三等分
+	 * 判断是否鼠标在组件的三等分区域，如果组件在布局管理器中间，上下左右都可能会三等分
-     *
+	 * @param parentComp 鼠标所在区域的组件
-     * @param parentComp 鼠标所在区域的组件
+	 * @param x 坐标x
-     * @param x          坐标x
+	 * @param y 坐标y
-     * @param y          坐标y
+	 * @return 是则返回true
-     * @return 是则返回true
+	 */
-     */
+	public boolean isTrisectionArea(Component parentComp, int x, int y) {
-    public boolean isTrisectionArea(Component parentComp, int x, int y) {
+		XCreator creator = (XCreator)parentComp;
-        XCreator creator = (XCreator) parentComp;
+		trisectAreaDirect = 0;
-        trisectAreaDirect = 0;
+		if (container.getComponentCount()<=1) {
-        if (container.getComponentCount() <= 1) {
+			return false;
-            return false;
+		}
-        }
+		int maxWidth = parentComp.getWidth();
-        int maxWidth = parentComp.getWidth();
+		int maxHeight = parentComp.getHeight();
-        int maxHeight = parentComp.getHeight();
+		int xL = parentComp.getX();
-        int xL = parentComp.getX();
+		int yL = parentComp.getY();
-        int yL = parentComp.getY();
+		// 组件宽高的十分之一和默认值取大
-        // 组件宽高的十分之一和默认值取大
+		int minRangeWidth = Math.max(maxWidth/BORDER_PROPORTION, DEFAULT_AREA_LENGTH);
-        int minRangeWidth = Math.max(maxWidth / BORDER_PROPORTION, DEFAULT_AREA_LENGTH);
+		int minRangeHeight = Math.max(maxHeight/BORDER_PROPORTION, DEFAULT_AREA_LENGTH);
-        int minRangeHeight = Math.max(maxHeight / BORDER_PROPORTION, DEFAULT_AREA_LENGTH);
+		if(y<yL+minRangeHeight ) {
-        if (y < yL + minRangeHeight) {
+			// 在组件上侧三等分
-            // 在组件上侧三等分
+			trisectAreaDirect = COMP_TOP;
-            trisectAreaDirect = COMP_TOP;
+		} else if(y>yL+maxHeight-minRangeHeight) {
-        } else if (y > yL + maxHeight - minRangeHeight) {
+			// 在组件下侧三等分
-            // 在组件下侧三等分
+			trisectAreaDirect = COMP_BOTTOM;
-            trisectAreaDirect = COMP_BOTTOM;
+		} else if (x<xL+minRangeWidth) {
-        } else if (x < xL + minRangeWidth) {
+			// 在组件左侧三等分
-            // 在组件左侧三等分
+			trisectAreaDirect = COMP_LEFT;
-            trisectAreaDirect = COMP_LEFT;
+		} else if(x>xL+maxWidth-minRangeWidth) {
-        } else if (x > xL + maxWidth - minRangeWidth) {
+			// 在组件右侧三等分
-            // 在组件右侧三等分
+			trisectAreaDirect = COMP_RIGHT;
-            trisectAreaDirect = COMP_RIGHT;
+		}
-        }
+		// tab布局的边界特殊处理，不进行三等分
-        // tab布局的边界特殊处理，不进行三等分
+		if(!creator.getTargetChildrenList().isEmpty()){
-        if (!creator.getTargetChildrenList().isEmpty()) {
+			return false;
-            return false;
+		}
-        }
 
-        return !ComparatorUtils.equals(trisectAreaDirect, 0);
+		return !ComparatorUtils.equals(trisectAreaDirect, 0);
-    }
+	}
 
     //当前绝对布局不可编辑，就当成一个控件，组件添加在周围
     private boolean acceptWidget(int x, int y) {
@@ -170,177 +168,174 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
         container = parent != null ? parent : container;
         isAdd2ParentLayout = true;
 
-        int componentHeight = comp.getHeight();
+		int componentHeight = comp.getHeight();
-        int componentWidth = comp.getWidth();
+		int componentWidth = comp.getWidth();
-        //上半部分高度
+		//上半部分高度
-        int upHeight = (int) (componentHeight * TOP_HALF) + comp.getY();
+		int upHeight = (int) (componentHeight * TOP_HALF) + comp.getY();
-        //下半部分高度
+		//下半部分高度
-        int downHeight = (int) (componentHeight * BOTTOM_HALF) + comp.getY();
+		int downHeight = (int) (componentHeight * BOTTOM_HALF) + comp.getY();
 
-        if (isCrossPointArea(comp, x, y)) {
+		if (isCrossPointArea(comp, x, y)) {
-            return canAcceptWhileCrossPoint(comp, x, y);
+			return canAcceptWhileCrossPoint(comp, x, y);
-        }
+		}
 
-        if (isTrisectionArea(comp, x, y)) {
+		if (isTrisectionArea(comp, x, y)) {
-            return canAcceptWhileTrisection(comp, x, y);
+			return canAcceptWhileTrisection(comp, x, y);
-        }
+		}
 
-        boolean horizonValid = componentWidth >= minWidth * 2 + actualVal;
+		boolean horizonValid = componentWidth >= minWidth * 2 + actualVal;
-        boolean verticalValid = componentHeight >= minHeight * 2 + actualVal;
+		boolean verticalValid = componentHeight >= minHeight * 2 + actualVal;
-        return y > upHeight && y < downHeight ? horizonValid : verticalValid;
+		return y > upHeight && y < downHeight ? horizonValid : verticalValid;
-    }
+	}
 
-    /**
+	/**
-     * 组件的ComponentAdapter在添加组件时，如果发现布局管理器不为空，会继而调用该布局管理器的
+	 * 组件的ComponentAdapter在添加组件时，如果发现布局管理器不为空，会继而调用该布局管理器的
-     * addComp方法来完成组件的具体添加。在该方法内，布局管理器可以提供额外的功能。
+	 * addComp方法来完成组件的具体添加。在该方法内，布局管理器可以提供额外的功能。
-     *
+	 *
-     * @param creator 被添加的新组件
+	 * @param creator 被添加的新组件
-     * @param x       添加的位置x，该位置是相对于container的
+	 * @param x       添加的位置x，该位置是相对于container的
-     * @param y       添加的位置y，该位置是相对于container的
+	 * @param y       添加的位置y，该位置是相对于container的
-     * @return 是否添加成功，成功返回true，否则false
+	 * @return 是否添加成功，成功返回true，否则false
-     */
+	 */
-    @Override
+	@Override
-    public boolean addBean(XCreator creator, int x, int y) {
+	public boolean addBean(XCreator creator, int x, int y) {
-        Rectangle rect = ComponentUtils.getRelativeBounds(container);
+		Rectangle rect = ComponentUtils.getRelativeBounds(container);
 
-        int posX = x + rect.x;
+		int posX = x + rect.x;
-        int posY = y + rect.y;
+		int posY = y + rect.y;
-        if (!accept(creator, x, y)) {
+		if (!accept(creator, x, y)) {
-            return false;
+			return false;
-        }
+		}
-        addComp(creator, posX, posY);
+		addComp(creator, posX, posY);
-        ((XWidgetCreator) creator).recalculateChildrenSize();
+		((XWidgetCreator) creator).recalculateChildrenSize();
-        return true;
+		return true;
-    }
+	}
 
-    @Override
+	@Override
-    protected void addComp(XCreator creator, int x, int y) {
+	protected void addComp(XCreator creator, int x, int y) {
-        if (!isAdd2ParentLayout) {
+		if(!isAdd2ParentLayout) {
-            Rectangle r = ComponentUtils.getRelativeBounds(container);
+			Rectangle r = ComponentUtils.getRelativeBounds(container);
-            x = x - r.x;
+			x = x - r.x;
-            y = y - r.y;
+			y = y - r.y;
-            if (XCreatorUtils.getParentXLayoutContainer(creator) != null) {
+			if (XCreatorUtils.getParentXLayoutContainer(creator) != null) {
 
-                Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator);
+				Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator);
-                x = creatorRectangle.x - r.x;
+				x = creatorRectangle.x - r.x;
-                y = creatorRectangle.y - r.y;
+				y = creatorRectangle.y - r.y;
-            } else {
+			} else {
-                int w = creator.getWidth() / 2;
+				int w = creator.getWidth() / 2;
-                int h = creator.getHeight() / 2;
+				int h = creator.getHeight() / 2;
-                x = x - w;
+				x = x - w;
-                y = y - h;
+				y = y - h;
-            }
+			}
-            fix(creator, x, y);
+			fix(creator, x, y);
 
-            if (creator.hasTitleStyle()) {
+			if (creator.hasTitleStyle()) {
-                addParentCreator(creator);
+				addParentCreator(creator);
-            } else {
+			} else {
-                container.add(creator, creator.toData().getWidgetName(), 0);
+                container.add(creator, creator.toData().getWidgetName(),0);
-            }
+			}
-            XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
+			XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
-            layout.updateBoundsWidget(creator);
+			layout.updateBoundsWidget(creator);
-            updateCreatorBackBound();
+			updateCreatorBackBound();
-            LayoutUtils.layoutRootContainer(container);
+			LayoutUtils.layoutRootContainer(container);
-        } else {
+		}else{
-            fixAbsolute(creator, x, y);
+			fixAbsolute(creator, x, y);
-            if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
+			if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
-                addParentCreator(creator);
+				addParentCreator(creator);
-            } else {
+			} else {
-                container.add(creator, creator.toData().getWidgetName(), 0);
+                container.add(creator, creator.toData().getWidgetName(),0);
-            }
+			}
-            XWFitLayout layout = (XWFitLayout) container;
+			XWFitLayout layout = (XWFitLayout) container;
-            // 更新对应的BoundsWidget
+			// 更新对应的BoundsWidget
-            layout.updateBoundsWidget();
+			layout.updateBoundsWidget();
-            updateCreatorBackBound();
+			updateCreatorBackBound();
-        }
+		}
-    }
+	}
 
-    private void updateCreatorBackBound() {
+	private void updateCreatorBackBound() {
-        for (int i = 0, size = container.getComponentCount(); i < size; i++) {
+		for (int i=0,size=container.getComponentCount(); i<size; i++) {
-            XCreator creator = (XCreator) container.getComponent(i);
+			XCreator creator = (XCreator) container.getComponent(i);
-            creator.updateChildBound(minHeight);
+			creator.updateChildBound(minHeight);
-            creator.setBackupBound(creator.getBounds());
+			creator.setBackupBound(creator.getBounds());
-        }
+		}
-    }
+	}
 
-    private void addParentCreator(XCreator child) {
+	private void addParentCreator(XCreator child) {
-        XLayoutContainer parentPanel = child.initCreatorWrapper(child.getHeight());
+		XLayoutContainer parentPanel = child.initCreatorWrapper(child.getHeight());
-        container.add(parentPanel, child.toData().getWidgetName(), 0);
+        container.add(parentPanel, child.toData().getWidgetName(),0);
-    }
+	}
 
-    /**
+	/**
-     * 新拖入组件时，计算调整其他关联组件位置大小
+	 *  新拖入组件时，计算调整其他关联组件位置大小
-     *
+	 * @param child  新拖入的组件
-     * @param child 新拖入的组件
+	 * @param x 鼠标所在x坐标
-     * @param x     鼠标所在x坐标
+	 * @param y 鼠标所在y坐标
-     * @param y     鼠标所在y坐标
+	 */
-     */
+	private void fixAbsolute(XCreator child, int x, int y) {
-    private void fixAbsolute(XCreator child, int x, int y) {
+		Component parentComp = container.getComponentAt(x, y);
-        Component parentComp = container.getComponentAt(x, y);
+		if (container.getComponentCount()==0){
-        if (container.getComponentCount() == 0) {
+			child.setLocation(0, 0);
-            child.setLocation(0, 0);
+			child.setSize(parentComp.getWidth(), parentComp.getHeight());
-            child.setSize(parentComp.getWidth(), parentComp.getHeight());
+		} else if(isCrossPointArea(parentComp, x, y)){
-        } else if (isCrossPointArea(parentComp, x, y)) {
+			//交叉区域插入组件时，根据具体位置进行上下或者左右或者相邻三个组件的位置大小插入
-            //交叉区域插入组件时，根据具体位置进行上下或者左右或者相邻三个组件的位置大小插入
+			fixCrossPointArea(parentComp, child, x, y);
-            fixCrossPointArea(parentComp, child, x, y);
+			return;
-            return;
+		} else if (isTrisectionArea(parentComp, x, y)) {
-        } else if (isTrisectionArea(parentComp, x, y)) {
+			// 在边界三等分区域，就不再和组件二等分了
-            // 在边界三等分区域，就不再和组件二等分了
+			fixTrisect(parentComp, child, x, y);
-            fixTrisect(parentComp, child, x, y);
+			return;
-            return;
+		} else{
-        } else {
+			fixHalve(parentComp, child, x, y);
-            fixHalve(parentComp, child, x, y);
+		}
-        }
+	}
-    }
 
-    /**
+	/**
      * 组件拖拽后调整大小
-     *
      * @param creator 组件
      */
     @Override
-    public void fix(XCreator creator) {
+	public void fix(XCreator creator) {
-        WAbsoluteLayout wabs = (WAbsoluteLayout) container.toData();
+    	WAbsoluteLayout wabs = (WAbsoluteLayout)container.toData();
-        fix(creator, creator.getX(), creator.getY());
+    	fix(creator,creator.getX(),creator.getY());
-        wabs.setBounds(creator.toData(), creator.getBounds());
+    	wabs.setBounds(creator.toData(),creator.getBounds());
 
-        XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
+		XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
-        layout.updateBoundsWidget(creator);
+		layout.updateBoundsWidget(creator);
     }
     
     /**
      * 调整组件大小到合适尺寸位置
-     *
      * @param creator 组件
-     * @param x       坐标x
+     * @param x 坐标x
-     * @param y       坐标y
+     * @param y 坐标y
      */
-    public void fix(XCreator creator, int x, int y) {
+    public void fix(XCreator creator ,int x, int y) {
-        int height = creator.getHeight();
+		int height = creator.getHeight();
-        int width = creator.getWidth();
+		int width = creator.getWidth();
-        if (x < 0) {
+    	if (x < 0) {
             x = container.getX();
-        } else if (x + creator.getWidth() > container.getWidth()) {
+		} else if (x + creator.getWidth() > container.getWidth()) {
             x = container.getWidth() - width;
-        }
+		}
 
-        if (y < 0) {
+		if (y < 0) {
             y = container.getY();
-        } else if (y + creator.getHeight() > container.getHeight()) {
+		} else if (y + creator.getHeight() > container.getHeight()) {
             y = container.getHeight() - height;
-        }
+		}
 
-        creator.setBounds(x, y, width, height);
+		creator.setBounds(x, y, width, height);
     }
 
     @Override
     public ConstraintsGroupModel getLayoutConstraints(XCreator creator) {
-        return new BoundsGroupModel((XWAbsoluteLayout) container, creator);
+        return new BoundsGroupModel((XWAbsoluteLayout)container, creator);
     }
 
-    @Override
+	@Override
-    public GroupModel getLayoutProperties() {
+	public GroupModel getLayoutProperties() {
-        XWAbsoluteLayout xwAbsoluteLayout = (XWAbsoluteLayout) container;
+		XWAbsoluteLayout xwAbsoluteLayout = (XWAbsoluteLayout) container;
-        return new FRAbsoluteLayoutPropertiesGroupModel(xwAbsoluteLayout);
+		return new FRAbsoluteLayoutPropertiesGroupModel(xwAbsoluteLayout);
-    }
+	}
 }

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java

@@ -16,14 +16,12 @@ import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.FRFitLayoutConstraints;
 import com.fr.design.designer.properties.FRFitLayoutPropertiesGroupModel;
-import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.mainframe.JForm;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.LayoutBorderStyle;
+import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -1013,7 +1011,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
                 setAdjustedSize(tabLayout, offset, isHor);
                 for (int m = 0; m < tabLayout.getComponentCount(); m++) {
                     XCreator childCreator = tabLayout.getXCreator(m);
-                    BoundsWidget wgt = (BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData());
+                    WAbsoluteLayout.BoundsWidget wgt = (WAbsoluteLayout.BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData());
                     wgt.setBounds(tabLayout.getComponent(m).getBounds());
                 }
                 adjustCreatorsSize(percent, tabLayout, isHor);

designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java

@@ -11,6 +11,7 @@ import com.fr.design.mainframe.FormSelection;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import com.fr.form.ui.container.WParameterLayout;
 
 import java.awt.*;
 
@@ -24,7 +25,7 @@ public abstract class AccessDirection implements Direction {
     private int ymin;
     private int xmin;
 
-    abstract int getCursor();
+	abstract int getCursor();
 
     protected abstract Rectangle getDraggedBounds(int dx, int dy, Rectangle currentBounds, FormDesigner designer,
                                                   Rectangle oldBounds);
@@ -51,14 +52,14 @@ public abstract class AccessDirection implements Direction {
             x = designer.getRootComponent().getWidth();
         }
         //参数面板可以无下限拉长
-        if (y < 0) {
+		if (y < 0) {
-            y = 0;
+			y = 0;
-        } else if (y > designer.getRootComponent().getHeight() + designer.getParaHeight() && designer.getSelectionModel().hasSelectionComponent()
+		} else if (y > designer.getRootComponent().getHeight() + designer.getParaHeight() && designer.getSelectionModel().hasSelectionComponent()
                 && !designer.getSelectionModel().getSelection().getSelectedCreator().acceptType(XWParameterLayout.class)) {
-            y = designer.getRootComponent().getHeight() + designer.getParaHeight();
+			y = designer.getRootComponent().getHeight() + designer.getParaHeight();
-        }
+		}
-        return new Point(x, y);
+		return new Point(x, y);
-    }
+	}
 
     protected void sorptionPoint(Point point, Rectangle currentBounds, FormDesigner designer) {
         boolean findInX = currentBounds.getWidth() <= MoveUtils.SORPTION_UNIT;
@@ -95,10 +96,10 @@ public abstract class AccessDirection implements Direction {
                     findInY = true;
                 }
 
-            }
+			}
-            if (findInX && findInY) {
+			if (findInX && findInY) {
-                break;
+				break;
-            }
+			}
 
         }
         setDesignerStateModelProperties(designer, findInX, findInY, currentBounds, point);
@@ -124,7 +125,7 @@ public abstract class AccessDirection implements Direction {
     }
 
 
-    private WAbsoluteLayout getLayout(final FormDesigner designer) {
+    private WAbsoluteLayout getLayout(final FormDesigner designer){
         XLayoutContainer formLayoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(
                 designer.getTarget().getContainer());
         WAbsoluteLayout layout;
@@ -156,52 +157,50 @@ public abstract class AccessDirection implements Direction {
             return;
         }
         //设定控件最小高度21，因每次拖曳至少移动1，防止控件高度等于21时，拖曳导致rec.y的变化使得控件不停的向上或向下移动。
-        if (rec.height == MINHEIGHT) {
+        if(rec.height == MINHEIGHT){
             ymin = rec.y;
         }
-        if (rec.height == MINHEIGHT - 1) {
+        if(rec.height == MINHEIGHT - 1){
             ymin = ymin == rec.y ? rec.y : rec.y - 1;
         }
-        if (rec.height < MINHEIGHT) {
+        if(rec.height < MINHEIGHT){
             rec.height = MINHEIGHT;
             rec.y = ymin;
         }
         // 增加下宽度也设最小为21
         if (rec.width == MINWIDTH) {
-            xmin = rec.x;
+        	xmin = rec.x;
         }
-        if (rec.width == MINWIDTH - 1) {
+        if(rec.width == MINWIDTH - 1){
-            xmin = xmin == rec.x ? rec.x : rec.x - 1;
+        	xmin = xmin == rec.x ? rec.x : rec.x - 1;
         }
         if (rec.width < MINWIDTH) {
-            rec.width = MINWIDTH;
+        	rec.width = MINWIDTH;
-            rec.x = xmin;
+        	rec.x = xmin;
         }
 
     }
 
-    /**
+	/**
-     * 更新鼠标指针形状
+	 * 更新鼠标指针形状
-     *
+	 * @param formEditor 设计界面组件
-     * @param formEditor 设计界面组件
+	 */
-     */
+	public void updateCursor(FormDesigner formEditor) {
-    public void updateCursor(FormDesigner formEditor) {
+
-
+		// 调用位置枚举的多态方法getCursor获取鼠标形状
-        // 调用位置枚举的多态方法getCursor获取鼠标形状
+		int type = getCursor();
-        int type = getCursor();
+
-
+		if (type != formEditor.getCursor().getType()) {
-        if (type != formEditor.getCursor().getType()) {
+			// 设置当前形状
-            // 设置当前形状
+			formEditor.setCursor(Cursor.getPredefinedCursor(type));
-            formEditor.setCursor(Cursor.getPredefinedCursor(type));
+		}
-        }
+	}
-    }
+	
-
+	/**
-    /**
+	 * 生成组件备用的bound
-     * 生成组件备用的bound
+	 * @param formEditor 设计界面组件
-     *
+	 */
-     * @param formEditor 设计界面组件
+	public void backupBounds(FormDesigner formEditor) {
-     */
+		formEditor.getSelectionModel().getSelection().backupBounds();
-    public void backupBounds(FormDesigner formEditor) {
+	}
-        formEditor.getSelectionModel().getSelection().backupBounds();
-    }
 }

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

@@ -10,11 +10,9 @@ 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.BooleanEditor;
+import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
 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;
@@ -104,7 +102,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
 						.setI18NName(Inter.getLocText("FR-Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
+				new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};

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

@@ -3,14 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.*;
-import java.awt.event.ContainerEvent;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.beans.IntrospectionException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.LayoutAdapter;
@@ -20,345 +12,369 @@ import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.form.layout.FRAbsoluteLayout;
 import com.fr.design.icon.IconPathConstants;
-import com.fr.design.mainframe.*;
+import com.fr.design.mainframe.EditingMouseListener;
+import com.fr.design.mainframe.FormArea;
+import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.Connector;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout;
-import com.fr.form.ui.container.WLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import com.fr.form.ui.container.WLayout;
 import com.fr.general.FRScreen;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
+import java.awt.*;
+import java.awt.event.ContainerEvent;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.beans.IntrospectionException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
 /**
  * @author richer
  * @since 6.5.3
  */
 public class XWAbsoluteLayout extends XLayoutContainer {
 
-	private static final int EDIT_BTN_WIDTH = 60;
+    private static final int EDIT_BTN_WIDTH = 60;
-	private static final int EDIT_BTN_HEIGHT = 24;
+    private static final int EDIT_BTN_HEIGHT = 24;
-	private int minWidth = WLayout.MIN_WIDTH;
+    private int minWidth = WLayout.MIN_WIDTH;
-	private int minHeight = WLayout.MIN_HEIGHT;
+    private int minHeight = WLayout.MIN_HEIGHT;
-
+
-	//由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
+    //由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
-	protected double containerPercent = 1.0;
+    protected double containerPercent = 1.0;
-	
+
-	private HashMap<Connector,XConnector> xConnectorMap;
+    private HashMap<Connector, XConnector> xConnectorMap;
-	
+
-	public XWAbsoluteLayout() {
+    public XWAbsoluteLayout() {
-		this(new WAbsoluteLayout(),new Dimension());
+        this(new WAbsoluteLayout(), new Dimension());
-	}
+    }
-
+
-	public XWAbsoluteLayout(WAbsoluteLayout widget) {
+    public XWAbsoluteLayout(WAbsoluteLayout widget) {
-		this(widget,new Dimension());
+        this(widget, new Dimension());
-	}
+    }
-
+
-	public XWAbsoluteLayout(WAbsoluteLayout widget, Dimension initSize) {
+    public XWAbsoluteLayout(WAbsoluteLayout widget, Dimension initSize) {
-		super(widget, initSize);
+        super(widget, initSize);
-		this.xConnectorMap =  new HashMap<Connector,XConnector>();
+        this.xConnectorMap = new HashMap<Connector, XConnector>();
-		Connector connector;
+        Connector connector;
-		for (int i = 0; i < widget.connectorCount(); i++) {
+        for (int i = 0; i < widget.connectorCount(); i++) {
-			connector = widget.getConnectorIndex(i);
+            connector = widget.getConnectorIndex(i);
-			xConnectorMap.put(connector, new XConnector(connector, this));
+            xConnectorMap.put(connector, new XConnector(connector, this));
-		}
+        }
-
+
-		initPercent(widget);
+        initPercent(widget);
-	}
+    }
-
+
-	/**
+    /**
-	 * 初始化时默认的组件大小
+     * 初始化时默认的组件大小
-	 *
+     *
-	 * @return 默认Dimension
+     * @return 默认Dimension
-	 */
+     */
-	@Override
+    @Override
-	public Dimension initEditorSize() {
+    public Dimension initEditorSize() {
-		return new Dimension(500, 300);
+        return new Dimension(500, 300);
-	}
+    }
-
+
-	//根据屏幕大小来确定显示的百分比, 1440*900默认100%, 1366*768缩放90%
+    //根据屏幕大小来确定显示的百分比, 1440*900默认100%, 1366*768缩放90%
-	private void initPercent(WAbsoluteLayout widget){
+    private void initPercent(WAbsoluteLayout widget) {
-		Toolkit toolkit = Toolkit.getDefaultToolkit();
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
-		Dimension scrnsize = toolkit.getScreenSize();
+        Dimension scrnsize = toolkit.getScreenSize();
-		double screenValue = FRScreen.getByDimension(scrnsize).getValue();
+        double screenValue = FRScreen.getByDimension(scrnsize).getValue();
-		if(screenValue != FormArea.DEFAULT_SLIDER){
+        if (screenValue != FormArea.DEFAULT_SLIDER) {
-			this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER);
+            this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER);
-		}
+        }
-	}
+    }
-
+
-	/**
+    /**
-	 * 返回容器大小的百分比
+     * 返回容器大小的百分比
-	 * @return the containerPercent
+     *
-	 */
+     * @return the containerPercent
-	public double getContainerPercent() {
+     */
-		return containerPercent;
+    public double getContainerPercent() {
-	}
+        return containerPercent;
-
+    }
-	/**
+
-	 * 设置容器大小的百分比
+    /**
-	 * @param containerPercent the containerPercent to set
+     * 设置容器大小的百分比
-	 */
+     *
-	public void setContainerPercent(double containerPercent) {
+     * @param containerPercent the containerPercent to set
-		this.containerPercent = containerPercent;
+     */
-		minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH*containerPercent);
+    public void setContainerPercent(double containerPercent) {
-		minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT*containerPercent);
+        this.containerPercent = containerPercent;
-	}
+        minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH * containerPercent);
-
+        minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT * containerPercent);
-	/**
+    }
-	 * 返回界面处根据百分比调整后的最小宽度
+
-	 * @return 最小宽度
+    /**
-	 */
+     * 返回界面处根据百分比调整后的最小宽度
-	public int getActualMinWidth() {
+     *
-		return this.minWidth;
+     * @return 最小宽度
-	}
+     */
-
+    public int getActualMinWidth() {
-	/**
+        return this.minWidth;
-	 * 返回界面处根据百分比调整后的最小高度
+    }
-	 * @return 最小高度
+
-	 */
+    /**
-	public int getActualMinHeight() {
+     * 返回界面处根据百分比调整后的最小高度
-		return this.minHeight;
+     *
-	}
+     * @return 最小高度
-
+     */
-	/**
+    public int getActualMinHeight() {
-	 * 返回界面处根据百分比调整后的间隔大小（且为偶数）
+        return this.minHeight;
-	 * @return 间隔
+    }
-	 */
+
-	public int getAcualInterval() {
+    /**
-		// adapter那边交叉三等分、删除都要判断是否对齐，所以间隔转为偶数
+     * 返回界面处根据百分比调整后的间隔大小（且为偶数）
-		int interval = (int) (toData().getCompInterval()*containerPercent);
+     *
-		int val = interval/2;
+     * @return 间隔
-		return val*2;
+     */
-	}
+    public int getAcualInterval() {
-
+        // adapter那边交叉三等分、删除都要判断是否对齐，所以间隔转为偶数
-	/**
+        int interval = (int) (toData().getCompInterval() * containerPercent);
-	 * 界面容器大小不是默认的时，处理控件的BoundsWidget，且避免出现空隙
+        int val = interval / 2;
-	 */
+        return val * 2;
-	private Rectangle dealWidgetBound(Rectangle rec) {
+    }
-		if (containerPercent == 1.0) {
+
-			return rec;
+    /**
-		}
+     * 界面容器大小不是默认的时，处理控件的BoundsWidget，且避免出现空隙
-		rec.x = (int) (rec.x/containerPercent);
+     */
-		rec.y = (int) (rec.y/containerPercent);
+    private Rectangle dealWidgetBound(Rectangle rec) {
-		rec.width = (int) (rec.width/containerPercent);
+        if (containerPercent == 1.0) {
-		rec.height = (int) (rec.height/containerPercent);
+            return rec;
-		return rec;
+        }
-	}
+        rec.x = (int) (rec.x / containerPercent);
-
+        rec.y = (int) (rec.y / containerPercent);
-	/**
+        rec.width = (int) (rec.width / containerPercent);
-	 * 新增删除拉伸后单个组件的BoundsWidget
+        rec.height = (int) (rec.height / containerPercent);
-	 */
+        return rec;
-	public void updateBoundsWidget(XCreator xCreator) {
+    }
-		WAbsoluteLayout layout = this.toData();
+
-		if (xCreator.hasTitleStyle()) {
+    /**
-			xCreator = (XLayoutContainer)xCreator.getParent();
+     * 新增删除拉伸后单个组件的BoundsWidget
-		}
+     */
-		if (xCreator.acceptType(XWAbsoluteLayout.class)){
+    public void updateBoundsWidget(XCreator xCreator) {
-			((XWAbsoluteLayout) xCreator).updateBoundsWidget();
+        WAbsoluteLayout layout = this.toData();
-		}
+        if (xCreator.hasTitleStyle()) {
-		// 如果子组件时tab布局，则tab布局内部的组件的wiget也要更新，否则保存后重新打开大小不对
+            xCreator = (XLayoutContainer) xCreator.getParent();
-		ArrayList<?> childrenList = xCreator.getTargetChildrenList();
+        }
-		if(!childrenList.isEmpty()){
+        if (xCreator.acceptType(XWAbsoluteLayout.class)) {
-			for(int i=0; i<childrenList.size(); i++){
+            ((XWAbsoluteLayout) xCreator).updateBoundsWidget();
-				XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(i);
+        }
-				tabLayout.updateBoundsWidget();
+        // 如果子组件时tab布局，则tab布局内部的组件的wiget也要更新，否则保存后重新打开大小不对
-			}
+        ArrayList<?> childrenList = xCreator.getTargetChildrenList();
-		}
+        if (!childrenList.isEmpty()) {
-        BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData());		Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
+            for (int i = 0; i < childrenList.size(); i++) {
-	}
+                XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(i);
-
+                tabLayout.updateBoundsWidget();
-	private Rectangle calculateBound(Rectangle rec, double pw, double ph){
+            }
-		Rectangle calRec = new Rectangle(0,0,0,0);
+        }
-		calRec.x = (int)(rec.x / pw);
+        BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData());
-		calRec.y = (int)(rec.y / ph);
+        Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
-		calRec.width = (int)(rec.width / pw);
+    }
-		calRec.height = (int)(rec.height / ph);
+
-		return calRec;
+    private Rectangle calculateBound(Rectangle rec, double pw, double ph) {
-	}
+        Rectangle calRec = new Rectangle(0, 0, 0, 0);
-
+        calRec.x = (int) (rec.x / pw);
-	/**
+        calRec.y = (int) (rec.y / ph);
-	 * 新增删除拉伸后每个组件的BoundsWidget
+        calRec.width = (int) (rec.width / pw);
-	 */
+        calRec.height = (int) (rec.height / ph);
-	public void updateBoundsWidget() {
+        return calRec;
-		WAbsoluteLayout layout = this.toData();
+    }
-		Rectangle backupBound = this.getBackupBound();
+
-		Rectangle currentBound = this.getBounds();
+    /**
-		if (backupBound != null && layout.getCompState() == WAbsoluteLayout.STATE_FIT) {
+     * 新增删除拉伸后每个组件的BoundsWidget
-			double percentW = ((double) backupBound.width / (double) currentBound.width);
+     */
-			double percentH = ((double) backupBound.height / (double) currentBound.height);
+    public void updateBoundsWidget() {
-			for (int index = 0, n = this.getComponentCount(); index < n; index++){
+        WAbsoluteLayout layout = this.toData();
-				XCreator creator = (XCreator) this.getComponent(index);
+        Rectangle backupBound = this.getBackupBound();
-				BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
+        Rectangle currentBound = this.getBounds();
-				// 用当前的显示大小计算后调正具体位置
+        if (backupBound != null && layout.getCompState() == WAbsoluteLayout.STATE_FIT) {
-				Rectangle wgtBound = creator.getBounds();
+            double percentW = ((double) backupBound.width / (double) currentBound.width);
-				Rectangle rec = calculateBound(wgtBound, percentW, percentH);
+            double percentH = ((double) backupBound.height / (double) currentBound.height);
-				wgt.setBounds(rec);
+            for (int index = 0, n = this.getComponentCount(); index < n; index++) {
-				creator.setBounds(rec);
+                XCreator creator = (XCreator) this.getComponent(index);
-				//绝对布局嵌套，要更新内部的绝对布局
+                BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
-				if (creator.acceptType(XWAbsoluteLayout.class)){
+                // 用当前的显示大小计算后调正具体位置
-					creator.setBackupBound(wgtBound);
+                Rectangle wgtBound = creator.getBounds();
-					((XWAbsoluteLayout) creator).updateBoundsWidget();
+                Rectangle rec = calculateBound(wgtBound, percentW, percentH);
-				}
+                wgt.setBounds(rec);
-			}
+                creator.setBounds(rec);
-		}
+                //绝对布局嵌套，要更新内部的绝对布局
-	}
+                if (creator.acceptType(XWAbsoluteLayout.class)) {
-
+                    creator.setBackupBound(wgtBound);
-	/**
+                    ((XWAbsoluteLayout) creator).updateBoundsWidget();
-	 * 更新子组件的Bound
+                }
-	 * 这边主要用于绝对布局子组件在适应区域选项时
+            }
-	 * 涉及到的不同分辨率下缩放
+        }
-	 * @param minHeight 最小高度
+    }
-	 */
+
-	@Override
+    /**
-	public void updateChildBound(int minHeight) {
+     * 更新子组件的Bound
-		double prevContainerPercent = FRScreen.getByDimension(toData().getDesigningResolution()).getValue() / FormArea.DEFAULT_SLIDER;
+     * 这边主要用于绝对布局子组件在适应区域选项时
-		if (toData().getCompState() == 0 && prevContainerPercent != containerPercent) {
+     * 涉及到的不同分辨率下缩放
-			for (int i = 0; i < this.getComponentCount(); i++) {
+     *
-				XCreator creator = getXCreator(i);
+     * @param minHeight 最小高度
-				Rectangle rec = new Rectangle(creator.getBounds());
+     */
-				rec.x = (int)(rec.x / prevContainerPercent * containerPercent);
+    @Override
-				rec.y = (int)(rec.y / prevContainerPercent * containerPercent);
+    public void updateChildBound(int minHeight) {
-				rec.height = (int)(rec.height / prevContainerPercent * containerPercent);
+        double prevContainerPercent = FRScreen.getByDimension(toData().getDesigningResolution()).getValue() / FormArea.DEFAULT_SLIDER;
-				rec.width = (int)(rec.width / prevContainerPercent * containerPercent);
+        if (toData().getCompState() == 0 && prevContainerPercent != containerPercent) {
-				BoundsWidget wgt = (BoundsWidget) toData().getBoundsWidget(creator.toData());
+            for (int i = 0; i < this.getComponentCount(); i++) {
-				wgt.setBounds(rec);
+                XCreator creator = getXCreator(i);
-				creator.setBounds(rec);
+                Rectangle rec = new Rectangle(creator.getBounds());
-				creator.updateChildBound(minHeight);
+                rec.x = (int) (rec.x / prevContainerPercent * containerPercent);
-			}
+                rec.y = (int) (rec.y / prevContainerPercent * containerPercent);
-		}
+                rec.height = (int) (rec.height / prevContainerPercent * containerPercent);
-		toData().setDesigningResolution(Toolkit.getDefaultToolkit().getScreenSize());
+                rec.width = (int) (rec.width / prevContainerPercent * containerPercent);
-	}
+                BoundsWidget wgt = (BoundsWidget) toData().getBoundsWidget(creator.toData());
-
+                wgt.setBounds(rec);
-	/**
+                creator.setBounds(rec);
-	 * 增加对齐线
+                creator.updateChildBound(minHeight);
-	 * @param connector 对齐线
+            }
-	 */
+        }
-	public void addConnector(Connector connector) {
+        toData().setDesigningResolution(Toolkit.getDefaultToolkit().getScreenSize());
-		xConnectorMap.put(connector, new XConnector(connector, this));
+    }
-		((WAbsoluteLayout) data).addConnector(connector);
+
-	}
+    /**
-	
+     * 增加对齐线
-	public XConnector getXConnector(Connector connector) {
+     *
-		return xConnectorMap.get(connector);
+     * @param connector 对齐线
-	}
+     */
-	
+    public void addConnector(Connector connector) {
-	/**
+        xConnectorMap.put(connector, new XConnector(connector, this));
-	 * 去除对齐线
+        ((WAbsoluteLayout) data).addConnector(connector);
-	 * @param connector 对齐线
+    }
-	 */
+
-	public void removeConnector(Connector connector) {
+    public XConnector getXConnector(Connector connector) {
-		((WAbsoluteLayout) data).removeConnector(connector);
+        return xConnectorMap.get(connector);
-		xConnectorMap.remove(connector);
+    }
-	}
+
-	
+    /**
-	/**
+     * 去除对齐线
-	 * 返回对应的widget容器
+     *
-	 * @return 返回WAbsoluteLayout
+     * @param connector 对齐线
-	 */
+     */
-	@Override
+    public void removeConnector(Connector connector) {
-	public WAbsoluteLayout toData() {
+        ((WAbsoluteLayout) data).removeConnector(connector);
-		return (WAbsoluteLayout) data;
+        xConnectorMap.remove(connector);
-	}
+    }
-
+
-	@Override
+    /**
-	protected String getIconName() {
+     * 返回对应的widget容器
-		return "layout_absolute_new.png";
+     *
-	}
+     * @return 返回WAbsoluteLayout
-
+     */
-	/**
+    @Override
-	 * 返回默认的容器name
+    public WAbsoluteLayout toData() {
-	 * @return 返回绝对布局容器名
+        return (WAbsoluteLayout) data;
-	 */
+    }
-	@Override
+
-	public String createDefaultName() {
+    @Override
-		return "absolute";
+    protected String getIconName() {
-	}
+        return "layout_absolute_new.png";
-
+    }
-	@Override
+
-	protected void initLayoutManager() {
+    /**
-		this.setLayout(new FRAbsoluteLayout());
+     * 返回默认的容器name
-	}
+     *
-
+     * @return 返回绝对布局容器名
-	/**
+     */
-	 * 是否支持标题样式
+    @Override
-	 *
+    public String createDefaultName() {
-	 * @return 默认false
+        return "absolute";
-	 */
+    }
-	@Override
+
-	public boolean hasTitleStyle() {
+    @Override
-		return false;
+    protected void initLayoutManager() {
-	}
+        this.setLayout(new FRAbsoluteLayout());
-
+    }
-	@Override
+
-	public void paintComponent(Graphics g) {
+    /**
-		super.paintComponent(g);
+     * 是否支持标题样式
-		WAbsoluteLayout layout = (WAbsoluteLayout) data;
+     *
-		Connector[] connector = layout.getConnector();
+     * @return 默认false
-		for (int i = 0, size = connector.length; i < size; i++) {
+     */
-			connector[i].draw(g);
+    @Override
-		}
+    public boolean hasTitleStyle() {
-	}
+        return false;
-	
+    }
-	/**
+
-	 * 转换保存组件信息的wlayout为对应的container
+    @Override
-	 */
+    public void paintComponent(Graphics g) {
-	@Override
+        super.paintComponent(g);
-	public void convert() {
+        WAbsoluteLayout layout = (WAbsoluteLayout) data;
-		isRefreshing = true;
+        Connector[] connector = layout.getConnector();
-		WAbsoluteLayout abs = toData();
+        for (int i = 0, size = connector.length; i < size; i++) {
-		this.removeAll();
+            connector[i].draw(g);
-		for (int i = 0, count = abs.getWidgetCount(); i < count; i++) {
+        }
-			BoundsWidget bw = (BoundsWidget)abs.getWidget(i);
+    }
-			if (bw != null) {
+
-				Rectangle bounds = bw.getBounds();
+    /**
-				XWidgetCreator comp = (XWidgetCreator)XCreatorUtils.createXCreator(bw.getWidget());
+     * 转换保存组件信息的wlayout为对应的container
-				if (!comp.acceptType(XWParameterLayout.class)) {
+     */
-					comp.setDirections(Direction.ALL);		
+    @Override
-				}
+    public void convert() {
-				add(comp);
+        isRefreshing = true;
-				comp.setBounds(bounds);	
+        WAbsoluteLayout abs = toData();
-			}
+        this.removeAll();
-		}
+        for (int i = 0, count = abs.getWidgetCount(); i < count; i++) {
-		isRefreshing = false;
+            BoundsWidget bw = (BoundsWidget) abs.getWidget(i);
-	}
+            if (bw != null) {
-	
+                Rectangle bounds = bw.getBounds();
-	/**
+                XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(bw.getWidget());
-	 * 当前组件zorder位置替换新的控件
+                if (!comp.acceptType(XWParameterLayout.class)) {
-	 * @param widget 控件
+                    comp.setDirections(Direction.ALL);
-	 * @param  oldcreator 旧组件
+                }
-	 * @return 组件
+                add(comp);
-	 */
+                comp.setBounds(bounds);
-	@Override
+            }
-	public XCreator replace(Widget widget, XCreator oldcreator) {
+        }
-		int i = this.getComponentZOrder(oldcreator);
+        isRefreshing = false;
-		if (i != -1) {
+    }
-			this.toData().replace(new BoundsWidget(widget, oldcreator.getBounds()),
+
-					new BoundsWidget(oldcreator.toData(), oldcreator.getBounds()));
+    /**
-			this.convert();
+     * 当前组件zorder位置替换新的控件
-			return (XCreator) this.getComponent(i);
+     *
-		}
+     * @param widget     控件
-		return null;
+     * @param oldcreator 旧组件
-	}
+     * @return 组件
-
+     */
-	 /**
+    @Override
+    public XCreator replace(Widget widget, XCreator oldcreator) {
+        int i = this.getComponentZOrder(oldcreator);
+        if (i != -1) {
+            this.toData().replace(new BoundsWidget(widget, oldcreator.getBounds()),
+                    new BoundsWidget(oldcreator.toData(), oldcreator.getBounds()));
+            this.convert();
+            return (XCreator) this.getComponent(i);
+        }
+        return null;
+    }
+
+    /**
      * 组件增加
+     *
      * @param e 容器事件
      */
-	@Override
+    @Override
-	public void componentAdded(ContainerEvent e) {
+    public void componentAdded(ContainerEvent e) {
-		if (isRefreshing) {
+        if (isRefreshing) {
-			return;
+            return;
-		}
+        }
-		XWidgetCreator creator = (XWidgetCreator) e.getChild();
+        XWidgetCreator creator = (XWidgetCreator) e.getChild();
-		WAbsoluteLayout wabs = this.toData();
+        WAbsoluteLayout wabs = this.toData();
-		if (!creator.acceptType(XWFitLayout.class)) {
+        if (!creator.acceptType(XWFitLayout.class)) {
-			creator.setDirections(Direction.ALL);		
+            creator.setDirections(Direction.ALL);
-		}
+        }
-		wabs.addWidget(new BoundsWidget(creator.toData(), creator.getBounds()));
+        wabs.addWidget(new BoundsWidget(creator.toData(), creator.getBounds()));
-	}
+    }
-	
+
-	 /**
+    /**
      * 在设计界面中有组件移除的时候，需要通知WLayout容器重新paint
+     *
      * @param e 容器事件
      */
     @Override
@@ -373,127 +389,129 @@ public class XWAbsoluteLayout extends XLayoutContainer {
         wlayout.removeWidget(bw);
     }
 
-	@Override
+    @Override
-	public Dimension getMinimumSize() {
+    public Dimension getMinimumSize() {
-		return toData().getMinDesignSize();
+        return toData().getMinDesignSize();
-	}
+    }
-
+
-	@Override
+    @Override
-	public LayoutAdapter getLayoutAdapter() {
+    public LayoutAdapter getLayoutAdapter() {
-		return new FRAbsoluteLayoutAdapter(this);
+        return new FRAbsoluteLayoutAdapter(this);
-	}
+    }
-
+
-	@Override
+    @Override
-	public XLayoutContainer getTopLayout() {
+    public XLayoutContainer getTopLayout() {
-		XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
+        XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
-		if (xTopLayout != null && !xTopLayout.isEditable()){
+        if (xTopLayout != null && !xTopLayout.isEditable()) {
-			return xTopLayout;
+            return xTopLayout;
-		}
+        } else {
-		else{
+            return this;
-			return this;
+        }
-		}
+    }
-	}
+
-
+    /**
-	/**
+     * 得到属性名
-	 *  得到属性名
+     *
-	 * @return 属性名
+     * @return 属性名
-	 * @throws java.beans.IntrospectionException
+     * @throws java.beans.IntrospectionException
-	 */
+     */
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return  new CRPropertyDescriptor[] {
+        return new CRPropertyDescriptor[]{
-				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(
+                new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(
-						Inter.getLocText("FR-Designer_Form-Widget_Name"))
+                        Inter.getLocText("FR-Designer_Form-Widget_Name"))
-		};
+        };
-	}
+    }
-
+
-	public void paint(Graphics g) {
+    public void paint(Graphics g) {
-		super.paint(g);
+        super.paint(g);
-		//如果鼠标移动到布局内且布局不可编辑，画出编辑蒙层
+        //如果鼠标移动到布局内且布局不可编辑，画出编辑蒙层
-		if (isMouseEnter && !this.editable) {
+        if (isMouseEnter && !this.editable) {
-			int x = 0;
+            int x = 0;
-			int y = 0;
+            int y = 0;
-			int w = getWidth();
+            int w = getWidth();
-			int h = getHeight();
+            int h = getHeight();
-
+
-			Graphics2D g2d = (Graphics2D) g;
+            Graphics2D g2d = (Graphics2D) g;
-			Composite oldComposite = g2d.getComposite();
+            Composite oldComposite = g2d.getComposite();
-			//画白色的编辑层
+            //画白色的编辑层
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F));
+            g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F));
-			g2d.setColor(Color.WHITE);
+            g2d.setColor(Color.WHITE);
-			g2d.fillRect(x, y, w, h);
+            g2d.fillRect(x, y, w, h);
-			//画编辑按钮所在框
+            //画编辑按钮所在框
-			g2d.setComposite(oldComposite);
+            g2d.setComposite(oldComposite);
-			g2d.setColor(new Color(176, 196, 222));
+            g2d.setColor(new Color(176, 196, 222));
-			g2d.fillRect((x + w / 2 - EDIT_BTN_WIDTH / 2), (y + h / 2 - EDIT_BTN_HEIGHT / 2), EDIT_BTN_WIDTH, EDIT_BTN_HEIGHT);
+            g2d.fillRect((x + w / 2 - EDIT_BTN_WIDTH / 2), (y + h / 2 - EDIT_BTN_HEIGHT / 2), EDIT_BTN_WIDTH, EDIT_BTN_HEIGHT);
-			//画编辑按钮图标
+            //画编辑按钮图标
-			BufferedImage image = IOUtils.readImage(IconPathConstants.TD_EDIT_ICON_PATH);
+            BufferedImage image = IOUtils.readImage(IconPathConstants.TD_EDIT_ICON_PATH);
-			g2d.drawImage(
+            g2d.drawImage(
-					image,
+                    image,
-					(x + w / 2 - 23),
+                    (x + w / 2 - 23),
-					(y + h / 2 - image.getHeight() / 2),
+                    (y + h / 2 - image.getHeight() / 2),
-					image.getWidth(),
+                    image.getWidth(),
-					image.getHeight(),
+                    image.getHeight(),
-					null,
+                    null,
-					this
+                    this
-			);
+            );
-			g2d.setColor(Color.BLACK);
+            g2d.setColor(Color.BLACK);
-			//画编辑文字
+            //画编辑文字
-			g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
+            g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
-		}
+        }
-	}
+    }
-
+
-	/**
+    /**
-	 * 响应点击事件
+     * 响应点击事件
-	 *
+     *
-	 * @param editingMouseListener 鼠标点击，位置处理器
+     * @param editingMouseListener 鼠标点击，位置处理器
-	 * @param e 鼠标点击事件
+     * @param e                    鼠标点击事件
-	 */
+     */
-	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+    public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) {
-		FormDesigner designer = editingMouseListener.getDesigner();
+        FormDesigner designer = editingMouseListener.getDesigner();
-		SelectionModel selectionModel = editingMouseListener.getSelectionModel();
+        SelectionModel selectionModel = editingMouseListener.getSelectionModel();
-		boolean isEditing = isEditable() || designer.getCursor().getType() == Cursor.HAND_CURSOR || e.getClickCount() == 2;
+        boolean isEditing = isEditable() || designer.getCursor().getType() == Cursor.HAND_CURSOR || e.getClickCount() == 2;
-		setEditable(isEditing);
+        setEditable(isEditing);
-
+
-		selectionModel.selectACreatorAtMouseEvent(e);
+        selectionModel.selectACreatorAtMouseEvent(e);
-		designer.repaint();
+        designer.repaint();
-
+
-		if (editingMouseListener.stopEditing()) {
+        if (editingMouseListener.stopEditing()) {
-			if (this != designer.getRootComponent()) {
+            if (this != designer.getRootComponent()) {
-				ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
+                ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
-				editingMouseListener.startEditing(this, isEditing ? adapter.getDesignerEditor() : null, adapter);
+                editingMouseListener.startEditing(this, isEditing ? adapter.getDesignerEditor() : null, adapter);
-			}
+            }
-		}
+        }
-	}
+    }
-
+
-	/**
+    /**
-	 * body大小手动调整的时候
+     * body大小手动调整的时候
-	 * 按照比例调整组件的宽度
+     * 按照比例调整组件的宽度
-	 * @param percent 比例
+     *
-	 */
+     * @param percent 比例
-	@Override
+     */
-	public void adjustCompWidth(double percent) {
+    @Override
-		for (int i = 0; i < getComponentCount(); i++) {
+    public void adjustCompWidth(double percent) {
-			XCreator xCreator = (XCreator) getComponent(i);
+        for (int i = 0; i < getComponentCount(); i++) {
-			Rectangle rectangle = xCreator.getBounds();
+            XCreator xCreator = (XCreator) getComponent(i);
-			xCreator.setBounds((int) (rectangle.x * percent), rectangle.y, (int) (rectangle.width * percent), rectangle.height);
+            Rectangle rectangle = xCreator.getBounds();
-			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(xCreator.toData());
+            xCreator.setBounds((int) (rectangle.x * percent), rectangle.y, (int) (rectangle.width * percent), rectangle.height);
-			widget.setBounds(xCreator.getBounds());
+            BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(xCreator.toData());
-		}
+            widget.setBounds(xCreator.getBounds());
-	}
+        }
-
+    }
-	/**
+
-	 * body大小手动调整的时候
+    /**
-	 * 按照比例调整组件的高度
+     * body大小手动调整的时候
-	 * @param percent 比例
+     * 按照比例调整组件的高度
-	 */
+     *
-	@Override
+     * @param percent 比例
-	public void adjustCompHeight(double percent) {
+     */
-		for (int i = 0; i < getComponentCount(); i++) {
+    @Override
-			XCreator xCreator = (XCreator) getComponent(i);
+    public void adjustCompHeight(double percent) {
-			Rectangle rectangle = xCreator.getBounds();
+        for (int i = 0; i < getComponentCount(); i++) {
-			xCreator.setBounds(rectangle.x, (int) (rectangle.y * percent), rectangle.width, (int) (rectangle.height * percent));
+            XCreator xCreator = (XCreator) getComponent(i);
-			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(xCreator.toData());
+            Rectangle rectangle = xCreator.getBounds();
-			widget.setBounds(xCreator.getBounds());
+            xCreator.setBounds(rectangle.x, (int) (rectangle.y * percent), rectangle.width, (int) (rectangle.height * percent));
-		}
+            BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(xCreator.toData());
-	}
+            widget.setBounds(xCreator.getBounds());
+        }
+    }
 }

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) {
+    public void setAndScrollSelectionPath(TreePath[] treepath) {
-        setSelectionPath(treepath);
+        setSelectionPaths(treepath);
-        scrollPathToVisible(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/FormSelectionUtils.java

@@ -25,7 +25,6 @@ public class FormSelectionUtils {
     //组件重命名后缀
     private static final String POSTFIX = "_c";
 
-
     private FormSelectionUtils() {
 
     }
@@ -134,8 +133,10 @@ public class FormSelectionUtils {
             boolean xOut = x < 0 || x + copiedCreator.getWidth() / 2 + xoffset > container.getWidth();
             boolean yOut = y < 0 || y + copiedCreator.getHeight() / 2 + yoffset > container.getHeight();
 
+            boolean isEdge = (x - DELAY_X_Y == container.getWidth() - copiedCreator.getWidth() / 2 - xoffset)
+                    && (y - DELAY_X_Y == container.getHeight() - copiedCreator.getHeight() / 2 - yoffset);
+
             y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
-            boolean isEdge = (x - DELAY_X_Y == container.getWidth() - copiedCreator.getWidth() / 2 - xoffset);
             if (xOut) {
                 if (isEdge) {
                     //向左偏移

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/templateinfo/JFormProcessInfo.java

@@ -35,8 +35,6 @@ public class JFormProcessInfo extends TemplateProcessInfo<Form> {
             WLayout wl = (WLayout) template.getContainer().getWidget(i);
             widgetCount += wl.getWidgetCount();
         }
-        int a = 1;
-        int b = 2;
         return widgetCount;
     }
 }

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();
                 }