Browse Source

Merge pull request #169 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'cc81c091b2eb90892fa3d300824c34fc85430278':
  fix bug
  REPORT-8347 REPORT-8999 REPORT-9115
master
Mata.Li 6 years ago
parent
commit
21f9e748d8
  1. 6
      designer-base/src/com/fr/design/env/LocalDesignerWorkspaceInfo.java
  2. 6
      designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
  3. 6
      designer-base/src/com/fr/start/server/FineEmbedServerActivator.java
  4. 10
      designer-realize/src/com/fr/start/Designer.java

6
designer-base/src/com/fr/design/env/LocalDesignerWorkspaceInfo.java vendored

@ -1,5 +1,7 @@
package com.fr.design.env; package com.fr.design.env;
import com.fr.general.NameObject;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader; import com.fr.stable.xml.XMLableReader;
@ -63,6 +65,8 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
@Override @Override
public Object clone() throws CloneNotSupportedException { public Object clone() throws CloneNotSupportedException {
return null; LocalDesignerWorkspaceInfo object = (LocalDesignerWorkspaceInfo)super.clone();
return object;
} }
} }

6
designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java vendored

@ -1,6 +1,7 @@
package com.fr.design.env; package com.fr.design.env;
import com.fr.security.SecurityToolbox; import com.fr.security.SecurityToolbox;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader; import com.fr.stable.xml.XMLableReader;
@ -76,6 +77,9 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
@Override @Override
public Object clone() throws CloneNotSupportedException { public Object clone() throws CloneNotSupportedException {
return null; RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo)super.clone();
object.connection = (WorkspaceConnection)StableUtils.cloneObject(this.connection);
return object;
} }
} }

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

@ -13,8 +13,8 @@ import com.fr.workspace.WorkContext;
import org.apache.catalina.Context; import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleException;
import org.apache.catalina.Wrapper; import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.loader.VirtualWebappLoader; import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat;
import java.io.File; import java.io.File;
@ -112,7 +112,7 @@ public class FineEmbedServerActivator extends Activator {
* Created by juhaoyu on 2018/6/5. * Created by juhaoyu on 2018/6/5.
* 自定义的tomcat loader主要用于防止内置服务器再加载一遍class * 自定义的tomcat loader主要用于防止内置服务器再加载一遍class
*/ */
private static class FRTomcatLoader extends VirtualWebappLoader { private static class FRTomcatLoader extends WebappLoader {
@Override @Override
public ClassLoader getClassLoader() { public ClassLoader getClassLoader() {

10
designer-realize/src/com/fr/start/Designer.java

@ -37,7 +37,6 @@ import com.fr.design.menu.ShortCut;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.design.utils.concurrent.ThreadFactoryBuilder; import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.CloudCenter; import com.fr.general.CloudCenter;
@ -97,15 +96,20 @@ public class Designer extends BaseDesigner {
* @param args 参数 * @param args 参数
*/ */
public static void main(String[] args) { public static void main(String[] args) {
BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
preloadResource();
SplashContext.getInstance().registerSplash(createSplash());
// 如果端口被占用了 说明程序已经运行了一次,也就是说,已经建立一个监听服务器,现在只要给服务器发送命令就好了 // 如果端口被占用了 说明程序已经运行了一次,也就是说,已经建立一个监听服务器,现在只要给服务器发送命令就好了
if (DesignUtils.isStarted()) { if (DesignUtils.isStarted()) {
DesignUtils.clientSend(args); DesignUtils.clientSend(args);
return; return;
} }
preloadResource();
SplashContext.getInstance().registerSplash(createSplash());
SplashContext.getInstance().show(); SplashContext.getInstance().show();
Module designerRoot = ModuleContext.parseRoot("designer-startup.xml"); Module designerRoot = ModuleContext.parseRoot("designer-startup.xml");
//传递启动参数 //传递启动参数

Loading…
Cancel
Save