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

* commit '4fc61bd00cb8c9f8515f7b2b166adb732cc96fa9':
  规范
  REPORT-11886 远程设计目录树刷新卡顿
  REPORT-11016 10.0版本mac上点击最大化会卡死
  REPORT-11993 普通用户远程设计数据连接权限设置无效

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -15,11 +15,13 @@ import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.connection.DBConnectAuth;
 
 import javax.swing.SwingUtilities;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
@@ -62,8 +64,16 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
 
         ConnectionConfig mgr = ConnectionConfig.getInstance();
         Iterator<String> nameIt = mgr.getConnections().keySet().iterator();
+
+        Collection<String> noAuthConnections = WorkContext.getCurrent().get(DBConnectAuth.class).getNoAuthConnections();
+        if (noAuthConnections == null) {
+            return nameList.iterator();
+        }
         while (nameIt.hasNext()) {
             String conName = nameIt.next();
+            if (noAuthConnections.contains(conName)) {
+                continue;
+            }
             Connection connection = mgr.getConnection(conName);
             filterConnection(connection, conName, nameList);
         }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -146,14 +146,14 @@ public class EnvFileTree extends RefreshableJTree {
      *
      * 返回currentTreeNode下是否找到了filePath
      */
-    private boolean selectFilePath(ExpandMutableTreeNode currentTreeNode, String prefix, String filePath, DefaultTreeModel m_model) {
+    private boolean selectFilePath(ExpandMutableTreeNode currentTreeNode, String prefix, String filePath, DefaultTreeModel model) {
         FileNode fileNode = (FileNode) currentTreeNode.getUserObject();
         String nodePath = fileNode.getName();
         String currentTreePath = prefix + nodePath;
 
         // 如果equals,说明找到了,不必再找下去了
         if (ComparatorUtils.equals(new File(currentTreePath), new File(filePath))) {
-            this.setSelectionPath(new TreePath(m_model.getPathToRoot(currentTreeNode)));
+            this.setSelectionPath(new TreePath(model.getPathToRoot(currentTreeNode)));
             return true;
         }
         // 如果当前路径是currentFilePath的ParentFile,则expandTreeNode,并继续往下找
@@ -164,7 +164,7 @@ public class EnvFileTree extends RefreshableJTree {
             for (int i = 0, len = currentTreeNode.getChildCount(); i < len; i++) {
                 ExpandMutableTreeNode childTreeNode = (ExpandMutableTreeNode) currentTreeNode.getChildAt(i);
 
-                if (selectFilePath(childTreeNode, prefix, filePath, m_model)) {
+                if (selectFilePath(childTreeNode, prefix, filePath, model)) {
                     return true;
                 }
             }
@@ -219,7 +219,7 @@ public class EnvFileTree extends RefreshableJTree {
             resFns = tList.toArray(new FileNode[tList.size()]);
         }
 
-        Arrays.sort(resFns, new FileNodeComparator());
+        Arrays.sort(resFns, new FileNodeComparator(FRContext.getFileNodes().getSupportedTypes()));
 
         return resFns;
     }
@@ -248,8 +248,8 @@ public class EnvFileTree extends RefreshableJTree {
      */
     public void refreshEnv() {
 
-        DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
+        DefaultTreeModel model = (DefaultTreeModel) this.getModel();
-        ExpandMutableTreeNode rootTreeNode = (ExpandMutableTreeNode) m_model.getRoot();
+        ExpandMutableTreeNode rootTreeNode = (ExpandMutableTreeNode) model.getRoot();
         rootTreeNode.removeAllChildren();
 
         FileNode[] fns;
@@ -273,7 +273,7 @@ public class EnvFileTree extends RefreshableJTree {
             rootTreeNode.add(node);
         }
 
-        m_model.reload(rootTreeNode);
+        model.reload(rootTreeNode);
     }
 
     /*

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeComparator.java

@@ -10,15 +10,43 @@ import java.util.Comparator;
  * Directory is in the first. and  normal file  the  in the  last.
  */
 public class FileNodeComparator implements Comparator<FileNode> {
-	// 正序还是倒序
+    /**
-	private boolean isReverse = false;
+     * 正序还是倒序
+     */
+    private boolean isReverse;
+
+    /**
+     * 文件扩展名类型
+     */
+    private String[] supportTypes;
 
+    /**
+     * @see FileNodeComparator#FileNodeComparator(boolean, String[])
+     * @deprecated
+     */
+    @Deprecated
     public FileNodeComparator() {
         this(false);
     }
 
+    public FileNodeComparator(String[] types) {
+        this(false, types);
+    }
+
+    /**
+     * @param reverse 是否是倒序，{@code true} 倒序，{@code false} 正序
+     * @see FileNodeComparator#FileNodeComparator(boolean, String[])
+     * @deprecated
+     */
+    @Deprecated
     public FileNodeComparator(boolean reverse) {
         this.isReverse = reverse;
+        this.supportTypes = FRContext.getFileNodes().getSupportedTypes();
+    }
+
+    public FileNodeComparator(boolean reverse, String[] types) {
+        this.isReverse = reverse;
+        this.supportTypes = types;
     }
 
     /**
@@ -40,7 +68,7 @@ public class FileNodeComparator implements Comparator<FileNode> {
             if (nameNode2.isDirectory()) {
                 returnVal = 1;
             } else {
-            	returnVal=groupByFileType(nameNode1, nameNode2, 0);
+                returnVal = groupByFileType(nameNode1, nameNode2, 0);
             }
         }
         if (isReverse) {
@@ -50,28 +78,27 @@ public class FileNodeComparator implements Comparator<FileNode> {
     }
 
     /**
-     * 一个简单的递归判断算法
+     * 一个简单的递归判断算法，依据文件类型排序
-     * @param nameNode1
+     *
-     * @param nameNode2
+     * @param nameNode1 节点1
-     * @param i
+     * @param nameNode2 节点2
-     * @return
+     * @param i         i
+     * @return value
      */
     private int groupByFileType(FileNode nameNode1, FileNode nameNode2,
                                 int i) {
-		
-		String[] supportTypes = FRContext.getFileNodes().getSupportedTypes();
         if (i < supportTypes.length) {
             if (nameNode1.isFileType(supportTypes[i]))
                 if (nameNode2.isFileType(supportTypes[i]))
                     return nameNode1.getName().toLowerCase().compareTo(nameNode2.getName().toLowerCase());
                 else
-					return-1;
+                    return -1;
             else if (nameNode2.isFileType(supportTypes[i]))
                 return 1;
-				else{
+            else {
-					return groupByFileType(nameNode1, nameNode2, i+1);
+                return groupByFileType(nameNode1, nameNode2, i + 1);
             }
-			}else
+        } else
             return -1;
     }
-	}
+}

designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java

@@ -1,5 +1,18 @@
 package com.fr.design.gui.itree.filetree;
 
+import com.fr.base.BaseUtils;
+import com.fr.design.i18n.Toolkit;
+import com.fr.general.ComparatorUtils;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.project.ProjectConstants;
+
+import javax.swing.Icon;
+import javax.swing.JTree;
+import javax.swing.filechooser.FileSystemView;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
@@ -11,26 +24,12 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Stack;
 
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.filechooser.FileSystemView;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
-
-import com.fr.base.BaseUtils;
-import com.fr.general.ComparatorUtils;
-
-import com.fr.stable.ArrayUtils;
-import com.fr.stable.project.ProjectConstants;
-
 
 /**
  * File Tree.
  */
 public class JFileTree extends AbstractFileTree {
-    protected FileFilter fileFilter ;
+    protected FileFilter fileFilter;
 
     public JFileTree() {
         this(null);
@@ -43,8 +42,8 @@ public class JFileTree extends AbstractFileTree {
     private void init(FileFilter filter) {
         this.fileFilter = filter;
 
-        DefaultTreeModel m_model = new DefaultTreeModel(new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_My_Computer")));
+        DefaultTreeModel treeModel = new DefaultTreeModel(new DefaultMutableTreeNode(Toolkit.i18nText("Fine-Design_Basic_My_Computer")));
-        this.setModel(m_model);
+        this.setModel(treeModel);
 
         this.putClientProperty("JTree.lineStyle", "Angled");
 
@@ -57,7 +56,7 @@ public class JFileTree extends AbstractFileTree {
     }
 
     public void setRootFile(File rootFile) {
-    	setRootFiles(new File[] { rootFile });
+        setRootFiles(new File[]{rootFile});
     }
 
     public void setRootFiles(File[] rootFiles) {
@@ -65,8 +64,8 @@ public class JFileTree extends AbstractFileTree {
             return;
         }
 
-        DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
+        DefaultTreeModel defaultTreeModel = (DefaultTreeModel) this.getModel();
-        DefaultMutableTreeNode rootTreeNode = (DefaultMutableTreeNode) m_model.getRoot();
+        DefaultMutableTreeNode rootTreeNode = (DefaultMutableTreeNode) defaultTreeModel.getRoot();
         rootTreeNode.removeAllChildren();
 
         for (int k = 0; k < rootFiles.length; k++) {
@@ -78,7 +77,7 @@ public class JFileTree extends AbstractFileTree {
             }
         }
         // richer:不是LocalEnv根本就不会运行到这儿
-        m_model.reload(rootTreeNode);
+        defaultTreeModel.reload(rootTreeNode);
 
         if (rootFiles.length == 1) {
             File expandFile = rootFiles[0];
@@ -96,17 +95,14 @@ public class JFileTree extends AbstractFileTree {
 
     public File getSelectedFile() {
         TreePath selectedTreePath = this.getSelectionPath();
-        if(selectedTreePath == null) {
+        if (selectedTreePath == null) {
             return null;
         }
 
         DefaultMutableTreeNode currentTreeNode = this.getMutableTreeNode(selectedTreePath);
-        StringBuffer fBuf = new StringBuffer();
+        StringBuilder fBuf = new StringBuilder();
-        while (true) {
+        while (currentTreeNode != null) {
             // 如果已经到了根节点,直接退出.
-            if (currentTreeNode == null) {
-                break;
-            }
 
             Object object = currentTreeNode.getUserObject();
             if (object instanceof RootFile) {
@@ -128,6 +124,7 @@ public class JFileTree extends AbstractFileTree {
 
     /**
      * 通过文件夹寻找展开路径
+     *
      * @param currentFile 当前文件
      */
     public void selectFile(File currentFile) {
@@ -181,16 +178,15 @@ public class JFileTree extends AbstractFileTree {
 
     /**
      * 列出当前所有的File
+     *
      * @param currentTreeNode 当前文件节点
      * @return 当前节点下的所有File
      */
+    @Override
     public FileDirectoryNode[] listFileNodes(DefaultMutableTreeNode currentTreeNode) {
-        StringBuffer fBuf = new StringBuffer();
+        StringBuilder fBuf = new StringBuilder();
-        while (true) {
+        while (currentTreeNode != null) {
             // 如果已经到了根节点,直接退出.
-            if (currentTreeNode == null) {
-                break;
-            }
             Object object = currentTreeNode.getUserObject();
             if (object instanceof RootFile) {
                 RootFile rootFileNode = (RootFile) object;
@@ -199,7 +195,7 @@ public class JFileTree extends AbstractFileTree {
                 // 列出当前文件的所有子文件,要判断下是否是系统保护的文件 能否打开. 打不开的话显示为null
                 File[] files = currentFile.listFiles();
                 // 如果文件列表为null 或者为File[0] = []返回null
-                if (files == null ) {
+                if (files == null) {
                     return new FileDirectoryNode[0];
                 }
                 List fileNodeList = new ArrayList();
@@ -220,12 +216,12 @@ public class JFileTree extends AbstractFileTree {
                 FileDirectoryNode[] fileNodes = new FileDirectoryNode[fileNodeList.size()];
                 fileNodeList.toArray(fileNodes);
                 // 对文件夹进行排序
-                Arrays.sort(fileNodes, new FileNodeComparator());
+                Arrays.sort(fileNodes, new FileDirectoryNodeComparator());
                 return fileNodes;
             }
             // 名字进行逐层反序的回加. 例:  Doload ==> C:\java\Doload ,返回到文件夹的path,因为有可能是String. 所以加上instanceof
             if (object instanceof FileDirectoryNode) {
-            	FileDirectoryNode nameNode = (FileDirectoryNode)object;
+                FileDirectoryNode nameNode = (FileDirectoryNode) object;
                 fBuf.insert(0, nameNode.getName());
                 fBuf.insert(0, "/");
             }
@@ -240,6 +236,7 @@ public class JFileTree extends AbstractFileTree {
      */
     private DefaultTreeCellRenderer fileTreeCellRenderer = new DefaultTreeCellRenderer() {
 
+        @Override
         public Component getTreeCellRendererComponent(JTree tree, Object value,
                                                       boolean selected, boolean expanded, boolean leaf, int row,
                                                       boolean hasFocus) {
@@ -247,11 +244,8 @@ public class JFileTree extends AbstractFileTree {
                     leaf, row, hasFocus);
 
             DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
-			StringBuffer fBuf = new StringBuffer();
+            StringBuilder fBuf = new StringBuilder();
-			while(true) {
+            while (treeNode != null) {
-				if (treeNode == null) {
-					break;
-				}
                 Object userObj = treeNode.getUserObject();
                 if (userObj instanceof RootFile) {
                     RootFile rootFileNode = (RootFile) userObj;
@@ -262,21 +256,21 @@ public class JFileTree extends AbstractFileTree {
                     // 得到本地tree图标
                     Icon tmpIcon = view.getSystemIcon(currentFile);
                     if (currentFile.isDirectory() && fBuf.length() > 0) {
-                        tmpIcon=BaseUtils.readIcon("/com/fr/design/images/gui/folder.png");
+                        tmpIcon = BaseUtils.readIcon("/com/fr/design/images/gui/folder.png");
                     }
                     this.setIcon(tmpIcon);
                     this.setName(null);
                     Font oldFont = this.getFont();
-					if(ComparatorUtils.equals(currentFile.getName(), ProjectConstants.WEBINF_NAME)){
+                    if (ComparatorUtils.equals(currentFile.getName(), ProjectConstants.WEBINF_NAME)) {
                         this.setForeground(Color.blue);
-						this.setFont(new Font(oldFont.getName(),1,oldFont.getSize()));
+                        this.setFont(new Font(oldFont.getName(), Font.BOLD, oldFont.getSize()));
-					}else{
+                    } else {
-						this.setFont(new Font(oldFont.getName(),0,oldFont.getSize()));
+                        this.setFont(new Font(oldFont.getName(), Font.PLAIN, oldFont.getSize()));
                     }
                 }
                 // 名字进行逐层反序的回加. 例:  Doload ==> C:\java\Doload
-				if (userObj instanceof FileDirectoryNode ) {
+                if (userObj instanceof FileDirectoryNode) {
-					FileDirectoryNode nameNode = (FileDirectoryNode)userObj;
+                    FileDirectoryNode nameNode = (FileDirectoryNode) userObj;
                     fBuf.insert(0, nameNode.getName());
                     fBuf.insert(0, "/");
                 }
@@ -289,9 +283,10 @@ public class JFileTree extends AbstractFileTree {
 
     /**
      * 对文件夹进行排序 先文件夹 然后各种类型文件
+     *
      * @author kunsnat
      */
-    public class FileNodeComparator implements Comparator {
+    public class FileDirectoryNodeComparator implements Comparator<FileDirectoryNode> {
         /**
          * This method should return > 0 if v1 is greater than v2, 0 if
          * v1 is equal to v2, or < 0 if v1 is less than v2.
@@ -302,21 +297,19 @@ public class JFileTree extends AbstractFileTree {
          * @param v2 comparison value.值2
          * @return < 0, 0, or > 0 for v1<v2, v1==v2, or v1>v2 .值1大于值2返回大于0，相等返回0，小于和大于相反
          */
-        public int compare(Object v1, Object v2) {
+        @Override
-            FileDirectoryNode nameNode1 = (FileDirectoryNode) v1;
+        public int compare(FileDirectoryNode v1, FileDirectoryNode v2) {
-            FileDirectoryNode nameNode2 = (FileDirectoryNode) v2;
+            if (v1.isDirectory()) {
-
+                if (v2.isDirectory()) {
-            if (nameNode1.isDirectory()) {
+                    return v1.getName().toLowerCase().compareTo(v2.getName().toLowerCase());
-                if (nameNode2.isDirectory()) {
-                    return nameNode1.getName().toLowerCase().compareTo(nameNode2.getName().toLowerCase());
                 } else {
                     return -1;
                 }
             } else {
-                if (nameNode2.isDirectory()) {
+                if (v2.isDirectory()) {
                     return 1;
                 } else {
-                    return nameNode1.getName().toLowerCase().compareTo(nameNode2.getName().toLowerCase());
+                    return v1.getName().toLowerCase().compareTo(v2.getName().toLowerCase());
                 }
             }
         }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java

@@ -217,7 +217,7 @@ public class TemplateFileTree extends EnvFileTree {
             fileNodes = list.toArray(new FileNode[list.size()]);
         }
 
-        Arrays.sort(fileNodes, new FileNodeComparator());
+        Arrays.sort(fileNodes, new FileNodeComparator(FRContext.getFileNodes().getSupportedTypes()));
 
         return fileNodes;
     }

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

@@ -1,6 +0,0 @@
-package com.fr.design;
-
-public class mingche
-{
-
-}

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

@@ -211,7 +211,7 @@ public class FileNodeFILE implements FILE {
         try {
             FileNode[] nodeArray;
             nodeArray = listFile(node.getEnvPath());
-            Arrays.sort(nodeArray, new FileNodeComparator());
+            Arrays.sort(nodeArray, new FileNodeComparator(FRContext.getFileNodes().getSupportedTypes()));
 
             return fileNodeArray2FILEArray(nodeArray, envPath);
         } catch (Exception e) {
@@ -240,7 +240,7 @@ public class FileNodeFILE implements FILE {
                 return FRContext.getFileNodes().list(rootFilePath);
             }
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return new FileNode[0];
     }
@@ -280,7 +280,7 @@ public class FileNodeFILE implements FILE {
         try {
             return FRContext.getCommonOperator().fileLocked(node.getEnvPath());
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return false;
         }
     }
@@ -304,7 +304,7 @@ public class FileNodeFILE implements FILE {
         try {
             return WorkContext.getWorkResource().exist(node.getEnvPath());
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return false;
         }
     }