Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)

* commit '872470c7612b91c6b1e98d7fd3848fa5817eae6e': (45 commits)
  REPORT-9643 & REPORT-9613
  REPORT-9712 切换远程服务器失败后，再启动平台起不来
  REPORT-9643 & REPORT-9613
  method name
  改个名字
  REPORT-9668&REPORT-9656 切换环境恢复最近打开
  REPORT-9524 远程设计服务端整合
  fix
  设计器监听服务端配置修改
  REPORT-9505 修改来自桌面的文件失败
  REPORT-9505 修改来自桌面的文件失败
  双检锁
  REPORT-9632 设计器选择webroot下的文件有问题 ResourceIOutils不再支持绝对路径
  rt
  格式化
  代码质量
  disconnecte
  .
  无效import
  bug fix
  ...

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

@@ -13,6 +13,7 @@ import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
+import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.file.FILEFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
@@ -51,6 +52,7 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -66,6 +68,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;
@@ -73,7 +76,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private Rectangle windowBounds = null; // window bounds.
     private String DialogCurrentDirectory = null;
     private String CurrentDirectoryPrefix = null;
-    private List<String> recentOpenedFilePathList = new ArrayList<String>();
+    private Map<String, List<String>> recentOpenedFileListMap = new HashMap<>();
+    private List<String> tempRecentOpenedFilePathList = new ArrayList<String>();
     private boolean showPaintToolBar = true;
     private int maxNumberOrPreviewRow = 200;
     // name和Env的键值对
@@ -129,7 +133,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     //记录当前激活码的在线激活状态.
     private int activeKeyStatus = -1;
     private boolean joinProductImprove = true;
-
+    //最近使用的颜色
+    private ColorSelectConfigManager configManager = new ColorSelectConfigManager();
     /**
      * alphafine
      */
@@ -190,6 +195,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         return designerEnvManager;
     }
 
+    public ColorSelectConfigManager getColorConfigManager() {
+        return this.configManager;
+    }
+
     public static void checkNameEnvMap() {
         if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) {
             return;
@@ -197,7 +206,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         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);
         }
@@ -332,7 +341,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
         // 清空前一个版本中的工作目录和最近打开
         nameEnvMap = new ListMap<String, DesignerWorkspaceInfo>();
-        recentOpenedFilePathList = new ArrayList<String>();
         curEnvName = null;
         designerEnvManager.saveXMLFile();
     }
@@ -480,8 +488,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});
-        return ComparatorUtils.equals(new File(defaultEnvPath).getPath(), current.getPath());
+        String defaultEnvPath = getDefaultenvPath(StableUtils.getInstallHome());
+        return ComparatorUtils.equals(defaultEnvPath, current.getPath());
     }
 
     /**
@@ -489,7 +497,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()) {
@@ -510,7 +518,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();
@@ -525,6 +533,12 @@ 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();
+    }
+
     /**
      * 设置当前环境为默认
      */
