Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

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

@@ -52,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;
@@ -75,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的键值对
@@ -193,7 +195,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         return designerEnvManager;
     }
 
-    public  ColorSelectConfigManager getColorConfigManager(){
+    public ColorSelectConfigManager getColorConfigManager() {
         return this.configManager;
     }
 
@@ -201,7 +203,7 @@ 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 = designerEnvManager.getDefaultenvPath(installHome);
@@ -339,7 +341,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
         // 清空前一个版本中的工作目录和最近打开
         nameEnvMap = new ListMap<String, DesignerWorkspaceInfo>();
-        recentOpenedFilePathList = new ArrayList<String>();
         curEnvName = null;
         designerEnvManager.saveXMLFile();
     }
@@ -533,10 +534,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     }
 
 
-    private String getDefaultenvPath(String installHome){
+    private String getDefaultenvPath(String installHome) {
         //这里需要转成反斜杠和生成默认路径一致
-        return  new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath();
+        return new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath();
     }
+
     /**
      * 设置当前环境为默认
      */
@@ -825,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());
     }
 
     /**
@@ -835,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();
     }
 
@@ -850,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);
         }
     }
 
@@ -872,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);
         }
     }
 
@@ -1311,7 +1325,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
-    private void readRecentColor(XMLableReader reader){
+    private void readRecentColor(XMLableReader reader) {
         reader.readXMLObject(this.configManager);
     }
 
@@ -1332,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);
@@ -1368,8 +1382,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 readAlphaFineAttr(reader);
             } else if (name.equals("RecentColors")) {
                 readRecentColor(reader);
-            }
-            else {
+            } else {
                 readLayout(reader, name);
             }
         }
@@ -1518,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);
                     }
                 }
             }
@@ -1623,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

@@ -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();

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,6 +1,6 @@
 package com.fr.design.env;
 
-import com.fr.env.operator.decision.DecisionOperator;
+import com.fr.workspace.server.authority.decision.DecisionOperator;
 import com.fr.locale.InterProviderFactory;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;

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/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/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);
     }
     
     /**