Merge pull request #1102 in BA/design from ~XIAOXIA/design:release/9.0 to release/9.0

* commit '89df2e5bcc20a01bc6f72b04cda5080ac0c25d55':
  pmd
  pmd
  pmd
  rt
  bug fix
  rt
  功能点
  bug fix
  alphafine 交互改良
  alphafine 细节修改

designer/src/com/fr/design/mainframe/alphafine/cell/render/TitleCellRender.java

@@ -33,14 +33,6 @@ public class TitleCellRender implements ListCellRenderer<Object> {
             showMoreLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
             panel.add(showMoreLabel, BorderLayout.EAST);
         }
-        if (moreModel.isLoading()) {
-            ImageIcon imageIcon = new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/loading.gif"));
-            //设置cell的加载动画
-            imageIcon.setImageObserver(list);
-            UILabel loadingLabel = new UILabel(imageIcon);
-            loadingLabel.setBorder(BorderFactory.createEmptyBorder(LOAD_OFFSET,0,0,0));
-            panel.add(loadingLabel, 0);
-        }
         panel.setPreferredSize(new Dimension(list.getFixedCellWidth(), AlphaFineConstants.CELL_TITLE_HEIGHT));
         return panel;
     }

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -17,7 +17,10 @@ import com.fr.design.mainframe.alphafine.cell.model.PluginModel;
 import com.fr.design.mainframe.alphafine.cell.render.ContentCellRender;
 import com.fr.design.mainframe.alphafine.listener.DocumentAdapter;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
-import com.fr.design.mainframe.alphafine.preview.*;
+import com.fr.design.mainframe.alphafine.preview.DocumentPreviewPane;
+import com.fr.design.mainframe.alphafine.preview.FilePreviewPane;
+import com.fr.design.mainframe.alphafine.preview.NoResultPane;
+import com.fr.design.mainframe.alphafine.preview.PluginPreviewPane;
 import com.fr.design.mainframe.alphafine.search.manager.*;
 import com.fr.form.main.Form;
 import com.fr.form.main.FormIO;
@@ -72,9 +75,11 @@ public class AlphaFineDialog extends UIDialog {
     private AlphaFineTextField searchTextField;
     private UIButton closeButton;
     private JPanel searchResultPane;
-    private Point pressedPoint;
     private UIScrollPane leftSearchResultPane;
+
     private JPanel defaultPane;
+    //分割线
+    private UILabel splitLabel;
     private JPanel rightSearchResultPane;
     private AlphaFineList searchResultList;
     private SearchListModel searchListModel;
@@ -302,7 +307,7 @@ public class AlphaFineDialog extends UIDialog {
         rightSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH - 1, AlphaFineConstants.CONTENT_HEIGHT));
         searchResultPane.add(leftSearchResultPane, BorderLayout.WEST);
         searchResultPane.add(rightSearchResultPane, BorderLayout.EAST);
-        UILabel splitLabel = new UILabel();
+        splitLabel = new UILabel();
         splitLabel.setPreferredSize(new Dimension(AlphaFineConstants.HEIGHT, 1));
         searchResultPane.add(splitLabel, BorderLayout.NORTH);
         add(searchResultPane, BorderLayout.SOUTH);
