Browse Source

Merge pull request #944 in BA/design from ~JU/ba-9.0-design:9.0 to 9.0

* commit 'a6293189069b734bb755eb11474b0a827b8b3cc5':
  语法最高1.7
master
superman 8 years ago
parent
commit
7c8b92b4b4
  1. 2
      designer_base/src/com/fr/design/extra/PluginInstalledPane.java
  2. 10
      designer_base/src/com/fr/design/extra/PluginOperateUtils.java
  3. 2
      designer_base/src/com/fr/design/extra/exe/callback/JSCallback.java
  4. 5
      designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

2
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

10
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() {

2
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() {

5
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() {

Loading…
Cancel
Save