From 7dbe35bb7ab7f923bdf94d6c69be41f370435e47 Mon Sep 17 00:00:00 2001 From: kerry Date: Sat, 27 Aug 2016 09:32:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=9C=A8=E5=AE=89=E8=A3=85=E6=8F=92=E4=BB=B6=E6=97=B6=E5=81=9A?= =?UTF-8?q?=E7=9A=84=E5=85=B6=E4=BB=96=E6=93=8D=E4=BD=9C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginHelper.java | 7 +++++++ .../fun/PluginInstallOptionProcessor.java | 19 ++++++++++++++++++ .../AbstractPluginInstallOptionProcessor.java | 20 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java create mode 100644 designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 8bab17e68..c5fa5fcfb 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -3,6 +3,8 @@ package com.fr.design.extra; import com.fr.base.Env; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; +import com.fr.design.ExtraDesignClassManager; +import com.fr.design.fun.PluginInstallOptionProcessor; import com.fr.general.*; import com.fr.general.http.HttpClient; import com.fr.plugin.Plugin; @@ -192,6 +194,11 @@ public class PluginHelper { if (plugin == null) { throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Illegal_Plugin_Zip_Cannot_Be_Install")); } + PluginInstallOptionProcessor processor = ExtraDesignClassManager.getInstance().getSingle(PluginInstallOptionProcessor.MARK_STRING); + if (processor != null) { + processor.pluginInstallOption(); + } + if (PluginLoader.getLoader().isInstalled(plugin)) { throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Has_Been_Installed")); } diff --git a/designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java b/designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java new file mode 100644 index 000000000..6302fe5c3 --- /dev/null +++ b/designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java @@ -0,0 +1,19 @@ +package com.fr.design.fun; + +import com.fr.stable.fun.mark.Immutable; + +/** + * Created by Administrator on 2016/8/26. + */ +public interface PluginInstallOptionProcessor extends Immutable { + + String MARK_STRING = "PluginInstallOptionProcessor"; + + int CURRENT_LEVEL = 1; + + /** + * 安裝插件時的其他操作 + */ + void pluginInstallOption() throws Exception; +} + diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java new file mode 100644 index 000000000..385da7252 --- /dev/null +++ b/designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java @@ -0,0 +1,20 @@ +package com.fr.design.fun.impl; + +import com.fr.design.fun.PluginInstallOptionProcessor; +import com.fr.stable.fun.mark.API; + +/** + * Created by Administrator on 2016/8/26. + */ +@API(level = PluginInstallOptionProcessor.CURRENT_LEVEL) +public abstract class AbstractPluginInstallOptionProcessor implements PluginInstallOptionProcessor{ + public int currentAPILevel() { + return CURRENT_LEVEL; + } + + public int layerIndex() { + return DEFAULT_LAYER_INDEX; + } + + +} From 89ce432aaa1ec6182e1b0bce53a867bec47ef055 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 29 Aug 2016 10:05:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginHelper.java | 7 ------- .../fun/PluginInstallOptionProcessor.java | 19 ------------------ .../AbstractPluginInstallOptionProcessor.java | 20 ------------------- 3 files changed, 46 deletions(-) delete mode 100644 designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java delete mode 100644 designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index c5fa5fcfb..8bab17e68 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -3,8 +3,6 @@ package com.fr.design.extra; import com.fr.base.Env; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; -import com.fr.design.ExtraDesignClassManager; -import com.fr.design.fun.PluginInstallOptionProcessor; import com.fr.general.*; import com.fr.general.http.HttpClient; import com.fr.plugin.Plugin; @@ -194,11 +192,6 @@ public class PluginHelper { if (plugin == null) { throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Illegal_Plugin_Zip_Cannot_Be_Install")); } - PluginInstallOptionProcessor processor = ExtraDesignClassManager.getInstance().getSingle(PluginInstallOptionProcessor.MARK_STRING); - if (processor != null) { - processor.pluginInstallOption(); - } - if (PluginLoader.getLoader().isInstalled(plugin)) { throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Has_Been_Installed")); } diff --git a/designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java b/designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java deleted file mode 100644 index 6302fe5c3..000000000 --- a/designer_base/src/com/fr/design/fun/PluginInstallOptionProcessor.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fr.design.fun; - -import com.fr.stable.fun.mark.Immutable; - -/** - * Created by Administrator on 2016/8/26. - */ -public interface PluginInstallOptionProcessor extends Immutable { - - String MARK_STRING = "PluginInstallOptionProcessor"; - - int CURRENT_LEVEL = 1; - - /** - * 安裝插件時的其他操作 - */ - void pluginInstallOption() throws Exception; -} - diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java deleted file mode 100644 index 385da7252..000000000 --- a/designer_base/src/com/fr/design/fun/impl/AbstractPluginInstallOptionProcessor.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fr.design.fun.impl; - -import com.fr.design.fun.PluginInstallOptionProcessor; -import com.fr.stable.fun.mark.API; - -/** - * Created by Administrator on 2016/8/26. - */ -@API(level = PluginInstallOptionProcessor.CURRENT_LEVEL) -public abstract class AbstractPluginInstallOptionProcessor implements PluginInstallOptionProcessor{ - public int currentAPILevel() { - return CURRENT_LEVEL; - } - - public int layerIndex() { - return DEFAULT_LAYER_INDEX; - } - - -} From b07345407484dca0b4794a29eb71888d0735950b Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 19 Sep 2016 16:18:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E6=96=87=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E6=8A=A5=E8=A1=A8Web=E5=B1=9E=E6=80=A7=5F?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE=E6=8E=92?= =?UTF-8?q?=E7=89=88=E9=97=AE=E9=A2=98=EF=BC=8C=E6=8A=8A=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E6=8E=92=E6=8C=89=E9=92=AE=E9=81=AE=E4=BD=8F=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E8=AE=BE=E7=BD=AE=E6=B0=B4=E5=B9=B3=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/icontainer/UIScrollPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIScrollPane.java b/designer_base/src/com/fr/design/gui/icontainer/UIScrollPane.java index 62a580c38..5c71efc7a 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIScrollPane.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIScrollPane.java @@ -15,7 +15,7 @@ public class UIScrollPane extends JScrollPane { private static final long serialVersionUID = 1L; public UIScrollPane(Component c) { - super(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + super(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); this.setHorizontalScrollBar(createHorizontalScrollBar()); this.getVerticalScrollBar().setUnitIncrement(30); this.getVerticalScrollBar().setBlockIncrement(30);