From 2c9a6f3ff8e5d265579edf073912145fd9345b44 Mon Sep 17 00:00:00 2001
From: loy <loy@finereport.com>
Date: Tue, 23 Aug 2016 17:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/fun/JavaScriptActionProvider.java  | 9 +++------
 .../fun/impl/AbstractJavaScriptActionProvider.java       | 5 ++++-
 .../com/fr/design/javascript/JavaScriptActionPane.java   | 3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java b/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
index f860b3b148..f3e00932a3 100644
--- a/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
+++ b/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
@@ -14,11 +14,8 @@ public interface JavaScriptActionProvider extends Mutable{
 
     int CURRENT_LEVEL = 1;
 
-    /**
-     * 传给插件额外参数
-     * @param pane
-     */
-    void setJavaScriptActionPane(JavaScriptActionPane pane);
-
     FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane();
+
+    FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane);
+
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
index 6356970746..69e2770320 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
@@ -1,7 +1,9 @@
 package com.fr.design.fun.impl;
 
+import com.fr.design.beans.FurtherBasicBeanPane;
 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.mark.API;
 
@@ -21,6 +23,7 @@ public abstract class AbstractJavaScriptActionProvider extends AbstractProvider
     }
 
     @Override
-    public void setJavaScriptActionPane(JavaScriptActionPane pane) {
+    public FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane) {
+        return getJavaScriptActionPane();
     }
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java
index a74f3deca9..52648e444a 100644
--- a/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java
+++ b/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java
@@ -56,8 +56,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
         if (javaScriptActionProviders != null) {
             for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
-                jsp.setJavaScriptActionPane(this);
-                paneList.add(jsp.getJavaScriptActionPane());
+                paneList.add(jsp.getJavaScriptActionPane(this));
             }
         }
         // 自定义事件