Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0

designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java

@@ -26,6 +26,9 @@ public class AlphaFineHelper {
      * 弹出alphafine搜索面板
      */
     public static void showAlphaFineDialog(boolean forceOpen) {
+        if (!AlphaFineConfigManager.isALPHALicAvailable()) {
+            return;
+        }
         if (alphaFineDialog == null) {
             alphaFineDialog = new AlphaFineDialog(DesignerContext.getDesignerFrame(), forceOpen);
             alphaFineDialog.setVisible(true);

designer_base/src/com/fr/design/mainframe/DesignerFrame.java

@@ -339,7 +339,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             processor = new DefaultTitlePlace();
         }
         processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane());
-        if (AlphaFineConfigManager.isALPHALicAvailable() && DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
+        if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
             northEastPane.add(ad.createAlphaFinePane(), BorderLayout.CENTER);
         }
     }