Merge pull request #1060 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0

* commit 'f8593274e6d79f8417f6e00e9493b46d6f2670a5':
  无JIRA任务 标记开放类

designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java

@@ -1,41 +1,35 @@
 package com.fr.design.beans;
 
+import com.fr.common.annotations.Open;
 import com.fr.design.dialog.BasicPane;
 
-/**
- * Update Pane
- */
+@Open
 public abstract class BasicBeanPane<T> extends BasicPane {
 
+    /**
+     * 展示数据
+     * @param ob 待展示的对象
+     */
+    public abstract void populateBean(T ob);
 
+    /**
+     * 保存数据
+     * @return 待保存的对象
+     */
+    public abstract T updateBean();
 
-	/**
-	 * Populate.
-	 */
-	public abstract void populateBean(T ob);
+    /**
+     * 保存数据
+     * @param ob 待保存的对象
+     */
+    public void updateBean(T ob) {
 
-	/**
-	 * Update.
-	 */
-	public abstract T updateBean();
+    }
 
-	public void updateBean(T ob) {
-
-	}
-
-	/**
-	 * 更新权限工具栏面板
-	 */
-	public void populateAuthority() {
-
-	}
-
-	/**
-	 * 仅用来处理图表设计器的地图面板
-	 * @param mapType 地图类型
-	 */
-	public void dealWidthMap(String mapType){
-
-	}
+    /**
+     * 更新权限工具栏面板
+     */
+    public void populateAuthority() {
 
+    }
 }

designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java

@@ -1,11 +1,9 @@
 package com.fr.design.beans;
 
+import com.fr.common.annotations.Open;
 import com.fr.stable.StringUtils;
 
-/**
- * @author zhou
- * @since 2012-5-30下午12:12:42
- */
+@Open
 public abstract class FurtherBasicBeanPane<T> extends BasicBeanPane<T> {
     /**
      * 是否是指定类型

designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java

@@ -1,10 +1,10 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
+
 import java.awt.*;
 
-/*
- * @author _denny
- */
+@Open
 public abstract class BasicDialog extends UIDialog {
 	public static final Dimension SMALL = new Dimension(340, 180);
 	public static final Dimension MEDIUM = new Dimension(600, 400);

designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@@ -1,24 +1,17 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.JPanel;
+import javax.swing.*;
 import javax.swing.event.DocumentEvent;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Window;
-
-/*
- * _denny: 这里的BasicPane通常会有populate & update方法
- * 记得populate 一定要在对应的dialog setVisible之前populate
- */
+import java.awt.*;
+
+@Open
 public abstract class BasicPane extends JPanel {
 
     /**

designer-base/src/main/java/com/fr/design/dialog/DialogActionAdapter.java

@@ -1,5 +1,8 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
+
+@Open
 public abstract class DialogActionAdapter implements DialogActionListener {
 	@Override
 	public void doOk() {}

designer-base/src/main/java/com/fr/design/dialog/DialogActionListener.java

@@ -1,8 +1,11 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
+
+@Open
 public interface DialogActionListener {
 
-	public void doOk();
+    void doOk();
 
-	public void doCancel();
+    void doCancel();
 }

designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@@ -25,13 +25,7 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 
-/**
- * Created with IntelliJ IDEA.
- * User: 小灰灰
- * Date: 13-7-16
- * Time: 下午2:17
- * To change this template use File | Settings | File Templates.
- */
+
 public abstract class UIDialog extends JDialog {
     public static final String OK_BUTTON = "basic_ok";
     public static final String CANCEL_BUTTON = "basic_cancel";

designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java

@@ -96,15 +96,6 @@ public class MapEditPane extends BasicBeanPane<MapSvgAttr>{
 
     }
 
-    /**
-   	 * 再图片面板设置类型和名字
-   	 * @param mapType 地图类型
-   	 */
-    public void dealWidthMap(String mapType){
-        areaPane.setTypeNameAndMapName(mapType,currentMapName);
-//        pointPane.setTypeNameAndMapName(mapType,currentMapName);
-   	}
-
     @Override
     public MapSvgAttr updateBean() {
         MapSvgAttr currentAttr = editingPane.updateCurrentAttr();