conflict

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -15,6 +15,7 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.utils.DesignUtils;
 import com.fr.license.exception.RegistEditionException;
 import com.fr.log.FineLoggerFactory;
+import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
@@ -110,6 +111,10 @@ public class SwitchExistEnv extends MenuDef {
                         DesignUtils.refreshDesignerFrame();
                         HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                         fireDSChanged();
+                        if (WorkContext.getCurrent().isLocal()) {
+                            //初始化一下serverTray
+                            ServerTray.init();
+                        }
                     }
                 });
             } catch (AuthException exception) {

designer-base/src/main/java/com/fr/start/server/ServerTray.java

@@ -17,32 +17,32 @@ import java.awt.event.MouseEvent;
  * Create server tray.
  */
 public class ServerTray {
-    
+
     private static ServerTray INSTANCE;
-    
+
     private MenuItem startMenu;
-    
+
     private MenuItem stopMenu;
-    
+
     private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted.png");
-    
+
     private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped.png");
-    
+
     private ServerManageFrame serverManageFrame;
-    
+
     private TrayIcon trayIcon;
-    
+
-    
+
     private ServerTray() {
-    
+
         listen();
         //p:首先构建右键菜单
         PopupMenu popup = new PopupMenu();
         MenuItem manangeMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Open_Service_Manager"));
         manangeMenu.addActionListener(new ActionListener() {
-        
+
             public void actionPerformed(ActionEvent e) {
-            
+
                 serverManageFrame = ServerManageFrame.getServerManageFrame();
                 if (!serverManageFrame.isVisible()) {
                     serverManageFrame.setVisible(true);
@@ -55,9 +55,9 @@ public class ServerTray {
         MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit"));
         //创建打开监听器
         ActionListener startListener = new ActionListener() {
-        
+
             public void actionPerformed(ActionEvent e) {
-            
+
                 try {
                     FineEmbedServer.start();
                 } catch (Exception exp) {
@@ -66,9 +66,9 @@ public class ServerTray {
             }
         };
         ActionListener stopListener = new ActionListener() {
-        
+
             public void actionPerformed(ActionEvent e) {
-            
+
                 try {
                     FineEmbedServer.stop();
                 } catch (Throwable exp) {
@@ -80,13 +80,13 @@ public class ServerTray {
         stopMenu.addActionListener(stopListener);
         //创建退出菜单监听器
         ActionListener exitListener = new ActionListener() {
-        
+
             public void actionPerformed(ActionEvent e) {
-            
+
                 exit();
             }
         };
-    
+
         exitMenu.addActionListener(exitListener);
         popup.add(manangeMenu);
         popup.addSeparator();
@@ -94,18 +94,18 @@ public class ServerTray {
         popup.add(stopMenu);
         popup.addSeparator();
         popup.add(exitMenu);
-    
+
         //p:开始创建托盘.
         trayIcon = new TrayIcon(trayStartedImage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server"), popup);
         trayIcon.setImageAutoSize(true);
         trayIcon.addMouseListener(new MouseAdapter() {
-        
+
             public void mouseClicked(MouseEvent e) {
-            
+
                 if (e.getClickCount() < 2) {
                     return;
                 }
-            
+
                 ServerManageFrame serverManageFrame = ServerManageFrame.getServerManageFrame();
                 if (!serverManageFrame.isVisible()) {
                     serverManageFrame.setVisible(true);
@@ -113,56 +113,56 @@ public class ServerTray {
                 serverManageFrame.toFront();//p:到第一个.
             }
         });
-    
+
         TrayIcon[] icons = SystemTray.getSystemTray().getTrayIcons();
         for (TrayIcon icon : icons) {
             SystemTray.getSystemTray().remove(icon);
         }
-    
+
         try {
             SystemTray.getSystemTray().add(trayIcon);
         } catch (AWTException e) {
             System.err.println("Can not create the System Tray:" + e);
         }
-    
+
         checkPopupMenuItemEnabled();
     }
-    
+
     private void listen() {
-        
+
         ListenerAdaptor listenerAdaptor = new ListenerAdaptor() {
-            
+
             @Override
             protected void on(Event event) {
-                
+
                 checkPopupMenuItemEnabled();
             }
         };
         EventDispatcher.listen(EmbedServerEvent.AfterStart, listenerAdaptor);
         EventDispatcher.listen(EmbedServerEvent.AfterStop, listenerAdaptor);
     }
-    
+
     private void exit() {
-    
+
         FineEmbedServer.stop();
         SystemTray.getSystemTray().remove(trayIcon);
     }
-    
+
     private void checkPopupMenuItemEnabled() {
-        
+
         try {
             if (FineEmbedServer.isRunning()) {
                 startMenu.setEnabled(false);
                 stopMenu.setEnabled(true);
-                
+
                 trayIcon.setImage(trayStartedImage);
             } else {
                 startMenu.setEnabled(true);
                 stopMenu.setEnabled(false);
-                
+
                 trayIcon.setImage(trayStoppedImage);
             }
-            
+
             if (serverManageFrame != null) {
                 serverManageFrame.checkButtonEnabled();
                 serverManageFrame.repaint();
@@ -171,10 +171,9 @@ public class ServerTray {
             FRContext.getLogger().error(exp.getMessage(), exp);
         }
     }
-    
+
     public static void init() {
-        
+        if (INSTANCE == null)
-        INSTANCE = new ServerTray();
+            INSTANCE = new ServerTray();
-        
     }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @return 返回标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData");
 	}
 
 

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@@ -54,7 +54,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
 
 
         this.setLayout(new BorderLayout());

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

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.actions.file.newReport.NewPolyReportAction;
@@ -102,6 +103,7 @@ public class Designer extends BaseDesigner {
             DesignUtils.clientSend(args);
             return;
         }
+        RestartHelper.deleteRecordFilesWhenStart();
 
         preloadResource();
 

designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

@@ -23,7 +23,6 @@ public class PreStartActivator extends Activator {
     @Override
     public void start() {
 
-        RestartHelper.deleteRecordFilesWhenStart();
         CloudCenter.getInstance();
         if (checkMultiStart()) {
             return;