Browse Source

Merge pull request #280 in BA/design from ~LOY/design_fr:dev to dev

* commit '2c9a6f3ff8e5d265579edf073912145fd9345b44':
  修改接口
  修改
  扩展了一下AbstractJavaScriptActionProvider接口
master
superman 8 years ago
parent
commit
ce63bb1472
  1. 5
      designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
  2. 8
      designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
  3. 2
      designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java

5
designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java

@ -1,6 +1,7 @@
package com.fr.design.fun; package com.fr.design.fun;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.javascript.JavaScriptActionPane;
import com.fr.js.JavaScript; import com.fr.js.JavaScript;
import com.fr.stable.fun.mark.Mutable; import com.fr.stable.fun.mark.Mutable;
@ -13,6 +14,8 @@ public interface JavaScriptActionProvider extends Mutable{
int CURRENT_LEVEL = 1; int CURRENT_LEVEL = 1;
FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(); FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane();
FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane);
} }

8
designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java

@ -1,6 +1,9 @@
package com.fr.design.fun.impl; package com.fr.design.fun.impl;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.fun.JavaScriptActionProvider; import com.fr.design.fun.JavaScriptActionProvider;
import com.fr.design.javascript.JavaScriptActionPane;
import com.fr.js.JavaScript;
import com.fr.stable.fun.impl.AbstractProvider; import com.fr.stable.fun.impl.AbstractProvider;
import com.fr.stable.fun.mark.API; import com.fr.stable.fun.mark.API;
@ -18,4 +21,9 @@ public abstract class AbstractJavaScriptActionProvider extends AbstractProvider
public String mark4Provider() { public String mark4Provider() {
return getClass().getName(); return getClass().getName();
} }
@Override
public FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane) {
return getJavaScriptActionPane();
}
} }

2
designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java

@ -56,7 +56,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG); Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
if (javaScriptActionProviders != null) { if (javaScriptActionProviders != null) {
for (JavaScriptActionProvider jsp : javaScriptActionProviders) { for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
paneList.add(jsp.getJavaScriptActionPane()); paneList.add(jsp.getJavaScriptActionPane(this));
} }
} }
// 自定义事件 // 自定义事件

Loading…
Cancel
Save