Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hades/design into feature/10.0

designer-base/src/main/java/com/fr/design/extra/LoginDialog.java

@@ -4,12 +4,8 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StableUtils;
 
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
+import javax.swing.*;
+import java.awt.*;
 
 /**
  * Created by vito on 2017/5/5.
@@ -41,5 +37,6 @@ public class LoginDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
+        // do nothing
     }
 }

designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java

@@ -14,10 +14,8 @@ import javafx.concurrent.Task;
 import javafx.scene.web.WebEngine;
 import netscape.javascript.JSObject;
 
-import javax.swing.JDialog;
-import javax.swing.SwingUtilities;
-import java.awt.Color;
-import java.awt.Desktop;
+import javax.swing.*;
+import java.awt.*;
 import java.net.URI;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -221,5 +219,6 @@ public class LoginWebBridge {
     }
 
     public void openUrlAtLocalWebBrowser(WebEngine eng, String url) {
+        // do nothing
     }
 }

designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java

@@ -4,7 +4,6 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
 
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -88,7 +87,7 @@ public abstract class PluginAbstractLoadingViewPane<V, T> extends PluginAbstract
 
             @Override
             public void pressInstallButton() {
-
+                // do nothing
             }
 
             @Override

designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java

@@ -7,7 +7,6 @@ import com.fr.design.gui.ilist.UIList;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
-
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.license.Licensed;
 import com.fr.plugin.manage.PluginManager;
@@ -23,7 +22,7 @@ import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -155,7 +154,7 @@ public class PluginControlPane extends BasicPane {
         PluginManager.getController().uninstall(PluginMarker.create(id, version), true, new PluginTaskCallback() {
             @Override
             public void done(PluginTaskResult result) {
-
+                // do nothing
             }
         });
     }

designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@@ -13,11 +13,7 @@ import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.File;
 import java.util.List;
@@ -98,7 +94,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
 
             @Override
             public void pressInstallButton() {
-
+                // do nothing
             }
 
             @Override
@@ -174,7 +170,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
             PluginManager.getController().install(chosenFile, new ProgressCallback() {
                 @Override
                 public void updateProgress(String description, double progress) {
-
+                    // do nothing
                 }
 
                 @Override

designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@@ -4,7 +4,6 @@ import com.fr.config.MarketConfig;
 import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
-
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
@@ -192,7 +191,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
         PluginManager.getController().update(chosenFile, new ProgressCallback() {
             @Override
             public void updateProgress(String description, double progress) {
-
+                // do nothing
             }
 
             @Override

designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java

@@ -55,7 +55,7 @@ public class PluginWebBridge {
     private static PluginWebBridge helper;
 
     private UIDialog uiDialog;
-    private ACTIONS action;
+    private ACTIONS actions;
 
     private Map<String, Object> config;
     private WebEngine webEngine;
@@ -94,10 +94,10 @@ public class PluginWebBridge {
      * @return 配置信息
      */
     public String getRunConfig() {
-        if (action != null) {
+        if (actions != null) {
             JSONObject jsonObject = new JSONObject();
             try {
-                jsonObject.put(ACTION, action.getContext());
+                jsonObject.put(ACTION, actions.getContext());
                 Set<String> keySet = config.keySet();
                 for (String key : keySet) {
                     jsonObject.put(key, config.get(key).toString());
@@ -117,7 +117,7 @@ public class PluginWebBridge {
      * @param config 参数
      */
     public void setRunConfig(ACTIONS action, Map<String, Object> config) {
-        this.action = action;
+        this.actions = action;
         this.config = config;
     }
 
@@ -125,7 +125,7 @@ public class PluginWebBridge {
      * 清楚打开动作
      */
     public void clearRunConfig() {
-        this.action = null;
+        this.actions = null;
         this.config = null;
     }
 

designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java

@@ -3,7 +3,6 @@ package com.fr.design.extra;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 
-
 import javax.swing.*;
 import java.awt.*;
 
@@ -27,6 +26,7 @@ public class QQLoginDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
+        // do nothing
     }
 
 }

designer-base/src/main/java/com/fr/design/extra/ShopDialog.java

@@ -29,5 +29,6 @@ public class ShopDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
+        // do nothing
     }
 }

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

@@ -21,26 +21,9 @@ import com.fr.third.javax.annotation.Nonnull;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.TplOperator;
 
-import javax.swing.BorderFactory;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
+import javax.swing.*;
 import javax.swing.plaf.basic.BasicMenuItemUI;
-import java.awt.AWTEvent;
-import java.awt.AlphaComposite;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -854,7 +837,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseEntered(MouseEvent e) {
-
+            // do nothing
         }
 
         /**
@@ -877,6 +860,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseReleased(MouseEvent e) {
+            // do nothing
         }
 
         /**
@@ -886,6 +870,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseClicked(MouseEvent e) {
+            // do nothing
         }
 
         /**
@@ -957,6 +942,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseDragged(MouseEvent e) {
+            // do nothing
         }
 
         /**

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

@@ -135,7 +135,7 @@ public class NodeAuthProcessor {
      * @param fileNode file nodes
      * @return 带权限信息的文件节点
      */
-    public boolean fixFileNodeAuth(FileNode fileNode) {
+    public boolean checkFileNodeAuth(FileNode fileNode) {
 
         boolean isLocal = WorkContext.getCurrent().isLocal();
         boolean isRoot = WorkContext.getCurrent().isRoot();

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -27,17 +27,7 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
 
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TreeSelectionEvent;
@@ -47,10 +37,7 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -148,10 +135,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         keyWordTextField.addKeyListener(new KeyListener() {
             @Override
             public void keyTyped(KeyEvent e) {
+                //do nothing
             }
 
             @Override
             public void keyReleased(KeyEvent e) {
+                //do nothing
             }
 
             @Override
@@ -236,7 +225,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
 
     protected void extendCheckBoxPane(JPanel checkBoxPane) {
-
+        // do nothing
     }
 
     private void configFormulaArea() {
@@ -412,6 +401,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     @Override
     public void keyTyped(KeyEvent e) {
+        // do nothing
     }
 
     protected void search(String keyWord, boolean findDescription) {

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

@@ -23,7 +23,7 @@ import com.fr.workspace.WorkspaceEvent;
 import com.fr.workspace.resource.WorkResourceTempRenameStream;
 import com.fr.workspace.server.lock.TplOperator;
 
-import javax.swing.Icon;
+import javax.swing.*;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -68,14 +68,14 @@ public class FileNodeFILE implements FILE {
 
         this.node = new FileNode(StableUtils.pathJoin(parentDir, name), isDir);
         this.envPath = WorkContext.getCurrent().getPath();
-        this.hasFullAuth = NodeAuthProcessor.getInstance().fixFileNodeAuth(node);
+        this.hasFullAuth = NodeAuthProcessor.getInstance().checkFileNodeAuth(node);
     }
 
 
     public FileNodeFILE(FileNode node) {
         this.node = node;
         this.envPath = WorkContext.getCurrent().getPath();
-        this.hasFullAuth = NodeAuthProcessor.getInstance().fixFileNodeAuth(node);
+        this.hasFullAuth = NodeAuthProcessor.getInstance().checkFileNodeAuth(node);
     }
 
     public FileNodeFILE(FileNode node, boolean hasFullAuth) {
@@ -91,7 +91,7 @@ public class FileNodeFILE implements FILE {
     public FileNodeFILE(FileNode node, String envPath) {
         this.node = node;
         this.envPath = envPath;
-        this.hasFullAuth = NodeAuthProcessor.getInstance().fixFileNodeAuth(node);
+        this.hasFullAuth = NodeAuthProcessor.getInstance().checkFileNodeAuth(node);
     }
 
     public FileNodeFILE(FileNode node, String envPath, boolean hasFullAuth) {