Browse Source

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

master
MoMeak 7 years ago
parent
commit
de816e76fd
  1. 4
      designer/src/com/fr/start/Designer.java
  2. 28
      designer_base/src/com/fr/start/SplashWindow.java

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

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

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

@ -1,21 +1,18 @@
package com.fr.start; 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.base.BaseUtils;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.OperatingSystem; import com.fr.stable.OperatingSystem;
import com.sun.awt.AWTUtilities; 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 { public class SplashWindow extends JFrame {
private SplashPane splash = null; private SplashPane splash = null;
@ -27,20 +24,17 @@ public class SplashWindow extends JFrame {
this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); 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 //slash pane
this.splash = splashPane; this.splash = splashPane;
if (splash != null) {
splash.setBackground(null); splash.setBackground(null);
Image image = splash.getSplashImage(); Image image = splash.getSplashImage();
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
if (splash != null) { this.setContentPane(splash);
defaultPane.add(splash, BorderLayout.CENTER);
this.setSize(new Dimension(imageIcon.getIconWidth(), imageIcon.getIconHeight())); this.setSize(new Dimension(imageIcon.getIconWidth(), imageIcon.getIconHeight()));
} else { } 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)); this.setSize(new Dimension(480, 320));
} }

Loading…
Cancel
Save