@@ -320,6 +325,8 @@ public class AlphaFineDialog extends UIDialog {
         this.searchWorker = new SwingWorker() {
             @Override
             protected Object doInBackground() throws Exception {
+                resumeLeftPane();
+                splitLabel.setIcon(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/bigloading.gif")));
                 rebuildList(searchTextField.getText().toLowerCase());
                 return null;
             }
@@ -327,6 +334,7 @@ public class AlphaFineDialog extends UIDialog {
             @Override
             protected void done() {
                 if (!isCancelled()) {
+                    splitLabel.setIcon(null);
                     fireStopLoading();
                 }
             }
@@ -334,12 +342,39 @@ public class AlphaFineDialog extends UIDialog {
         this.searchWorker.execute();
     }
 
+    /**
+     * 恢复左侧列表面板
+     */
+    private void resumeLeftPane() {
+        if (searchResultPane != null && defaultPane != null) {
+            rightSearchResultPane.removeAll();
+            searchResultPane.remove(defaultPane);
+            defaultPane = null;
+            searchResultPane.add(leftSearchResultPane, BorderLayout.WEST);
+            refreshContainer();
+        }
+    }
+
+    /**
+     * 移除左侧列表面板
+     */
+    private void removeLeftPane() {
+        if (searchListModel.isEmpty() && defaultPane == null) {
+            defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png"));
+            searchResultPane.remove(leftSearchResultPane);
+            searchResultPane.add(defaultPane, BorderLayout.WEST);
+            refreshContainer();
+        }
+    }
+
     /**
      * 停止加载状态
      */
     private void fireStopLoading() {
         searchListModel.resetState();
-        replaceLeftPane();
+        if (searchResultPane != null) {
+            removeLeftPane();
+        }
     }
 
     /**
@@ -351,22 +386,6 @@ public class AlphaFineDialog extends UIDialog {
         revalidate();
     }
 
-    /**
-     * 重置结果面板
-     */
-    private void replaceLeftPane() {
-        if (searchListModel.getSize() == 0 && defaultPane == null) {
-            defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png"));
-            searchResultPane.remove(leftSearchResultPane);
-            searchResultPane.add(defaultPane, BorderLayout.WEST);
-        } else if (searchListModel.getSize() > 0 && defaultPane != null) {
-            searchResultPane.remove(defaultPane);
-            defaultPane = null;
-            searchResultPane.add(leftSearchResultPane, BorderLayout.WEST);
-        }
-        refreshContainer();
-    }
-
     /**
      * 重新构建搜索结果列表
      * 先根据输入判断是不是隐藏的搜索功能
@@ -409,8 +428,7 @@ public class AlphaFineDialog extends UIDialog {
         searchListModel.removeAllElements();
         searchListModel.resetSelectedState();
         rightSearchResultPane.removeAll();
-        validate();
+        refreshContainer();
-        repaint();
     }
 
     /**
@@ -605,7 +623,7 @@ public class AlphaFineDialog extends UIDialog {
                 this.showWorker.execute();
                 break;
             default:
-                return;
+                rightSearchResultPane.removeAll();
 
         }
 
@@ -680,45 +698,6 @@ public class AlphaFineDialog extends UIDialog {
 
     }
 
-    /**
-     * 窗口拖拽
-     */
-    private void initMouseListener() {
-        addMouseMotionListener(new MouseMotionAdapter() {
-            @Override
-            public void mouseDragged(MouseEvent e) {
-                doMouseDragged(e);
-            }
-        });
-
-        addMouseListener(new MouseAdapter() {
-            public void mousePressed(MouseEvent e) {
-                doMousePressed(e);
-            }
-
-        });
-    }
-
-    private void doMousePressed(MouseEvent e) {
-
-        pressedPoint = e.getPoint();
-
-    }
-
-    private void doMouseDragged(MouseEvent e) {
-
-        Point point = e.getPoint();// 获取当前坐标
-
-        Point locationPoint = getLocation();// 获取窗体坐标
-
-        int x = locationPoint.x + point.x - pressedPoint.x;// 计算移动后的新坐标
-
-        int y = locationPoint.y + point.y - pressedPoint.y;
-
-        setLocation(x, y);// 改变窗体位置
-
-    }
-
     /**
      * 当鼠标在搜索界面边界外点击时触发
      */
@@ -792,7 +771,7 @@ public class AlphaFineDialog extends UIDialog {
             }
             final HashMap<String, String> para = new HashMap<>();
             String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
-            para.put("token", CodeUtils.md5Encode(date, "", "MD5"));
+            para.put("token", CodeUtils.md5Encode(date, StringUtils.EMPTY, "MD5"));
             para.put("content", object.toString());
             HttpClient httpClient = new HttpClient(AlphaFineConstants.CLOUD_SERVER_URL, para, true);
             httpClient.asGet();
@@ -880,6 +859,14 @@ public class AlphaFineDialog extends UIDialog {
         this.storeText = storeText;
     }
 
+    public UILabel getSplitLabel() {
+        return splitLabel;
+    }
+
+    public void setSplitLabel(UILabel splitLabel) {
+        this.splitLabel = splitLabel;
+    }
+
 
     /**
      * +-------------------------------------+
@@ -1047,8 +1034,13 @@ public class AlphaFineDialog extends UIDialog {
             isValidSelected = selected;
         }
 
+        @Override
+        public boolean isEmpty() {
+            return myDelegate.isEmpty();
+        }
+
         public void resetState() {
-            for (int i = 0; i< getSize(); i++) {
+            for (int i = 0; i < getSize(); i++) {
                 getElementAt(i).resetState();
             }
         }

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java

@@ -30,6 +30,7 @@ public class AlphaFinePane extends BasicPane {
         refreshButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/smallsearch.png"));
         refreshButton.setToolTipText(Inter.getLocText("FR-Designer_AlphaFine"));
         refreshButton.set4ToolbarButton();
+        refreshButton.setRolloverEnabled(false);
         this.add(refreshButton);
         this.setBackground(ThemeUtils.WHITE_BORDER_COLOR);
         refreshButton.addActionListener(new ActionListener() {

designer_base/src/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java

@@ -1,5 +1,7 @@
 package com.fr.design.actions.help.alphafine;
 
+import com.fr.base.FRCoreContext;
+import com.fr.general.VT4FR;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLPrintWriter;
@@ -88,7 +90,8 @@ public class AlphaFineConfigManager implements XMLable {
 
     @Override
     public Object clone() throws CloneNotSupportedException {
-        return super.clone();
+        AlphaFineConfigManager manager = (AlphaFineConfigManager) super.clone();
+        return manager;
     }
 
     @Override
@@ -199,7 +202,10 @@ public class AlphaFineConfigManager implements XMLable {
     }
 
     public boolean isEnabled() {
-        return isEnabled;
+        if (VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.ALPHA_FINE.support()) {
+            return isEnabled;
+        }
+        return false;
     }
 
     public void setEnabled(boolean isEnabled) {

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -5,6 +5,7 @@ package com.fr.design.mainframe.toolbar;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
+import com.fr.base.FRCoreContext;
 import com.fr.design.DesignState;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
@@ -34,6 +35,7 @@ import com.fr.env.RemoteEnv;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.general.VT4FR;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginRuntime;
 import com.fr.plugin.manage.PluginFilter;
@@ -379,8 +381,10 @@ public abstract class ToolBarMenuDock {
             //  shortCuts.add(new ForumAction());
         }
         shortCuts.add(SeparatorDef.DEFAULT);
-        shortCuts.add(new AlphaFineAction());
+        if (VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.ALPHA_FINE.support()) {
-        shortCuts.add(SeparatorDef.DEFAULT);
+            shortCuts.add(new AlphaFineAction());
+            shortCuts.add(SeparatorDef.DEFAULT);
+        }
         shortCuts.add(new AboutAction());
         return shortCuts.toArray(new ShortCut[shortCuts.size()]);
     }