[jboss-svn-commits] JBL Code SVN: r35934 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/ruleeditor and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 10 07:21:30 EST 2010
Author: eaa
Date: 2010-11-10 07:21:29 -0500 (Wed, 10 Nov 2010)
New Revision: 35934
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorServiceAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java
Log:
GUVNOR-681: Create a new top component to display and run the Guided Editor (RuleModeller) and all the things it needs in a "standalone" way
- removeAssets() is no longer needed and it was removed.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorService.java 2010-11-10 10:00:47 UTC (rev 35933)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorService.java 2010-11-10 12:21:29 UTC (rev 35934)
@@ -36,6 +36,5 @@
StandaloneGuidedEditorInvocationParameters getInvocationParameters() throws DetailedSerializationException;
String[] getAsstesDRL(RuleAsset[] assets) throws SerializationException;
String[] getAsstesBRL(RuleAsset[] assets) throws SerializationException;
- void removeAssets(String[] assetsUUIDs);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorServiceAsync.java 2010-11-10 10:00:47 UTC (rev 35933)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorServiceAsync.java 2010-11-10 12:21:29 UTC (rev 35934)
@@ -29,6 +29,5 @@
void getInvocationParameters(AsyncCallback<StandaloneGuidedEditorInvocationParameters> asyncCallback);
void getAsstesDRL(RuleAsset[] assets, AsyncCallback<String[]> asyncCallback);
void getAsstesBRL(RuleAsset[] assets, AsyncCallback<String[]> asyncCallback);
- void removeAssets(String[] assetsUUIDs, AsyncCallback<Void> asyncCallback);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java 2010-11-10 10:00:47 UTC (rev 35933)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java 2010-11-10 12:21:29 UTC (rev 35934)
@@ -1,7 +1,6 @@
package org.drools.guvnor.client.ruleeditor;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Window.ClosingEvent;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
@@ -11,7 +10,6 @@
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.ScrollPanel;
@@ -39,23 +37,11 @@
private RuleAsset[] assets;
- private Window.ClosingHandler windowCloseingHandler = new Window.ClosingHandler() {
-
- public void onWindowClosing(ClosingEvent event) {
- removeAssets();
- }
- };
-
public Panel getBaseLayout() {
- //init JS hoocks
+ //init JS hooks
this.setHooks(this);
- //remove assets on close
- if (Boolean.parseBoolean(Window.Location.getParameter("removeAssetsOnClose"))){
- Window.addWindowClosingHandler(windowCloseingHandler);
- }
-
mainLayout = new DockLayoutPanel(Unit.EM);
final ScrollPanel mainPanel = new ScrollPanel();
@@ -134,30 +120,6 @@
}
/**
- * Remove the assets used by this Guided Editor instance
- */
- public void removeAssets(){
-
- String[] assetsIds = new String[this.assets.length];
- for (int i = 0; i < this.assets.length; i++) {
- RuleAsset ruleAsset = this.assets[i];
- assetsIds[i] = ruleAsset.uuid;
- }
-
- standaloneGuidedEditorService.removeAssets(assetsIds, new AsyncCallback<Void>() {
-
- public void onFailure(Throwable caught) {
- removeAssetsCallback(false,caught.getMessage());
- }
-
- public void onSuccess(Void result) {
- LoadingPopup.showMessage("Assets removed");
- removeAssetsCallback(true,"Assets removed");
- }
- });
- }
-
- /**
* This method should be invoked from JS using window.getEditorDRL().
* Returns the DRL of the assets we are editing. Because this method is
* asynchronous, the DRL code is passed to a callback function specified
@@ -227,12 +189,6 @@
app. at org.drools.guvnor.client.ruleeditor.GuidedEditorManager::getBRLs()();
};
-
- $wnd.removeAssets = function (callbackFunction) {
- $wnd.guvnorGuidedEditorRemoveAssetsCallbackFunction = callbackFunction;
- app. at org.drools.guvnor.client.ruleeditor.GuidedEditorManager::removeAssets()();
- };
-
//close function listener. The function you register here will be called
//after the "Save and Close" button is pressed
$wnd.guvnorGuidedEditorOnSaveAndCloseFunction=null;
@@ -258,20 +214,9 @@
if ($wnd.guvnorGuidedEditorBRLCallbackFunction){
$wnd.guvnorGuidedEditorBRLCallbackFunction(brl);
}
- }-*/;
+ }-*/;
/**
- * Callback method invoked from removeAssets().
- * @param success
- * @param message
- */
- public native void removeAssetsCallback(boolean success, String message)/*-{
- if ($wnd.guvnorGuidedEditorRemoveAssetsCallbackFunction){
- $wnd.guvnorGuidedEditorRemoveAssetsCallbackFunction(success, message);
- }
- }-*/;
-
- /**
* Method invoked after the "Save an Close" button is pressed.
*/
public native void afterSaveAndClose()/*-{
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java 2010-11-10 10:00:47 UTC (rev 35933)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java 2010-11-10 12:21:29 UTC (rev 35934)
@@ -38,9 +38,6 @@
GE_RULE_PARAMETER_NAME(
"ruleName", false),
- GE_RULE_REMOVE_ASSETS_ON_CLOSE_PARAMETER_NAME(
- "removeAssetsOnClose", false),
-
GE_HIDE_RULE_LHS_PARAMETER_NAME(
"hideRuleLHS", false), GE_HIDE_RULE_RHS_PARAMETER_NAME(
"hideRuleRHS", false), GE_HIDE_RULE_ATTRIBUTES_PARAMETER_NAME(
@@ -82,9 +79,7 @@
}
}
- boolean removeAssetsOnClose = req.getParameter( GUIDED_EDITOR_SERVLET_PARAMETERS.GE_RULE_REMOVE_ASSETS_ON_CLOSE_PARAMETER_NAME.getParameterName() ) == null ? false : Boolean.parseBoolean( req.getParameter( GUIDED_EDITOR_SERVLET_PARAMETERS.GE_RULE_REMOVE_ASSETS_ON_CLOSE_PARAMETER_NAME.getParameterName() ) );
-
- resp.sendRedirect( "GuidedEditor.html?" + GUIDED_EDITOR_SERVLET_PARAMETERS.GE_RULE_REMOVE_ASSETS_ON_CLOSE_PARAMETER_NAME.getParameterName() + "=" + removeAssetsOnClose + "&" + req.getQueryString() );
+ resp.sendRedirect( "GuidedEditor.html?" + req.getQueryString() );
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java 2010-11-10 10:00:47 UTC (rev 35933)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java 2010-11-10 12:21:29 UTC (rev 35934)
@@ -26,7 +26,6 @@
import org.drools.guvnor.server.guidededitor.NewRuleAssetProvider;
import org.drools.guvnor.server.guidededitor.RuleAssetProvider;
import org.drools.guvnor.server.guidededitor.UUIDRuleAssetProvider;
-import org.drools.guvnor.server.util.LoggingHelper;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
import org.drools.ide.common.server.util.BRLPersistence;
import org.drools.repository.RulesRepository;
@@ -168,12 +167,4 @@
return sources;
}
-
- /**
- * Remove all the given assets
- * @param assetsUUIDs the assets UUIDs
- */
- public void removeAssets(String[] assetsUUIDs) {
- this.getService().removeAssets( assetsUUIDs );
- }
}
More information about the jboss-svn-commits
mailing list