From f8593274e6d79f8417f6e00e9493b46d6f2670a5 Mon Sep 17 00:00:00 2001 From: richie Date: Sat, 31 Aug 2019 09:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E5=BC=80=E6=94=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/beans/BasicBeanPane.java | 52 ++++++++----------- .../fr/design/beans/FurtherBasicBeanPane.java | 6 +-- .../com/fr/design/dialog/BasicDialog.java | 6 +-- .../java/com/fr/design/dialog/BasicPane.java | 17 ++---- .../fr/design/dialog/DialogActionAdapter.java | 3 ++ .../design/dialog/DialogActionListener.java | 11 ++-- .../java/com/fr/design/dialog/UIDialog.java | 8 +-- .../com/fr/design/mainframe/MapEditPane.java | 9 ---- 8 files changed, 44 insertions(+), 68 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java b/designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java index 2fb7737c3..2953def52 100644 --- a/designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java +++ b/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 extends BasicPane { - + /** + * 展示数据 + * @param ob 待展示的对象 + */ + public abstract void populateBean(T ob); - /** - * Populate. - */ - public abstract void populateBean(T ob); + /** + * 保存数据 + * @return 待保存的对象 + */ + public abstract T updateBean(); - /** - * Update. - */ - public abstract T updateBean(); + /** + * 保存数据 + * @param ob 待保存的对象 + */ + public void updateBean(T ob) { - public void updateBean(T ob) { + } - } - - /** - * 更新权限工具栏面板 - */ - public void populateAuthority() { - - } - - /** - * 仅用来处理图表设计器的地图面板 - * @param mapType 地图类型 - */ - public void dealWidthMap(String mapType){ - - } + /** + * 更新权限工具栏面板 + */ + public void populateAuthority() { + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java b/designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java index adec741c2..8f7d0e403 100644 --- a/designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java +++ b/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 extends BasicBeanPane { /** * 是否是指定类型 diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java b/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java index 462a2d311..3b3b1d620 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java +++ b/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); diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java b/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java index d752f58f0..e684d81f6 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java +++ b/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 { /** diff --git a/designer-base/src/main/java/com/fr/design/dialog/DialogActionAdapter.java b/designer-base/src/main/java/com/fr/design/dialog/DialogActionAdapter.java index 5f188f0bd..7b44b90b0 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/DialogActionAdapter.java +++ b/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() {} diff --git a/designer-base/src/main/java/com/fr/design/dialog/DialogActionListener.java b/designer-base/src/main/java/com/fr/design/dialog/DialogActionListener.java index 5628918de..a6cf19345 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/DialogActionListener.java +++ b/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(); - - public void doCancel(); + + void doOk(); + + void doCancel(); } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index 7de66602a..c4e07e967 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/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"; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java index ddb54b532..307d457cf 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java @@ -96,15 +96,6 @@ public class MapEditPane extends BasicBeanPane{ } - /** - * 再图片面板设置类型和名字 - * @param mapType 地图类型 - */ - public void dealWidthMap(String mapType){ - areaPane.setTypeNameAndMapName(mapType,currentMapName); -// pointPane.setTypeNameAndMapName(mapType,currentMapName); - } - @Override public MapSvgAttr updateBean() { MapSvgAttr currentAttr = editingPane.updateCurrentAttr();