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
*/
public static boolean isStarted() {
// try {
// new Socket("localhost", port);
// return true;
// } catch (Exception exp) {
//
// }
try {
new Socket("localhost", port);
return true;
} catch (Exception exp) {
}
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
context.setLoader(new FRTomcatLoader());
//直接指定initializer,tomcat就不用再扫描一遍了
SpringServletContainerInitializer initializer = new SpringServletContainerInitializer();
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;
}
@Override
public boolean getError() {
return false;
}
@Override
public int getFrameCount() {
return gifCount;
}
@Override
public PlatformImage[] getFrames() {
return new PlatformImage[0];
}
@Override
public PlatformImage getFrame(int index) {
while (images[index] == null) {
@ -112,7 +122,6 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
return 0;
}
@Override
public Exception getException() {
return exception;
}

Loading…
Cancel
Save