Browse Source

REPORT-14020 可以重复打开设计器 调试的代码上次误传了

10.0^2
XiaXiang 6 years ago
parent
commit
525837842c
  1. 12
      designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
  2. 1
      designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
  3. 11
      designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java

12
designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@ -65,12 +65,12 @@ public class DesignUtils {
* @return 启动了返回true * @return 启动了返回true
*/ */
public static boolean isStarted() { public static boolean isStarted() {
// try { try {
// new Socket("localhost", port); new Socket("localhost", port);
// return true; return true;
// } catch (Exception exp) { } catch (Exception exp) {
//
// } }
return false; return false;
} }

1
designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java

@ -68,6 +68,7 @@ public class FineEmbedServerActivator extends Activator {
//覆盖tomcat的WebAppClassLoader //覆盖tomcat的WebAppClassLoader
context.setLoader(new FRTomcatLoader()); context.setLoader(new FRTomcatLoader());
//直接指定initializer,tomcat就不用再扫描一遍了 //直接指定initializer,tomcat就不用再扫描一遍了
SpringServletContainerInitializer initializer = new SpringServletContainerInitializer(); SpringServletContainerInitializer initializer = new SpringServletContainerInitializer();
Set<Class<?>> classes = new HashSet<Class<?>>(); Set<Class<?>> classes = new HashSet<Class<?>>();

11
designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java

@ -67,11 +67,21 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
return height; return height;
} }
@Override
public boolean getError() {
return false;
}
@Override @Override
public int getFrameCount() { public int getFrameCount() {
return gifCount; return gifCount;
} }
@Override
public PlatformImage[] getFrames() {
return new PlatformImage[0];
}
@Override @Override
public PlatformImage getFrame(int index) { public PlatformImage getFrame(int index) {
while (images[index] == null) { while (images[index] == null) {
@ -112,7 +122,6 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
return 0; return 0;
} }
@Override
public Exception getException() { public Exception getException() {
return exception; return exception;
} }

Loading…
Cancel
Save