@@ -813,7 +827,17 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * 返回最近打开的文件路径列表
      */
     public List<String> getRecentOpenedFilePathList() {
-        return this.recentOpenedFilePathList;
+
+        if (StringUtils.isEmpty(getCurEnvName())) {
+            return tempRecentOpenedFilePathList;
+        } else {
+            if (!recentOpenedFileListMap.containsKey(getCurEnvName())) {
+                recentOpenedFileListMap.put(getCurEnvName(), tempRecentOpenedFilePathList);
+            }
+        }
+
+
+        return recentOpenedFileListMap.get(getCurEnvName());
     }
 
     /**
@@ -823,11 +847,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      */
     public void addRecentOpenedFilePath(String filePath) {
         // 先删除.
-        if (this.recentOpenedFilePathList.contains(filePath)) {
-            this.recentOpenedFilePathList.remove(filePath);
+        if (getRecentOpenedFilePathList().contains(filePath)) {
+            getRecentOpenedFilePathList().remove(filePath);
         }
 
-        this.recentOpenedFilePathList.add(0, filePath);
+        getRecentOpenedFilePathList().add(0, filePath);
         checkRecentOpenedFileNum();
     }
 
@@ -838,19 +862,21 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * @param newPath 新的路径
      */
     public void replaceRecentOpenedFilePath(String oldPath, String newPath) {
-        if (this.recentOpenedFilePathList.contains(oldPath)) {
-            int index = recentOpenedFilePathList.indexOf(oldPath);
-            this.recentOpenedFilePathList.remove(oldPath);
-            this.recentOpenedFilePathList.add(index, newPath);
+        List<String> list = getRecentOpenedFilePathList();
+        if (list.contains(oldPath)) {
+            int index = getRecentOpenedFilePathList().indexOf(oldPath);
+            list.remove(oldPath);
+            list.add(index, newPath);
         }
     }
 
     private void checkRecentOpenedFileNum() {
-        if (this.recentOpenedFilePathList == null) {
+        List<String> list = getRecentOpenedFilePathList();
+        if (list == null) {
             return;
         }
-        while (this.recentOpenedFilePathList.size() > MAX_SHOW_NUM) {
-            this.recentOpenedFilePathList.remove(this.recentOpenedFilePathList.size() - 1);
+        while (list.size() > MAX_SHOW_NUM) {
+            list.remove(list.size() - 1);
         }
     }
 
@@ -860,8 +886,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * @param filePath 文件路径
      */
     public void removeRecentOpenedFilePath(String filePath) {
-        if (this.recentOpenedFilePathList.contains(filePath)) {
-            this.recentOpenedFilePathList.remove(filePath);
+        if (getRecentOpenedFilePathList().contains(filePath)) {
+            getRecentOpenedFilePathList().remove(filePath);
         }
     }
 
@@ -1299,6 +1325,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
+    private void readRecentColor(XMLableReader reader) {
+        reader.readXMLObject(this.configManager);
+    }
+
     /**
      * Read XML.<br>
      * The method will be invoked when read data from XML file.<br>
@@ -1316,7 +1346,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 this.readAttributes(reader);
             } else if (name.equals("ReportPaneAttributions")) {
                 this.readReportPaneAttributions(reader);
-            } else if ("RecentOpenedFilePathList".equals(name) || "ResentOpenedFilePathList".equals(name)) {
+            } else if ("RecentOpenedFilePath".equals(name)) {
                 this.readRecentOpenFileList(reader);
             } else if ("EnvConfigMap".equals(name)) {
                 this.readEnvConfigMap(reader);
@@ -1350,6 +1380,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 readHttpsParas(reader);
             } else if (name.equals("AlphaFineConfigManager")) {
                 readAlphaFineAttr(reader);
+            } else if (name.equals("RecentColors")) {
+                readRecentColor(reader);
             } else {
                 readLayout(reader, name);
             }
@@ -1499,21 +1531,32 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private void readRecentOpenFileList(XMLableReader reader) {
         reader.readXMLObject(new XMLReadable() {
-
             @Override
             public void readXML(XMLableReader reader) {
                 if (reader.isAttr()) {
-                    DesignerEnvManager.this.recentOpenedFilePathList.clear();
+                    DesignerEnvManager.this.recentOpenedFileListMap.clear();
                 }
 
                 if (reader.isChildNode()) {
-                    String tmpVal;
                     String name = reader.getTagName();
-                    // alex:以前一直是写ResentOpenedFilePath
-                    if ("ResentOpenedFilePath".equals(name) || "Path".equals(name)) { // description.
-                        if ((tmpVal = reader.getElementValue()) != null) {
-                            DesignerEnvManager.this.recentOpenedFilePathList.add(tmpVal);
-                        }
+                    if ("Env".equals(name)) {
+                        final String envName = reader.getAttrAsString("name", StringUtils.EMPTY);
+                        final List<String> recentOpenedFileList = new ArrayList<>();
+                        reader.readXMLObject(new XMLReadable() {
+                            @Override
+                            public void readXML(XMLableReader reader) {
+                                if (reader.isChildNode()) {
+                                    String n = reader.getTagName();
+                                    if ("Path".equals(n)) {
+                                        String path = reader.getElementValue();
+                                        if (StringUtils.isNotEmpty(path)) {
+                                            recentOpenedFileList.add(path);
+                                        }
+                                    }
+                                }
+                            }
+                        });
+                        DesignerEnvManager.this.recentOpenedFileListMap.put(envName, recentOpenedFileList);
                     }
                 }
             }
@@ -1542,6 +1585,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         writeActiveStatus(writer);
         writeHttpsParas(writer);
         writeAlphaFineAttr(writer);
+        writeRecentColor(writer);
         writer.end();
     }
 
@@ -1551,6 +1595,12 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
+    private void writeRecentColor(XMLPrintWriter writer) {
+        if (this.configManager != null) {
+            this.configManager.writeXML(writer);
+        }
+    }
+
     public String getUUID() {
         return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid;
     }
@@ -1597,10 +1647,15 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private void writeRecentOpenFileAndEnvList(XMLPrintWriter writer) {
         checkRecentOpenedFileNum();
-        writer.startTAG("RecentOpenedFilePathList");
-        int resentOpenedFilePathCount = Math.min(12, this.recentOpenedFilePathList.size());
-        for (int i = 0; i < resentOpenedFilePathCount; i++) {
-            writer.startTAG("Path").textNode(recentOpenedFilePathList.get(i)).end();
+        writer.startTAG("RecentOpenedFilePath");
+        for (Entry<String, List<String>> entry : recentOpenedFileListMap.entrySet()) {
+            writer.startTAG("Env").attr("name", entry.getKey());
+            List<String> paths = entry.getValue();
+            int count = Math.min(12, paths.size());
+            for (int i = 0; i < count; i++) {
+                writer.startTAG("Path").textNode(paths.get(i)).end();
+            }
+            writer.end();
         }
         writer.end();
 

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

@@ -18,6 +18,7 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.resource.WorkResourceOutputStream;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -233,11 +234,9 @@ public class LocalePane extends BasicPane {
                 properties.setProperty(GeneralUtils.objectToString(customTableModel.getValueAt(j, 0)), GeneralUtils.objectToString(customTableModel.getValueAt(j, i)));
             }
     
-            OutputStream out = null;
             try {
-                out = FRContext.getCommonOperator().writeBean(PREFIX + fileName + ".properties", ProjectConstants.LOCALE_NAME);
+                OutputStream out = new WorkResourceOutputStream(StableUtils.pathJoin(ProjectConstants.LOCALE_NAME, PREFIX + fileName + ".properties"));
                 properties.store(out, null);
-        
                 out.flush();
                 out.close();
             } catch (Exception e) {

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

@@ -22,7 +22,7 @@ import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.AuthException;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,7 +38,7 @@ public class SwitchExistEnv extends MenuDef {
         JTemplate<?, ?> t = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         if (t != null) {
             GeneralContext.addEnvWillChangedListener(
-                    t.getFullPathName(),
+                    t.getPath(),
                     new EnvChangedListener() {
                         public void envChanged() {
                             SwitchExistEnv.this.clearShortCuts();
@@ -107,28 +107,28 @@ public class SwitchExistEnv extends MenuDef {
             Workspace workspace;
             try {
                 workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
+                if (workspace == null) {
+                    JOptionPane.showMessageDialog(
+                        DesignerContext.getDesignerFrame(),
+                        Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}));
+                    return;
+                }
+                WorkContext.switchTo(workspace, new WorkContextCallback() {
+        
+                    @Override
+                    public void done() {
+            
+                        DesignerEnvManager.getEnvManager().setCurEnvName(envName);
+                        DesignUtils.refreshDesignerFrame();
+                        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
+                        fireDSChanged();
+                    }
+                });
             } catch (AuthException exception) {
                 JOptionPane.showMessageDialog(
                         DesignerContext.getDesignerFrame(),
                         Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed"}));
-                return;
             }
-            WorkContext.switchTo(workspace, new WorkContextCallback() {
-                @Override
-                public void success() {
-                    DesignerEnvManager.getEnvManager().setCurEnvName(envName);
-                    DesignUtils.refreshDesignerFrame();
-                    HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
-                    fireDSChanged();
-                }
-
-                @Override
-                public void fail() {
-                    JOptionPane.showMessageDialog(
-                            DesignerContext.getDesignerFrame(),
-                            Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}));
-                }
-            });
         }
     }
 }

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -105,7 +105,7 @@ public abstract class DesignTableDataManager {
 
     public static void closeTemplate(JTemplate<?, ?> template) {
         if (template != null) {
-            dsListenersMap.remove(template.getFullPathName());
+            dsListenersMap.remove(template.getPath());
         }
     }
 
@@ -164,7 +164,7 @@ public abstract class DesignTableDataManager {
         JTemplate<?, ?> template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         String key = StringUtils.EMPTY;
         if (template != null) {
-            key = template.getFullPathName();
+            key = template.getPath();
         }
         List<ChangeListener> dsListeners = dsListenersMap.get(key);
         if (dsListeners == null) {

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -8,7 +8,7 @@ import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.connect.WorkspaceConnection;
 
 public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
-    
+
     private String name;
 
     private WorkspaceConnection connection;
@@ -55,8 +55,10 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
                 String url = reader.getAttrAsString("url", StringUtils.EMPTY);
                 String username = reader.getAttrAsString("username", StringUtils.EMPTY);
                 //密码解密
-                String password = SecurityToolbox.defaultDecrypt(reader.getAttrAsString("password", StringUtils.EMPTY).replaceAll(" ","\r\n"));
-                this.connection = new WorkspaceConnection(url, username, password);
+                String password = SecurityToolbox.defaultDecrypt(reader.getAttrAsString("password", StringUtils.EMPTY).replaceAll(" ", "\r\n"));
+                String certPath = reader.getAttrAsString("certPath", StringUtils.EMPTY);
+                String certSecretKey = reader.getAttrAsString("certSecretKey", StringUtils.EMPTY);
+                this.connection = new WorkspaceConnection(url, username, password, certPath, certSecretKey);
             }
         }
     }
@@ -70,16 +72,18 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
             writer.attr("url", connection.getUrl());
             writer.attr("username", connection.getUserName());
             writer.attr("password", SecurityToolbox.defaultEncrypt(connection.getPassword()));
+            writer.attr("certPath", connection.getCertPath());
+            writer.attr("certSecretKey", connection.getCertSecretKey());
             writer.end();
         }
     }
-    
+
     @Override
     public Object clone() throws CloneNotSupportedException {
 
-        RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo)super.clone();
+        RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo) super.clone();
 
-        object.connection = (WorkspaceConnection)StableUtils.cloneObject(this.connection);
-        return  object;
+        object.connection = (WorkspaceConnection) StableUtils.cloneObject(this.connection);
+        return object;
     }
 }

designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java

@@ -1,11 +1,12 @@
 package com.fr.design.env;
 
-import com.fr.env.operator.decision.DecisionOperator;
 import com.fr.locale.InterProviderFactory;
+import com.fr.stable.AssistUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceClient;
 import com.fr.workspace.connect.WorkspaceConnection;
+import com.fr.workspace.server.authority.decision.DecisionOperator;
 
 /**
  * Created by juhaoyu on 2018/6/14.
@@ -17,10 +18,13 @@ public class RemoteWorkspace implements Workspace {
 
     private final String address;
     
+    private final WorkspaceConnection connection;
+    
     RemoteWorkspace(WorkspaceClient client, WorkspaceConnection connection) {
 
         this.client = client;
         this.address = connection.getUrl();
+        this.connection = connection;
     }
 
     @Override
@@ -61,4 +65,16 @@ public class RemoteWorkspace implements Workspace {
 
         return client.getPool().get(type);
     }
+    
+    @Override
+    public int hashCode() {
+        
+        return connection.hashCode();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        
+        return obj != null && obj instanceof RemoteWorkspace && AssistUtils.equals(((RemoteWorkspace) obj).connection, this.connection);
+    }
 }

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

@@ -114,7 +114,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
     public void closeSelectedReport(JTemplate<?, ?> selected) {
         DesignModuleFactory.clearChartPropertyPane();
         DesignTableDataManager.closeTemplate(selected);
-        GeneralContext.removeEnvWillChangedListener(selected.getFullPathName());
+        GeneralContext.removeEnvWillChangedListener(selected.getPath());
         if (contains(selected) == -1) {
             return;
         }
@@ -139,7 +139,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
     public void closeVirtualSelectedReport(JTemplate<?, ?> selected) {
         DesignModuleFactory.clearChartPropertyPane();
         DesignTableDataManager.closeTemplate(selected);
-        GeneralContext.removeEnvWillChangedListener(selected.getFullPathName());
+        GeneralContext.removeEnvWillChangedListener(selected.getPath());
         if (contains(selected) == -1) {
             return;
         }
@@ -185,7 +185,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
         if (editingTemplate == null) {
             return;
         }
-        DesignerEnvManager.getEnvManager().addRecentOpenedFilePath(editingTemplate.getFullPathName());
+        DesignerEnvManager.getEnvManager().addRecentOpenedFilePath(editingTemplate.getPath());
         ((HistoryListDataMode) list.getModel()).add(editingTemplate);
     }
 
@@ -246,7 +246,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
      */
     public int contains(String filename) {
         for (int i = 0; i < historyList.size(); i++) {
-            String historyPath = historyList.get(i).getFullPathName();
+            String historyPath = historyList.get(i).getPath();
             if (ComparatorUtils.equals(historyPath, filename)) {
                 return i;
             }
@@ -261,7 +261,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
      * @return 是则返回TRUE
      */
     public boolean isCurrentEditingFile(String filename) {
-        String editingFileName = editingTemplate.getFullPathName();
+        String editingFileName = editingTemplate.getPath();
         return ComparatorUtils.equals(filename, editingFileName);
     }
 

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

@@ -218,7 +218,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
             MutilTempalteTabPane.getInstance().setSelectedIndex(index - 1);
         }
         JTemplate selectedfile = MutilTempalteTabPane.getInstance().getSelectedFile();
-        if (!HistoryTemplateListPane.getInstance().isCurrentEditingFile(selectedfile.getFullPathName())) {
+        if (!HistoryTemplateListPane.getInstance().isCurrentEditingFile(selectedfile.getPath())) {
             //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样
             DesignerContext.getDesignerFrame().activateJTemplate(selectedfile);
         }

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -40,7 +40,6 @@ import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
-import com.fr.file.FileNodeFILE;
 import com.fr.file.MemFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
@@ -50,19 +49,14 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.Elem;
 import com.fr.report.cell.cellattr.CellImage;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.OperatingSystem;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.UUID;
-import com.fr.stable.project.ProjectConstants;
-import com.fr.workspace.WorkContext;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Set;
@@ -204,16 +198,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return -1;
     }
 
-    public String getFullPathName() {
-        String editingFileName = getEditingFILE().getPath();
-        if (editingFileName.startsWith(ProjectConstants.REPORTLETS_NAME)) {
-            editingFileName = ((FileNodeFILE) getEditingFILE()).getEnvPath() + File.separator + editingFileName;
-        }
-        if (OperatingSystem.isWindows()) {
-            return editingFileName.replaceAll("/", "\\\\");
-        } else {
-            return editingFileName.replaceAll("\\\\", "/");
-        }
+    public String getPath() {
+        return getEditingFILE().getPath();
     }
 
     protected abstract JComponent createCenterPane();
@@ -581,7 +567,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * @return
      */
     public boolean saveAsTemplate(boolean isShowLoc, String fileName) {
-        String oldName = this.getFullPathName();
+        String oldName = this.getPath();
         // alex:如果是SaveAs的话需要让用户来选择路径了
         FILEChooserPane fileChooser = getFILEChooserPane(isShowLoc);
         fileChooser.setFileNameTextField(fileName, this.suffix());
@@ -620,7 +606,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             collectInfo();
         }
         //更换最近打开
-        DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getFullPathName());
+        DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
         return result;
     }
 
@@ -656,9 +642,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            this.getTarget().export(out);
-            WorkContext.getWorkResource().write(editingFILE.getPath(), out.toByteArray());
+            this.getTarget().export(editingFILE.asOutputStream());
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);

designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java

@@ -37,7 +37,7 @@ public class JVirtualTemplate extends JTemplate {
     }
 
     @Override
-    public String getFullPathName() {
+    public String getPath() {
         String editingFileName = getEditingFILE().getPath();
         if (editingFileName.startsWith(ProjectConstants.REPORTLETS_NAME)) {
             editingFileName = ((FileNodeFILE) getEditingFILE()).getEnvPath() + File.separator + editingFileName;
@@ -258,7 +258,7 @@ public class JVirtualTemplate extends JTemplate {
 
     @Override
     public Icon getIcon() {
-        if (getFullPathName().endsWith("cpt")) {
+        if (getPath().endsWith("cpt")) {
             return BaseUtils.readIcon("/com/fr/design/images/buttonicon/newcpts.png");
         } else {
             return BaseUtils.readIcon("/com/fr/web/images/form/new_form3.png");

designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java

@@ -19,6 +19,7 @@ import com.fr.general.Inter;
 import com.fr.stable.EnvChangedListener;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
+import com.fr.workspace.Workspace;
 
 import javax.swing.*;
 import java.awt.*;
@@ -132,17 +133,17 @@ public class TemplatePane extends JPanel implements MouseListener {
         DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(selectedName);
         GeneralContext.fireEnvWillChangeListener();
         try {
-            WorkContext.switchTo(DesignerWorkspaceGenerator.generate(selectedEnv), new WorkContextCallback() {
-                
-                @Override
-                public void fail() {
-                    
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}),
-                            null, 0, UIManager.getIcon("OptionPane.errorIcon"));
-                }
+            Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
+            if (workspace == null) {
+                JOptionPane.showMessageDialog(
+                    DesignerContext.getDesignerFrame(),
+                    Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}));
+                return false;
+            }
+            WorkContext.switchTo(workspace, new WorkContextCallback() {
                 
                 @Override
-                public void success() {
+                public void done() {
                     DesignerEnvManager.getEnvManager().setCurEnvName(selectedName);
                     DesignUtils.refreshDesignerFrame();
                 }

designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.remote.ui.AuthorityManagerPane;
-import com.fr.env.operator.authority.AuthorityOperator;
+import com.fr.workspace.server.authority.AuthorityOperator;
 import com.fr.general.Inter;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.DesignAuthority;

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java

@@ -18,7 +18,7 @@ import com.fr.design.remote.RemoteDesignAuthorityCreator;
 import com.fr.design.remote.ui.list.AuthorityList;
 import com.fr.design.remote.ui.list.AuthorityListCellRenderer;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.log.FineLoggerFactory;

designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java

@@ -13,8 +13,8 @@ import com.fr.design.remote.ui.list.AddedMemberListCellRender;
 import com.fr.design.remote.ui.list.AddingMemberList;
 import com.fr.design.remote.ui.list.AddingMemberListCellRender;
 import com.fr.design.remote.ui.list.MemberListSelectedChangeListener;
-import com.fr.env.RemoteDesignMember;
-import com.fr.env.operator.decision.DecisionOperator;
+import com.fr.workspace.server.authority.RemoteDesignMember;
+import com.fr.workspace.server.authority.decision.DecisionOperator;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 import com.fr.third.guava.collect.ImmutableList;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java

@@ -1,6 +1,6 @@
 package com.fr.design.remote.ui.list;
 
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.DefaultListModel;
 import java.awt.Point;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java

@@ -3,7 +3,7 @@ package com.fr.design.remote.ui.list;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.remote.button.IconButton;
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.BorderFactory;
 import javax.swing.JList;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java

@@ -1,6 +1,6 @@
 package com.fr.design.remote.ui.list;
 
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.DefaultListModel;
 import java.awt.Point;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java

@@ -3,7 +3,7 @@ package com.fr.design.remote.ui.list;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.BorderFactory;
 import javax.swing.JList;

designer-base/src/main/java/com/fr/design/remote/ui/list/MemberList.java

@@ -1,7 +1,7 @@
 package com.fr.design.remote.ui.list;
 
 
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JList;

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/design/style/background/gradient/GradientBar.java

@@ -19,6 +19,7 @@ import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.itextfield.UINumberField;
@@ -104,7 +105,7 @@ public class GradientBar extends JComponent implements UIObserver,ColorSelectabl
                         ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, GradientBar.this);
                         Color color = GradientBar.this.getColor();
                         if (color != null) {
-                            ColorSelectConfigManager.getInstance().addToColorQueue(color);
+                            DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(color);
                             list.get(select).setColorInner(color);
                             stateChanged();
                             GradientBar.this.repaint();

designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java

@@ -1,16 +1,12 @@
 package com.fr.design.style.color;
 
-import com.fr.base.FRContext;
-import com.fr.file.XMLFileManager;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.GeneralContext;
-import com.fr.stable.EnvChangedListener;
 import com.fr.stable.xml.XMLPrintWriter;
-import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLableReader;
 
 import java.awt.*;
-import java.io.InputStream;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,42 +15,20 @@ import java.util.List;
  *
  * @author focus
  */
-public class ColorSelectConfigManager extends XMLFileManager implements ColorSelectConfigManagerProvider {
+public class ColorSelectConfigManager implements XMLReadable {
 
     // 最近使用的颜色个数
     private int colorNums = 20;
 
-    private static ColorSelectConfigManagerProvider configManager = null;
-    private static ColorSelectConfigManager colorSelectConfigManager = null;
     private boolean init = true;
     // 最近使用颜色
     private List<Color> colors = new ArrayList<Color>();
     private static final String RECENT_COLOR_TAG = "RecentColors";
     private static final String COLOR_TAG = "Color";
 
-    static {
-        GeneralContext.addEnvChangedListener(new EnvChangedListener() {
-            public void envChanged() {
-                ColorSelectConfigManager.envChanged();
-            }
-        });
-    }
-
-    private static void envChanged() {
-        configManager = null;
-    }
 
     public Color[] getColors() {
 
-        //初次打开软件时从xml文件中获取历史颜色信息
-        if (init) {
-            ColorSelectConfigManagerProvider manager = ColorSelectConfigManager.getProviderInstance();
-            this.colors = manager.getColorsFromFile();
-            init = false;
-        }
-        if (colors == null) {
-            colors = new ArrayList<Color>();
-        }
         return colors.toArray(new Color[colors.size()]);
     }
 
@@ -66,12 +40,6 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
         this.colorNums = colorNums;
     }
 
-    public synchronized static ColorSelectConfigManager getInstance() {
-        if (colorSelectConfigManager == null) {
-            colorSelectConfigManager = new ColorSelectConfigManager();
-        }
-        return colorSelectConfigManager;
-    }
 
     /**
      * 添加颜色到最近使用队列中
@@ -91,52 +59,24 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
 
         /*@author yaohwu*/
         //将历史颜色信息保存到xml文件中去
-        ColorSelectConfigManagerProvider manager = ColorSelectConfigManager.getProviderInstance();
         if (colors != null && !colors.isEmpty()) {
-            manager.setColorsToFile(colors);
-        }
-    }
-
-
-    /**
-     * 读取配置文件流
-     *
-     * @param input 流
-     * @throws Exception 异常
-     */
-    @Override
-    public void readFromInputStream(InputStream input) throws Exception {
-        ColorSelectConfigManager manager = new ColorSelectConfigManager();
-        XMLTools.readInputStreamXML(manager, input);
-        configManager = manager;
-    }
-
-
-    /**
-     * 获取配置管理接口
-     *
-     * @return 配置管理接口ConfigManagerProvider
-     */
-    public synchronized static ColorSelectConfigManagerProvider getProviderInstance() {
-        if (configManager == null) {
-            configManager = new ColorSelectConfigManager();
-            configManager.readXMLFile();
+            this.setColorsToFile(colors);
         }
-        return configManager;
-    }
-
-    public String fileName() {
-        return "recentcolors.xml";
     }
 
     public void readXML(XMLableReader reader) {
-        String name = reader.getTagName();
-        if (reader.isChildNode()) {
-            if (ComparatorUtils.equals(COLOR_TAG, name)) {
-                Color color = null;
-                colors.add(reader.getAttrAsColor("colors", color));
+        reader.readXMLObject(new XMLReadable() {
+            @Override
+            public void readXML(XMLableReader reader) {
+                String tagName = reader.getTagName();
+                if (reader.isChildNode()) {
+                    if (ComparatorUtils.equals(COLOR_TAG, tagName)) {
+                        Color color = null;
+                        colors.add(reader.getAttrAsColor("colors", color));
+                    }
+                }
             }
-        }
+        });
     }
 
     public void writeXML(XMLPrintWriter writer) {
@@ -151,9 +91,6 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
         writer.end();
     }
 
-    public List<Color> getColorsFromFile() {
-        return this.colors;
-    }
 
     public void setColorsToFile(List<Color> colors) {
         this.colors = colors;

designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.style.color;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
@@ -159,7 +160,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
             }
         }
 
-        ColorSelectConfigManager.getInstance().addToColorQueue(color);
+        DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(color);
         this.repaint();
     }
 

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.style.color;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
@@ -163,7 +164,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
                 this.colorChangeListenerList.get(i).stateChanged(evt);
             }
         }
-        ColorSelectConfigManager.getInstance().addToColorQueue(color);
+        DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(color);
         this.repaint();
     }
 

designer-base/src/main/java/com/fr/design/style/color/UsedColorPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.style.color;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.SpecialUIButton;
 
@@ -66,7 +67,7 @@ public class UsedColorPane extends BasicPane {
         panel.setLayout(new GridLayout(rows, columns, 1, 1));
         panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
         //最近使用颜色
-        Color[] colors = ColorSelectConfigManager.getInstance().getColors();
+        Color[] colors = DesignerEnvManager.getEnvManager().getColorConfigManager().getColors();
         int size = colors.length;
         int i = 0;
         if (needPickColorButton) {
@@ -96,7 +97,7 @@ public class UsedColorPane extends BasicPane {
      */
     public void updateUsedColor() {
         int total = columns * rows;
-        Color[] colors = ColorSelectConfigManager.getInstance().getColors();
+        Color[] colors = DesignerEnvManager.getEnvManager().getColorConfigManager().getColors();
         int size = colors.length;
         for (int i = this.reserveCells; i < total; i++) {
             ColorCell cell = (ColorCell) this.pane.getComponent(i);

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -259,6 +259,14 @@ public class NumberEditorValidatePane extends JPanel {
 
         ob.setAllowNegative(allowNegativeCheckBox.isSelected());
 
+        if (setMinValueCheckBox.isSelected()) {
+            ob.setMinValue(minValueSpinner.getValue());
+        }
+
+        if (setMaxValueCheckBox.isSelected()) {
+            ob.setMaxValue(maxValueSpinner.getValue());
+        }
+
         if(setMinValueCheckBox.isSelected() || setMaxValueCheckBox.isSelected()){
             errorMsgTextFieldPane.setVisible(true);
         }else{

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -310,7 +310,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
     protected void setBorderAndLayout(JPanel jPanel){
         jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
         jPanel.setBorder(BorderFactory.createTitledBorder(
-                new ModLineBorder(ModLineBorder.TOP), Inter.getLocText(new String[]{"Submit", "Condition"})));
+				new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("Fine-Designer_Submit_Condition")));
     }
 
     protected void addComponent(JPanel mainPane,JScrollPane addPane){
@@ -368,12 +368,12 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
 				if (e.getStateChange() == ItemEvent.SELECTED) {
-                    Object ob = e.getItem();
-					if ((ComparatorUtils.equals(ob,DML_CONFIG_TYPES[0])) || ComparatorUtils.equals(ob,DML_CONFIG_TYPES[3])) {
-                        checkBoxUpdatePane.setVisible(true);
-					}  else if ((ComparatorUtils.equals(ob,DML_CONFIG_TYPES[1])) || ComparatorUtils.equals(ob,DML_CONFIG_TYPES[2])){
-                        checkBoxUpdatePane.setVisible(false);
-                    }
+					Object ob = e.getItem();
+					if ((ComparatorUtils.equals(ob, DML_CONFIG_TYPES[0])) || ComparatorUtils.equals(ob, DML_CONFIG_TYPES[3])) {
+						checkBoxUpdatePane.setVisible(true);
+					} else if ((ComparatorUtils.equals(ob, DML_CONFIG_TYPES[1])) || ComparatorUtils.equals(ob, DML_CONFIG_TYPES[2])) {
+						checkBoxUpdatePane.setVisible(false);
+					}
 				}
 			}
 		});
@@ -465,6 +465,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         // Richie:初始化
         int returnValue = DEFAULT_RETURN_VALUE;
         int coverNumber = 0;
+
+		if (!keyColumnNameValueList.isEmpty()) {
+			//如果存在先前项,设置状态为5
+			returnValue = 5 ;
+		}
         for (int i = 0; i < selected.length; i++) {
             if (returnValue == 0 || returnValue == 3) {
                 break;
@@ -512,7 +517,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 for (int j = 0; j < keyColumnNameValueList.size(); j++) {
                     if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) {
                         newKeyColumnNameValueList.remove(i);
-                        newKeyColumnNameValueList.add(i, keyColumnNameValueList.get(j));
+						newKeyColumnNameValueList.add(i, keyColumnNameValueList.get(j));
                     }
                 }
 
@@ -523,10 +528,15 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             }
 
         } else if (returnValue == 1 || returnValue == 2) {
-            for (int i = 0; i < selected.length; i++) {
-                model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i));
-            }
-        }
+			for (int i = 0; i < selected.length; i++) {
+				model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i));
+			}
+        } else if (returnValue == 5){
+			//新选项和原来没有重复项的情况，产品确认:只做全量增加，原有的清除
+			for (int i = 0; i < selected.length; i++) {
+				model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i));
+			}
+		}
 
         // Richie:初始化
         if (keyColumnNameValueList.isEmpty()) {
@@ -535,6 +545,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 model.addKeyColumnNameValue(new KeyColumnNameValue(false, (ColumnName)selected[i], new ColumnValue(""), false));
             }
         }
+		
         model.fireTableDataChanged();
         keyColumnValuesTable.validate();
     }

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -270,8 +270,13 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                     : new RemoteEnvURL(connection.getUrl());
             String username = fromNullable(connection.getUserName()).or(StringUtils.EMPTY);
             String pwd = fromNullable(connection.getPassword()).or(StringUtils.EMPTY);
+            String certPath = fromNullable(connection.getCertPath()).or(StringUtils.EMPTY);
+            String certSecretKey = fromNullable(connection.getCertSecretKey()).or(StringUtils.EMPTY);
             this.usernameInput.setText(username);
             this.passwordInput.setText(pwd);
+            this.certPathInput.setText(certPath);
+            this.certSecretKeyInput.setText(certSecretKey);
+
         }
 
         fillRemoteEnvURLField();
@@ -290,7 +295,9 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         WorkspaceConnection connection = new WorkspaceConnection(
                 this.remoteEnvURL.getURL(),
                 this.usernameInput.getText(),
-                new String(this.passwordInput.getPassword()));
+                new String(this.passwordInput.getPassword()),
+                this.certPathInput.getText(),
+                new String(this.certSecretKeyInput.getPassword()));
 
         return RemoteDesignerWorkspaceInfo.create(connection);
     }
