Merge remote-tracking branch 'origin/release/9.0' into release/9.0

designer/src/com/fr/start/Designer.java

@@ -1,6 +1,7 @@
 package com.fr.start;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.Env;
 import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.core.ActionFactory;
@@ -447,7 +448,8 @@ public class Designer extends BaseDesigner {
         InformationCollector collector = InformationCollector.getInstance();
         collector.collectStopTime();
         collector.saveXMLFile();
-        ServletContext.fireServletStopListener();
+        Env currentEnv = FRContext.getCurrentEnv();
+        currentEnv.doWhenServerShutDown();
     }
 
-}
+}

designer_base/src/com/fr/start/SplashWindow.java

@@ -1,46 +1,40 @@
 package com.fr.start;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Image;
-
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.OperatingSystem;
 import com.sun.awt.AWTUtilities;
 
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Image;
+
+
 public class SplashWindow extends JFrame {
 
     private SplashPane splash = null;
 
     @SuppressWarnings("LeakingThisInConstructor")
-    public  SplashWindow(SplashPane splashPane) {
+    public SplashWindow(SplashPane splashPane) {
         // alex:必须设置这个属性为true,才可以用透明背景
         System.setProperty("sun.java2d.noddraw", "true");
 
         this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));
 
-        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        this.setContentPane(defaultPane);
-
-        defaultPane.setBackground(new Color(0, 0, 0, 0));
         //slash pane
         this.splash = splashPane;
-        splash.setBackground(null);
-        Image image = splash.getSplashImage();
-        ImageIcon imageIcon = new ImageIcon(image);
+
         if (splash != null) {
-            defaultPane.add(splash, BorderLayout.CENTER);
+            splash.setBackground(null);
+            Image image = splash.getSplashImage();
+            ImageIcon imageIcon = new ImageIcon(image);
+            this.setContentPane(splash);
             this.setSize(new Dimension(imageIcon.getIconWidth(), imageIcon.getIconHeight()));
         } else {
-            defaultPane.add(new UILabel("Error, please contract: support@finereport.com"), BorderLayout.CENTER);
+            this.setContentPane(new UILabel("Error, please contract: support@finereport.com"));
             this.setSize(new Dimension(480, 320));
         }
 
@@ -50,9 +44,9 @@ public class SplashWindow extends JFrame {
 
         //使窗体背景透明
         if (OperatingSystem.isWindows()) {
-            this.setBackground(new Color(0,0,0,0));
+            this.setBackground(new Color(0, 0, 0, 0));
         }
-        
+
         GUICoreUtils.centerWindow(this);
         this.setVisible(true);
     }
@@ -62,8 +56,8 @@ public class SplashWindow extends JFrame {
      */
     public void dispose() {
         super.dispose();
-        if(this.splash != null){
-        	this.splash.releaseTimer();
+        if (this.splash != null) {
+            this.splash.releaseTimer();
         }
     }