Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -67,6 +67,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private static final int MAX_SHOW_NUM = 10;
     private static final String VERSION_80 = "80";
     private static final int CACHINGTEMPLATE_LIMIT = 5;
+    private static final String WEB_NAME = "webapps";
 
     private static DesignerEnvManager designerEnvManager; // gui.
     private String activationKey = null;
@@ -200,10 +201,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) {
             return;
         }
-        String installHome = StableUtils.getInstallHome();
+        String installHome =  StableUtils.getInstallHome();
         if (installHome != null && !".".equals(installHome)) {
             String name = Inter.getLocText("FR-Engine_DEFAULT");
-            String envPath = StableUtils.pathJoin(installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME);
+            String envPath = designerEnvManager.getDefaultenvPath(installHome);
             designerEnvManager.putEnv(name, LocalDesignerWorkspaceInfo.create(name, envPath));
             designerEnvManager.setCurEnvName(name);
         }
@@ -486,8 +487,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     public boolean isCurrentEnvDefault() {
 
         DesignerWorkspaceInfo current = this.getWorkspaceInfo(curEnvName);
-        String defaultEnvPath = StableUtils.pathJoin(new String[]{StableUtils.getInstallHome(), ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
+        String defaultEnvPath = getDefaultenvPath(StableUtils.getInstallHome());
-        return ComparatorUtils.equals(new File(defaultEnvPath).getPath(), current.getPath());
+        return ComparatorUtils.equals(defaultEnvPath, current.getPath());
     }
 
     /**
@@ -495,7 +496,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      */
     public DesignerWorkspaceInfo getDefaultConfig() {
         String installHome = StableUtils.getInstallHome();
-        String defaultenvPath = StableUtils.pathJoin(installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME);
+        String defaultenvPath = getDefaultenvPath(installHome);
         defaultenvPath = new File(defaultenvPath).getPath();
         Iterator<Entry<String, DesignerWorkspaceInfo>> entryIt = nameEnvMap.entrySet().iterator();
         while (entryIt.hasNext()) {
@@ -516,7 +517,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      */
     public String getDefaultEnvName() {
         String installHome = StableUtils.getInstallHome();
-        String defaultenvPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
+        String defaultenvPath = getDefaultenvPath(installHome);
         defaultenvPath = new File(defaultenvPath).getPath();
         if (nameEnvMap.size() >= 0) {
             Iterator<Entry<String, DesignerWorkspaceInfo>> entryIt = nameEnvMap.entrySet().iterator();
@@ -531,6 +532,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         return Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"});
     }
 
+
+    private String getDefaultenvPath(String installHome){
+        //这里需要转成反斜杠和生成默认路径一致
+        return  new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath();
+    }
     /**
      * 设置当前环境为默认
      */

designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java

@@ -32,6 +32,7 @@ public class WatermarkPreviewPane extends JPanel {
         super.paint(g);
         Graphics2D g2d = (Graphics2D)g;
         g2d.drawImage(UIConstants.WATERMARK_BACKGROUND, 0, 0, this.getWidth(), this.getHeight(), null);
-        new WatermarkPainter(watermark).paint(g2d, this.getWidth(), this.getHeight());
+        WatermarkPainter painter = WatermarkPainter.createPainter(watermark);
+        painter.paint(g2d, this.getWidth(), this.getHeight());
     }
 }

designer-base/src/main/java/com/fr/start/Demo.java

@@ -22,9 +22,6 @@ public class Demo {
         } else {
             executorPath = StableUtils.pathJoin(installHome, "bin", "designer.exe demo");
         }
-        if (!new java.io.File(executorPath).exists()) {
-            FRContext.getLogger().error(executorPath + " can not be found.");
-        }
 
         if (OperatingSystem.isMacOS()) {
             ProcessBuilder builder = new ProcessBuilder();

designer-base/src/main/java/com/fr/start/ServerStarter.java

@@ -22,6 +22,7 @@ import com.fr.stable.StringUtils;
 import com.fr.start.server.FineEmbedServer;
 import com.fr.workspace.WorkContext;
 
+
 import javax.swing.*;
 import java.awt.*;
 import java.io.IOException;
@@ -39,35 +40,16 @@ public class ServerStarter {
         if (!WorkContext.getCurrent().isLocal()) {
             //有问题，这里拿不到远程的http端口
             browser(WorkContext.getCurrent().getPath());
-            return;
         }
-        if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
+        else if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
             String web = GeneralContext.getCurrentAppNameOfEnv();
             browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName());
-            return;
+        }else{
-        }
-        DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
-        if (!envManager.isCurrentEnvDefault()) {
-            InformationPane inf = new InformationPane(envManager.getDefaultEnvName());
-            inf.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
-    
-                @Override
-                public void doOk() {
-                    try {
-                        WorkContext.switchTo(DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getDefaultConfig()));
-                        TemplateTreePane.getInstance().refreshDockingView();
-                        TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
-                    } catch (Exception e) {
-                        FineLoggerFactory.getLogger().error(e.getMessage());
-                    }
-                    initDemoServerAndBrowser();
-                }
-    
-            }).setVisible(true);
-        } else {
             initDemoServerAndBrowser();
         }
+
     }
+
     
     private static void initDemoServerAndBrowser() {
         
@@ -123,50 +105,6 @@ public class ServerStarter {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
-    
+
-    private static class InformationPane extends BasicPane {
+
-    
-        private static final long serialVersionUID = 1L;
-    
-        private static final int FREE_STYLE_TOP = 15;
-    
-        private static final int FREE_STYLE_OTHER = 5;
-    
-        InformationPane(String message) {
-            
-            init(message);
-        }
-    
-        private void init(String message) {
-        
-            this.setLayout(new BorderLayout(10, 10));
-            this.setBorder(BorderFactory.createEmptyBorder(FREE_STYLE_TOP, FREE_STYLE_OTHER, FREE_STYLE_OTHER, FREE_STYLE_OTHER));
-            String text;
-            if (!ComparatorUtils.equals(message, Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"}))) {
-                text = Inter.getLocText("FR-Designer_Open") +
-                    ProductConstants.APP_NAME +
-                    Inter.getLocText("FR-Designer_Utils-OpenDemoEnv") +
-                    message + Inter.getLocText("FR-Designer_Utils-switch");
-            } else {
-                text = Inter.getLocText("FR-Designer_Open") +
-                    ProductConstants.APP_NAME +
-                    Inter.getLocText("FR-Designer_Utils-NewDemoEnv") +
-                    message + Inter.getLocText("FR-Designer_Utils-switch");
-            }
-            UITextArea a = new UITextArea(text);
-            a.setFont(new Font("Dialog", Font.PLAIN, 12));
-            a.setEditable(false);
-            a.setBackground(this.getBackground());
-            a.setLineWrap(true);
-            this.add(a);
-        }
-    
-        @Override
-        protected String title4PopupWindow() {
-        
-            return Inter.getLocText("FR-Designer_Tooltips");
-        }
-    
-    }
-    
 }