[jboss-svn-commits] JBL Code SVN: r8500 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client main/java/org/drools/brms/client/rpc main/java/org/drools/brms/client/rpc/mock main/java/org/drools/brms/client/ruleeditor main/java/org/drools/brms/server test/java/org/drools/brms/server
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 21 10:40:22 EST 2006
Author: michael.neale at jboss.com
Date: 2006-12-21 10:40:12 -0500 (Thu, 21 Dec 2006)
New Revision: 8500
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
saving an asset refreshes its view now...
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -150,6 +150,7 @@
public void execute() {
tab.remove( i );
tab.selectTab( 0 );
+
}
});
tab.selectTab( i );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -52,8 +52,10 @@
/**
- * This checks in a new version of an asset.
+ * This checks in a new version of an asset.
+ * @return the UUID of the asset you are checking in,
+ * null if there was some problem (and an exception was not thrown).
*/
- public void checkinVersion(RuleAsset asset) throws SerializableException;
+ public String checkinVersion(RuleAsset asset) throws SerializableException;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -176,7 +176,7 @@
if (a.metaData.coverage.equals( "fail" )) {
cb.onFailure( new SerializableException("This is an error") );
} else {
- cb.onSuccess( null );
+ cb.onSuccess( "alanparsons" );
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -1,6 +1,7 @@
package org.drools.brms.client.ruleeditor;
import org.drools.brms.client.common.FormStylePopup;
+import org.drools.brms.client.common.LoadingPopup;
import org.drools.brms.client.rpc.MetaData;
import com.google.gwt.user.client.Command;
@@ -44,7 +45,7 @@
panel.add( state );
Image editState = new Image("images/edit.gif");
- editState.setTitle( "Change state." );
+ editState.setTitle( "Change state (NOT IMPLEMENTED YET)." );
panel.add( editState );
Image save = new Image("images/save_edit.gif");
@@ -52,6 +53,7 @@
save.addClickListener( new ClickListener() {
public void onClick(Widget w) {
+
doCheckinConfirm();
}
@@ -93,7 +95,7 @@
* Called when user wants to checkin.
*/
protected void doCheckinConfirm() {
- final FormStylePopup pop = new FormStylePopup("images/checkin.gif", "Check in a new version.");
+ final FormStylePopup pop = new FormStylePopup("images/checkin.gif", "Check in changes.");
TextArea comment = new TextArea();
comment.setWidth( "100%" );
Button save = new Button("Save");
@@ -102,6 +104,7 @@
save.addClickListener( new ClickListener() {
public void onClick(Widget w) {
+ LoadingPopup.showMessage( "Saving, please wait..." );
checkin.execute();
pop.hide();
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -23,7 +23,7 @@
private Command closeCommand;
- protected final RuleAsset asset;
+ protected RuleAsset asset;
private final FlexTable layout;
@@ -34,26 +34,10 @@
*/
public RuleViewer(RuleAsset asset) {
this.asset = asset;
+ layout = new FlexTable();
doWidgets();
-
-
-// RepositoryServiceFactory.getService().loadRuleAsset( this.resourceUUID,
-// new AsyncCallback() {
-// public void onFailure(Throwable e) {
-// ErrorPopup.showMessage( e.getMessage() );
-// }
-//
-// public void onSuccess(Object o) {
-// asset = (RuleAsset) o;
-// doWidgets();
-// }
-//
-// } );
-
- this.layout = doWidgets();
-
initWidget( this.layout );
LoadingPopup.close();
@@ -64,12 +48,14 @@
* when we get the data back from the server,
* also determines what widgets to load up).
*/
- private FlexTable doWidgets() {
+ private void doWidgets() {
+ this.layout.clear();
+
final MetaDataWidget metaWidget = new MetaDataWidget( this.asset.metaData,
false );
- final FlexTable layout = new FlexTable();
+
//now the main layout table
FlexCellFormatter formatter = layout.getFlexCellFormatter();
layout.setWidget( 0,
@@ -122,10 +108,6 @@
0,
doco );
- //metaWidget.loadData( asset.metaData );
- //doco.loadData( asset.metaData );
-
- return layout;
}
void doCheckin() {
@@ -136,8 +118,23 @@
}
public void onSuccess(Object o) {
- WarningPopup.showMessage( "Michael still needs to think about what to do after checking in re the UI !", 200, 200 );
+ String uuid = (String)o;
+ if (uuid == null) {
+ ErrorPopup.showMessage( "Failed to check in the item. Please contact your system administrator." );
+ return;
+ }
+ RepositoryServiceFactory.getService().loadRuleAsset( uuid, new AsyncCallback() {
+ public void onFailure(Throwable t) {
+ ErrorPopup.showMessage( t.getMessage() );
+ }
+ public void onSuccess(Object a) {
+ asset = (RuleAsset) a;
+ doWidgets();
+ LoadingPopup.close();
+ }
+ });
+
}
});
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -280,9 +280,8 @@
return this.metaDataMapper;
}
- public void checkinVersion(RuleAsset asset) throws SerializableException {
+ public String checkinVersion(RuleAsset asset) throws SerializableException {
-
RulesRepository repo = getRulesRepository();
AssetItem rule = repo.loadAssetByUUID( asset.uuid );
rule.checkout();
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2006-12-21 15:07:16 UTC (rev 8499)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2006-12-21 15:40:12 UTC (rev 8500)
@@ -173,5 +173,13 @@
}
+ public void testCheckin() throws Exception {
+// MockJBRMSServiceServlet serv = new MockJBRMSServiceServlet();
+// serv.createNewRule( "", description, initialCategory, "default", format )
+//
+// serv.checkinVersion( asset )
+ }
+
+
}
More information about the jboss-svn-commits
mailing list