@@ -478,7 +485,11 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
                 final RemoteDesignerWorkspaceInfo remoteEnv = updateBean();
 
-                return WorkContext.getConnector().testConnection(remoteEnv.getConnection());
+                WorkspaceConnection connection = remoteEnv.getConnection();
+                DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath());
+                DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey());
+
+                return WorkContext.getConnector().testConnection(connection);
             }
 
             @Override

designer-base/src/main/java/com/fr/file/FILEFactory.java

@@ -35,7 +35,7 @@ public class FILEFactory {
         } else if (path.startsWith(FILE_PREFIX)) {
             return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length())));
         } else {
-            return new FileFILE(new java.io.File(path));
+            return new FileNodeFILE(new FileNode(path, WorkContext.getWorkResource().isDirectory(path)));
         }
     }
 
@@ -52,7 +52,7 @@ public class FILEFactory {
         } else if (path.startsWith(FILE_PREFIX)) {
             return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length())));
         } else {
-            return new FileFILE(new java.io.File(path));
+            return new FileNodeFILE(new FileNode(path, WorkContext.getWorkResource().isDirectory(path)));
         }
     }
 }

designer-base/src/main/java/com/fr/file/FileNodeFILE.java

@@ -8,6 +8,7 @@ import com.fr.design.gui.itree.filetree.FileTreeIcon;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.workspace.resource.WorkResourceOutputStream;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
@@ -198,7 +199,6 @@ public class FileNodeFILE implements FILE {
                 return FRContext.getFileNodes().listWebRootFile(rootFilePath);
             } else {
                 return FRContext.getFileNodes().list(rootFilePath);
-            
             }
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
@@ -338,10 +338,7 @@ public class FileNodeFILE implements FILE {
         if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) {
             return null;
         }
-        return FRContext.getCommonOperator().writeBean(
-            envPath.substring(ProjectConstants.REPORTLETS_NAME.length() + 1),
-            ProjectConstants.REPORTLETS_NAME
-        );
+        return new WorkResourceOutputStream(envPath);
     }
     
     /**

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;
-        }
-        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 {
+        }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");
-        }
-    
-    }
-    
+
+
 }