From a6293189069b734bb755eb11474b0a827b8b3cc5 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Fri, 16 Jun 2017 16:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E6=B3=95=E6=9C=80=E9=AB=981.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/extra/PluginInstalledPane.java   |  2 +-
 .../src/com/fr/design/extra/PluginOperateUtils.java    | 10 +++++-----
 .../com/fr/design/extra/exe/callback/JSCallback.java   |  2 +-
 .../fr/design/mainframe/toolbar/ToolBarMenuDock.java   |  5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/designer_base/src/com/fr/design/extra/PluginInstalledPane.java b/designer_base/src/com/fr/design/extra/PluginInstalledPane.java
index 0ad45bfde2..61750503b3 100644
--- a/designer_base/src/com/fr/design/extra/PluginInstalledPane.java
+++ b/designer_base/src/com/fr/design/extra/PluginInstalledPane.java
@@ -61,7 +61,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                 if (plugin != null) {
                     boolean isActive = plugin.isActive();
                     PluginMarker pluginMarker = PluginMarker.create(plugin.getID(), plugin.getVersion());
-                    String modifyMessage = isActive ? Inter.getLocText("FR-Designer-Plugin_Has_Been_Actived") : Inter.getLocText("FR-Designer-Plugin_Has_Been_Disabled");
+                    final String modifyMessage = isActive ? Inter.getLocText("FR-Designer-Plugin_Has_Been_Actived") : Inter.getLocText("FR-Designer-Plugin_Has_Been_Disabled");
                     if (isActive) {
                         PluginManager.getController().forbid(pluginMarker, new PluginTaskCallback() {
                             @Override
diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java
index 6b6c0409ad..21104b3a73 100644
--- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java
+++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java
@@ -83,7 +83,7 @@ public class PluginOperateUtils {
         PluginManager.getController().uninstall(pluginMarker, isForce, new UninstallPluginCallback(pluginMarker, jsCallback));
     }
 
-    public static void readUpdateOnline(JSCallback jsCallback) {
+    public static void readUpdateOnline(final JSCallback jsCallback) {
 
         new Thread(new Runnable() {
             @Override
@@ -107,7 +107,7 @@ public class PluginOperateUtils {
 
     }
 
-    public static void searchPlugin(String keyword, JSCallback jsCallback) {
+    public static void searchPlugin(final String keyword, final JSCallback jsCallback) {
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -130,7 +130,7 @@ public class PluginOperateUtils {
 
     }
 
-    public static void getPluginFromStore(String category, String seller, String fee, JSCallback jsCallback) {
+    public static void getPluginFromStore(final String category, final String seller, final String fee, final JSCallback jsCallback) {
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -209,7 +209,7 @@ public class PluginOperateUtils {
         }
     }
 
-    public static void getPluginCategories(JSCallback jsCallback) {
+    public static void getPluginCategories(final JSCallback jsCallback) {
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -226,7 +226,7 @@ public class PluginOperateUtils {
         }).start();
     }
 
-    public static void getPluginPrefix(JSCallback jsCallback) {
+    public static void getPluginPrefix(final JSCallback jsCallback) {
         new Thread(new Runnable() {
             @Override
             public void run() {
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java
index bf421e67fa..c64bdafad8 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java
@@ -21,7 +21,7 @@ public class JSCallback<T> extends Task<T> {
     public void init(final WebEngine webEngine, final JSObject callback){
         messageProperty().addListener(new ChangeListener<String>() {
             @Override
-            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+            public void changed(ObservableValue<? extends String> observable, String oldValue, final String newValue) {
                 Platform.runLater(new Runnable() {
                     @Override
                     public void run() {
diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 669b447aa6..4bc3658b44 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -585,11 +585,12 @@ public abstract class ToolBarMenuDock {
     protected void insertMenu(MenuDef menuDef, String anchor, ShortCutMethodAction action) {
         
         listenPluginMenuChange(menuDef, anchor, action);
-        addExtraMenus(menuDef, anchor, action, ExtraDesignClassManager.getInstance().getArray(MenuHandler.MARK_STRING));
+        Set<MenuHandler> set = ExtraDesignClassManager.getInstance().getArray(MenuHandler.MARK_STRING);
+        addExtraMenus(menuDef, anchor, action, set);
         
     }
     
-    private void listenPluginMenuChange(MenuDef menuDef, String anchor, ShortCutMethodAction action) {
+    private void listenPluginMenuChange(final MenuDef menuDef, final String anchor, final ShortCutMethodAction action) {
         
         PluginFilter filter = new PluginFilter() {