Browse Source

update

master
Fangjie Hu 8 years ago
parent
commit
59cc6264ba
  1. 1
      designer_base/src/com/fr/design/extra/PluginHelper.java
  2. 6
      designer_base/src/com/fr/design/extra/PluginManagerPane.java
  3. 1
      designer_base/src/com/fr/design/extra/PluginWebBridge.java
  4. 10
      designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

1
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"; 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 DOWNLOAD_PATH = System.getProperty("user.dir") + "/download";
public static final String TEMP_FILE = "temp.zip"; public static final String TEMP_FILE = "temp.zip";
public static final String PHANTOM_PATH = "http://ocrpz63ed.bkt.clouddn.com/phantomjs.zip";
/** /**
* 下载插件 * 下载插件

6
designer_base/src/com/fr/design/extra/PluginManagerPane.java

@ -39,11 +39,11 @@ public class PluginManagerPane extends BasicPane {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
if (StableUtils.getMajorJavaVersion() == 8) { if (StableUtils.getMajorJavaVersion() == 8) {
String installHome; String installHome;
/*if (StableUtils.isDebug()) { if (StableUtils.isDebug()) {
URL url = ClassLoader.getSystemResource(""); URL url = ClassLoader.getSystemResource("");
installHome = url.getPath(); installHome = url.getPath();
addPane(installHome); addPane(installHome);
} else {*/ } else {
installHome = StableUtils.getInstallHome(); installHome = StableUtils.getInstallHome();
File file = new File(StableUtils.pathJoin(installHome, "scripts")); File file = new File(StableUtils.pathJoin(installHome, "scripts"));
if (!file.exists()) { if (!file.exists()) {
@ -61,7 +61,7 @@ public class PluginManagerPane extends BasicPane {
addPane(installHome); addPane(installHome);
updateShopScripts(); updateShopScripts();
} }
/*}*/ }
} else { } else {
initTraditionalStore(); initTraditionalStore();
} }

1
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.RestartHelper;
import com.fr.design.dialog.UIDialog; import com.fr.design.dialog.UIDialog;
import com.fr.design.extra.exe.*; 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.PluginFactory;
import com.fr.design.extra.pre4plugin.PreEnv4Plugin; import com.fr.design.extra.pre4plugin.PreEnv4Plugin;
import com.fr.general.FRLogger; import com.fr.general.FRLogger;

10
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){ public int getSelectedChartIndex(Chart chart){
int index = 0; int index = 0;
if(typePane != null){ if(typePane != null){

Loading…
Cancel
Save