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

designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.errorinfo;
 
 import com.fr.base.FRContext;
+import com.fr.base.FRCoreContext;
 import com.fr.general.*;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONException;
@@ -27,6 +28,7 @@ public class ErrorInfoUploader {
     public static final String FOLDER_NAME = "errorInfo";
 
     private static ErrorInfoUploader collector;
+    private static boolean licSupport = true;
 
     static {
         GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@@ -35,6 +37,9 @@ public class ErrorInfoUploader {
                 FRLogger.getLogger().addLogAppender(new ErrorInfoLogAppender());
             }
         });
+
+        // 这个控制没啥意义, 主要在于宣传功能.
+        licSupport = VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.ALPHA_FINE.support();
     }
 
     private ErrorInfoUploader() {
@@ -51,6 +56,11 @@ public class ErrorInfoUploader {
 
     // 从云中心更新最新的解决方案文件
     private void checkUpdateSolution(){
+        if (!licSupport) {
+            return;
+        }
+
+
         Thread updateThread = new Thread(new Runnable() {
             @Override
             public void run() {

designer_base/src/com/fr/design/gui/UIDefaultTheme.java

@@ -170,8 +170,8 @@ public class UIDefaultTheme extends DefaultMetalTheme {
         table.put("Tree.textForeground", ThemeUtils.NORMAL_FOREGROUND);
         table.put("Tree.selectionBackground", ThemeUtils.TEXT_SELECTED_BG_COLOR);
         table.put("Tree.selectionForeground", ThemeUtils.TEXT_SELECTED_TEXT_COLOR);
-        table.put("Tree.hash", new ColorUIResource(208, 205, 190));
+        table.put("Tree.hash", new ColorUIResource(240, 240,243));
-        table.put("Tree.line", new ColorUIResource(208, 205, 190));
+        table.put("Tree.line", new ColorUIResource(240, 240,243));
     }