From ad277d320f4258f79f668be97da4fe8e03f1f543 Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 14 Jun 2016 09:46:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug:96398=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/gui/style/AlignmentPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java index 9409cc5736..1985960f18 100644 --- a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java +++ b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java @@ -81,7 +81,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("StyleAlignment-Tooltips_Right"), + hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"),Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")}); hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); From c29cf4f5f1fac4ae4f7ef978dad19b48ade054ba Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 14 Jun 2016 11:33:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index 6f7d1e3b7b..5cf1bd1563 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2046,24 +2046,6 @@ public class RemoteEnv implements Env { } - private void readPlugins() throws Exception { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - HashMap para = new HashMap(); - para.put("op", "fr_remote_design"); - para.put("cmd", "design_plugins"); - - InputStream inputStream = postBytes2ServerB(out.toByteArray(), para); - String pluginsStr = IOUtils.inputStream2String(inputStream, EncodeConstants.ENCODING_UTF_8); - if (StringUtils.isNotBlank(pluginsStr) && pluginsStr.startsWith("[")) { - JSONArray jsonArray = new JSONArray(pluginsStr); - for (int i = 0; i < jsonArray.length(); i++) { - Plugin plugin = new Plugin(); - plugin.parseJSON(jsonArray.getJSONObject(i)); - PluginLoader.getLoader().addRemotePlugin(plugin); - } - } - } - private void readPluginLicenses() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); HashMap para = new HashMap(); @@ -2084,7 +2066,7 @@ public class RemoteEnv implements Env { @Override public void readPluginConfig() throws Exception { - readPlugins(); + PluginLoader.getLoader().readFromRemoteEnv(); readPluginLicenses(); } } \ No newline at end of file From f741aad4a49b9988c848b3d22ee4dcd466677d81 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 14 Jun 2016 12:12:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8A=A0=E8=BD=BD=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index 5cf1bd1563..dab9ec17e9 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2046,7 +2046,7 @@ public class RemoteEnv implements Env { } - private void readPluginLicenses() throws Exception { + public void readPluginLicenses() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); HashMap para = new HashMap(); para.put("op", "fr_remote_design"); @@ -2065,8 +2065,6 @@ public class RemoteEnv implements Env { } @Override - public void readPluginConfig() throws Exception { - PluginLoader.getLoader().readFromRemoteEnv(); - readPluginLicenses(); + public void checkAndRegisterLic(FileNode node, Plugin plugin) throws Exception { } } \ No newline at end of file