[jboss-svn-commits] JBL Code SVN: r35925 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/modeldriven/ui/factPattern and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 9 14:17:30 EST 2010
Author: eaa
Date: 2010-11-09 14:17:30 -0500 (Tue, 09 Nov 2010)
New Revision: 35925
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/Connectives.java
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/StandaloneGuidedEditorServiceImplementation.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.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
- Now it is possible to retrieve DRL and BRL using javascript without having to retrieve the assets from the repository. This is useful when editing temporal brls rules.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2010-11-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -117,7 +117,6 @@
this.bindable = canBind;
this.connectives = new Connectives();
- this.connectives.setCompletions(mod.getSuggestionCompletions());
this.connectives.setModeller(mod);
this.connectives.setPattern(pattern);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/Connectives.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/Connectives.java 2010-11-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/Connectives.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -35,7 +35,6 @@
public class Connectives {
private FactPattern pattern;
- private SuggestionCompletionEngine completions;
private RuleModeller modeller;
private Constants constants = ((Constants) GWT.create(Constants.class));
@@ -58,17 +57,10 @@
* Returns the completions.
*/
public SuggestionCompletionEngine getCompletions() {
- return completions;
+ return this.modeller.getSuggestionCompletions();
}
/**
- * Sets completions.
- */
- public void setCompletions(SuggestionCompletionEngine completions) {
- this.completions = completions;
- }
-
- /**
* Returns the modeller.
*/
public RuleModeller getModeller() {
@@ -104,7 +96,7 @@
}
private Widget connectiveOperatorDropDown(final ConnectiveConstraint con, String fieldName) {
- String[] ops = completions.getConnectiveOperatorCompletions( pattern.factType, fieldName );
+ String[] ops = this.getCompletions().getConnectiveOperatorCompletions( pattern.factType, fieldName );
final ListBox box = new ListBox();
box.addItem(constants.pleaseChoose());
for ( int i = 0; i < ops.length; i++ ) {
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-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorService.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -34,8 +34,8 @@
StandaloneGuidedEditorInvocationParameters getInvocationParameters() throws DetailedSerializationException;
- String[] getAsstesDRL(String[] assetsUids) throws SerializationException;
- String[] getAsstesBRL(String[] assetsUids) throws SerializationException;
+ 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-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/StandaloneGuidedEditorServiceAsync.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -27,7 +27,8 @@
public interface StandaloneGuidedEditorServiceAsync {
void getInvocationParameters(AsyncCallback<StandaloneGuidedEditorInvocationParameters> asyncCallback);
- void getAsstesDRL(String[] assetsUids, AsyncCallback<String[]> asyncCallback);
- void getAsstesBRL(String[] assetsUids, AsyncCallback<String[]> 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-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -15,16 +15,12 @@
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.ScrollPanel;
-import java.util.ArrayList;
-import java.util.List;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.modeldriven.ui.RuleModellerConfiguration;
import org.drools.guvnor.client.rpc.StandaloneGuidedEditorService;
import org.drools.guvnor.client.rpc.StandaloneGuidedEditorServiceAsync;
import org.drools.guvnor.client.ruleeditor.standalone.StandaloneGuidedEditorInvocationParameters;
import org.drools.guvnor.client.ruleeditor.toolbar.StandaloneGuidedEditorIndividualActionToolbarButtonsConfigurationProvider;
-import org.drools.ide.common.client.modeldriven.brl.RuleModel;
/**
* Class used to manage the stand-alone version of the Guided Editor (RuleModeller)
@@ -41,7 +37,7 @@
private StandaloneGuidedEditorServiceAsync standaloneGuidedEditorService = GWT.create( StandaloneGuidedEditorService.class );
- private String[] assetsUids;
+ private RuleAsset[] assets;
private Window.ClosingHandler windowCloseingHandler = new Window.ClosingHandler() {
@@ -71,7 +67,6 @@
standaloneGuidedEditorService.getInvocationParameters(new GenericCallback<StandaloneGuidedEditorInvocationParameters>() {
public void onSuccess(final StandaloneGuidedEditorInvocationParameters parameters) {
- GuidedEditorManager.this.assetsUids = new String[parameters.getAssetsToBeEdited().length];
//no assets? This is an error!
if (parameters.getAssetsToBeEdited().length == 0){
@@ -79,11 +74,8 @@
return;
}
- //we need to store the uids of each asset.
- for (int i = 0; i < parameters.getAssetsToBeEdited().length; i++) {
- RuleAsset ruleAsset = parameters.getAssetsToBeEdited()[i];
- GuidedEditorManager.this.assetsUids[i] = ruleAsset.uuid;
- }
+ //we need to store the assets.
+ GuidedEditorManager.this.assets = parameters.getAssetsToBeEdited();
//Load SCE and create a MultiViewEditor for the assets.
//We take the package from the first asset (because all the assets
@@ -145,7 +137,14 @@
* Remove the assets used by this Guided Editor instance
*/
public void removeAssets(){
- standaloneGuidedEditorService.removeAssets(assetsUids, new AsyncCallback<Void>() {
+
+ 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());
@@ -165,11 +164,11 @@
* in the JS invocation.
*/
public void getDRLs(){
- if (assetsUids == null || assetsUids.length == 0){
+ if (assets == null || assets.length == 0){
returnDRL("");
}
- standaloneGuidedEditorService.getAsstesDRL(assetsUids, new GenericCallback<String[]>() {
+ standaloneGuidedEditorService.getAsstesDRL(assets, new GenericCallback<String[]>() {
public void onSuccess(String[] drls) {
String result = "";
@@ -191,11 +190,11 @@
* in the JS invocation.
*/
public void getBRLs(){
- if (assetsUids == null || assetsUids.length == 0){
+ if (assets == null || assets.length == 0){
returnDRL("");
}
- standaloneGuidedEditorService.getAsstesBRL(assetsUids, new GenericCallback<String[]>() {
+ standaloneGuidedEditorService.getAsstesBRL(assets, new GenericCallback<String[]>() {
public void onSuccess(String[] drls) {
String result = "";
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-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -136,17 +136,16 @@
/**
* Returns the DRL source code of the given assets.
- * @param assetsUUIDs
+ * @param assets
* @return
* @throws SerializationException
*/
- public String[] getAsstesDRL(String[] assetsUUIDs) throws SerializationException {
+ public String[] getAsstesDRL(RuleAsset[] assets) throws SerializationException {
- String[] sources = new String[assetsUUIDs.length];
+ String[] sources = new String[assets.length];
- for ( int i = 0; i < assetsUUIDs.length; i++ ) {
- RuleAsset ruleAsset = this.getService().loadRuleAsset( assetsUUIDs[i] );
- sources[i] = this.getService().buildAssetSource( ruleAsset );
+ for ( int i = 0; i < assets.length; i++ ) {
+ sources[i] = this.getService().buildAssetSource( assets[i] );
}
return sources;
@@ -154,18 +153,17 @@
/**
* Returns the BRL source code of the given assets.
- * @param assetsUUIDs
+ * @param assets
* @return
* @throws SerializationException
*/
- public String[] getAsstesBRL(String[] assetsUUIDs) throws SerializationException {
+ public String[] getAsstesBRL(RuleAsset[] assets) throws SerializationException {
- String[] sources = new String[assetsUUIDs.length];
+ String[] sources = new String[assets.length];
BRLPersistence converter = BRXMLPersistence.getInstance();
- for ( int i = 0; i < assetsUUIDs.length; i++ ) {
- RuleAsset ruleAsset = this.getService().loadRuleAsset( assetsUUIDs[i] );
- sources[i] = converter.marshal( (RuleModel) ruleAsset.content );
+ for ( int i = 0; i < assets.length; i++ ) {
+ sources[i] = converter.marshal( (RuleModel) assets[i].content );
}
return sources;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java 2010-11-09 13:08:02 UTC (rev 35924)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java 2010-11-09 19:17:30 UTC (rev 35925)
@@ -47,7 +47,6 @@
import org.drools.repository.PackageItem;
import com.google.gwt.user.client.rpc.SerializationException;
-import com.sun.tools.javac.resources.compiler;
public class BRLContentHandler extends ContentHandler
implements
More information about the jboss-svn-commits
mailing list