|
|
@ -69,9 +69,6 @@ public class DesignUtils { |
|
|
|
|
|
|
|
|
|
|
|
private static Integer port; |
|
|
|
private static Integer port; |
|
|
|
|
|
|
|
|
|
|
|
private static final String TURE = "true"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static final String DEBUG = "debug"; |
|
|
|
|
|
|
|
private static boolean started = false; |
|
|
|
private static boolean started = false; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -84,11 +81,7 @@ public class DesignUtils { |
|
|
|
|
|
|
|
|
|
|
|
public synchronized static int getPort() { |
|
|
|
public synchronized static int getPort() { |
|
|
|
if (port == null) { |
|
|
|
if (port == null) { |
|
|
|
if (ComparatorUtils.equals(TURE, System.getProperty(DEBUG))) { |
|
|
|
setPort(DesignerPort.getInstance().getMessagePort()); |
|
|
|
setPort(DesignerPort.getInstance().getDebugMessagePort()); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
setPort(DesignerPort.getInstance().getMessagePort()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return port; |
|
|
|
return port; |
|
|
|
} |
|
|
|
} |
|
|
@ -230,7 +223,7 @@ public class DesignUtils { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void run() { |
|
|
|
public void run() { |
|
|
|
DesignerStartupContext context = DesignerStartupContext.getInstance(); |
|
|
|
DesignerStartupContext context = DesignerStartupContext.getInstance(); |
|
|
|
|
|
|
|
|
|
|
|
// 如果在启动页展示中
|
|
|
|
// 如果在启动页展示中
|
|
|
|
if (DesignerStartupUtil.openTemplateIfOnWaiting(f)) { |
|
|
|
if (DesignerStartupUtil.openTemplateIfOnWaiting(f)) { |
|
|
|
return; |
|
|
|
return; |
|
|
@ -240,7 +233,7 @@ public class DesignUtils { |
|
|
|
// 之前就有这样的问题
|
|
|
|
// 之前就有这样的问题
|
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 打开模板
|
|
|
|
// 打开模板
|
|
|
|
DesignerContext.getDesignerFrame().openTemplate(new FileFILE(f)); |
|
|
|
DesignerContext.getDesignerFrame().openTemplate(new FileFILE(f)); |
|
|
|
} |
|
|
|
} |
|
|
@ -493,6 +486,7 @@ public class DesignUtils { |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 获取设计器可用字体 |
|
|
|
* 获取设计器可用字体 |
|
|
|
|
|
|
|
* |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public static String[] getAvailableFontFamilyNames4Report() { |
|
|
|
public static String[] getAvailableFontFamilyNames4Report() { |
|
|
|