From 59cc6264ba04e2c0e6f83ff93879ec10d4a52a5c Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 1 Sep 2016 14:32:53 +0800 Subject: [PATCH] update --- .../src/com/fr/design/extra/PluginHelper.java | 1 - .../src/com/fr/design/extra/PluginManagerPane.java | 6 +++--- .../src/com/fr/design/extra/PluginWebBridge.java | 1 - .../com/fr/design/mainframe/chart/ChartEditPane.java | 10 ---------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 0b4257885..8bab17e68 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -30,7 +30,6 @@ public class PluginHelper { private static final String TEMP_PATH = System.getProperty("user.dir") + "/tmp"; public static final String DOWNLOAD_PATH = System.getProperty("user.dir") + "/download"; public static final String TEMP_FILE = "temp.zip"; - public static final String PHANTOM_PATH = "http://ocrpz63ed.bkt.clouddn.com/phantomjs.zip"; /** * 下载插件 diff --git a/designer_base/src/com/fr/design/extra/PluginManagerPane.java b/designer_base/src/com/fr/design/extra/PluginManagerPane.java index effa66f57..1c9f7aafa 100644 --- a/designer_base/src/com/fr/design/extra/PluginManagerPane.java +++ b/designer_base/src/com/fr/design/extra/PluginManagerPane.java @@ -39,11 +39,11 @@ public class PluginManagerPane extends BasicPane { setLayout(new BorderLayout()); if (StableUtils.getMajorJavaVersion() == 8) { String installHome; - /*if (StableUtils.isDebug()) { + if (StableUtils.isDebug()) { URL url = ClassLoader.getSystemResource(""); installHome = url.getPath(); addPane(installHome); - } else {*/ + } else { installHome = StableUtils.getInstallHome(); File file = new File(StableUtils.pathJoin(installHome, "scripts")); if (!file.exists()) { @@ -61,7 +61,7 @@ public class PluginManagerPane extends BasicPane { addPane(installHome); updateShopScripts(); } - /*}*/ + } } else { initTraditionalStore(); } diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index 0e03a6e70..39f7945b7 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -4,7 +4,6 @@ import com.fr.base.FRContext; import com.fr.design.RestartHelper; import com.fr.design.dialog.UIDialog; import com.fr.design.extra.exe.*; -import com.fr.design.extra.pre4plugin.InstallPhantomJs; import com.fr.design.extra.pre4plugin.PluginFactory; import com.fr.design.extra.pre4plugin.PreEnv4Plugin; import com.fr.general.FRLogger; diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 7cbc87ca9..c3a2e1d50 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -254,16 +254,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } } - /** - * 响应事件. - */ - public void repaint() { - if (container != null && container.getEPane() != null) { - container.getEPane().validate(); - container.getEPane().repaint(); - } - } - public int getSelectedChartIndex(Chart chart){ int index = 0; if(typePane != null){