From 9ec37b7e4f7f07fe790471d3a839e234776ac659 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 28 Jun 2018 09:38:44 +0800 Subject: [PATCH 1/4] REPORT-8347 REPORT-8999 REPORT-9115 --- .../com/fr/design/env/LocalDesignerWorkspaceInfo.java | 6 +++++- .../com/fr/design/env/RemoteDesignerWorkspaceInfo.java | 7 +++++-- .../com/fr/start/server/FineEmbedServerActivator.java | 6 +++--- designer-realize/src/com/fr/start/Designer.java | 10 +++++++--- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/designer-base/src/com/fr/design/env/LocalDesignerWorkspaceInfo.java b/designer-base/src/com/fr/design/env/LocalDesignerWorkspaceInfo.java index 87e556d92..648f3c233 100644 --- a/designer-base/src/com/fr/design/env/LocalDesignerWorkspaceInfo.java +++ b/designer-base/src/com/fr/design/env/LocalDesignerWorkspaceInfo.java @@ -1,5 +1,7 @@ package com.fr.design.env; +import com.fr.general.NameObject; +import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; @@ -63,6 +65,8 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo { @Override public Object clone() throws CloneNotSupportedException { - return null; + LocalDesignerWorkspaceInfo object = (LocalDesignerWorkspaceInfo)super.clone(); + + return object; } } diff --git a/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java index 7266cf0d7..c5a097f61 100644 --- a/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java +++ b/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java @@ -1,5 +1,6 @@ package com.fr.design.env; +import com.fr.general.NameObject; import com.fr.security.SecurityToolbox; import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLPrintWriter; @@ -75,7 +76,9 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { @Override public Object clone() throws CloneNotSupportedException { - - return null; + + RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo)super.clone(); + + return object; } } diff --git a/designer-base/src/com/fr/start/server/FineEmbedServerActivator.java b/designer-base/src/com/fr/start/server/FineEmbedServerActivator.java index 1d76fd3fe..2292da99a 100644 --- a/designer-base/src/com/fr/start/server/FineEmbedServerActivator.java +++ b/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.LifecycleException; 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 java.io.File; @@ -112,7 +112,7 @@ public class FineEmbedServerActivator extends Activator { * Created by juhaoyu on 2018/6/5. * 自定义的tomcat loader，主要用于防止内置服务器再加载一遍class */ - private static class FRTomcatLoader extends VirtualWebappLoader { + private static class FRTomcatLoader extends WebappLoader { @Override public ClassLoader getClassLoader() { diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java index cc17dd692..f9697ff26 100644 --- a/designer-realize/src/com/fr/start/Designer.java +++ b/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.utils.DesignUtils; - import com.fr.design.utils.concurrent.ThreadFactoryBuilder; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.CloudCenter; @@ -97,15 +96,20 @@ public class Designer extends BaseDesigner { * @param args 参数 */ public static void main(String[] args) { + BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); - preloadResource(); - SplashContext.getInstance().registerSplash(createSplash()); + // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了 if (DesignUtils.isStarted()) { DesignUtils.clientSend(args); return; } + + preloadResource(); + + SplashContext.getInstance().registerSplash(createSplash()); + SplashContext.getInstance().show(); Module designerRoot = ModuleContext.parseRoot("designer-startup.xml"); //传递启动参数 From cc81c091b2eb90892fa3d300824c34fc85430278 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 28 Jun 2018 10:37:17 +0800 Subject: [PATCH 2/4] fix bug --- .../src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java index c5a097f61..8954f483b 100644 --- a/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java +++ b/designer-base/src/com/fr/design/env/RemoteDesignerWorkspaceInfo.java @@ -1,7 +1,7 @@ package com.fr.design.env; -import com.fr.general.NameObject; import com.fr.security.SecurityToolbox; +import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; @@ -79,6 +79,7 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo)super.clone(); + object.connection = (WorkspaceConnection)StableUtils.cloneObject(this.connection); return object; } } From f124170523ffa20074cc5541bc8025d4491c369d Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 28 Jun 2018 12:01:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-9232=20=E3=80=9010.0=E4=B8=80?= =?UTF-8?q?=E8=BD=AE=E5=9B=9E=E5=BD=92=E3=80=91=E6=8C=89=E9=92=AE=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/style/background/impl/ImageBackgroundPane.java | 3 ++- .../style/background/impl/ImageButtonBackgroundPane.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java b/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java index cd35373bf..fdbb2d4ac 100644 --- a/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java +++ b/designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java @@ -2,6 +2,7 @@ package com.fr.design.style.background.impl; import com.fr.base.Style; import com.fr.base.background.ImageBackground; +import com.fr.base.background.ImageFileBackground; import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; @@ -192,7 +193,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { @Override public Background update() throws Exception { - ImageBackground imageBackground = new ImageBackground(previewPane.getImageWithSuffix()); + ImageBackground imageBackground = new ImageFileBackground(previewPane.getImageWithSuffix()); setImageStyle(); imageBackground.setLayout(imageStyle.getImageLayout()); return imageBackground; diff --git a/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java b/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java index 3e8540a3c..fe0cadaa5 100644 --- a/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java +++ b/designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java @@ -2,6 +2,7 @@ package com.fr.design.style.background.impl; import com.fr.base.Style; import com.fr.base.background.ImageBackground; +import com.fr.base.background.ImageFileBackground; import com.fr.design.gui.ibutton.UIButton; import com.fr.general.Background; import com.fr.general.Inter; @@ -81,6 +82,6 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane { if (previewPane.getImage() == null) { return null; } - return new ImageBackground(previewPane.getImageWithSuffix()); + return new ImageFileBackground(previewPane.getImageWithSuffix()); } } From ecbd21be76a5f580debcd51ff2caffe98062f0ca Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 28 Jun 2018 14:07:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-9257=20=E3=80=9010.0=E9=9B=86?= =?UTF-8?q?=E7=BE=A4=E3=80=91=E3=80=90=E6=80=A7=E8=83=BD=E3=80=91500?= =?UTF-8?q?=E5=B9=B6=E5=8F=91=E5=8E=8B=E6=B5=8B5w*5=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=8A=82=E7=82=B9=E5=AE=95=E6=9C=BA=20?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E7=BA=BF=E7=A8=8B=E5=8D=A1=E5=9C=A8ReportCla?= =?UTF-8?q?ssMananger.getInstance()=E4=BA=86=20todo=EF=BC=9A=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E6=95=B4=E7=90=86=E4=B8=8B=E8=BF=99=E5=87=A0=E4=B8=AA?= =?UTF-8?q?ClassManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/ExtraDesignClassManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/com/fr/design/ExtraDesignClassManager.java b/designer-base/src/com/fr/design/ExtraDesignClassManager.java index bfef815c8..9529994f5 100644 --- a/designer-base/src/com/fr/design/ExtraDesignClassManager.java +++ b/designer-base/src/com/fr/design/ExtraDesignClassManager.java @@ -46,8 +46,8 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement private static ExtraDesignClassManager classManager = new ExtraDesignClassManager(); private Set shortCuts = new CloseableContainedSet<>(HashSet.class); - - public synchronized static ExtraDesignClassManager getInstance() { + + public static ExtraDesignClassManager getInstance() { return classManager; }