[jboss-svn-commits] JBL Code SVN: r8548 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/rpc main/java/org/drools/brms/client/ruleeditor main/java/org/drools/brms/server main/java/org/drools/brms/server/util test/java/org/drools/brms/server
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 22 11:52:00 EST 2006
Author: michael.neale at jboss.com
Date: 2006-12-22 11:51:49 -0500 (Fri, 22 Dec 2006)
New Revision: 8548
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.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/MetaDataWidget.java
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/util/MetaDataMapper.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
categories are saved correctly
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2006-12-22 16:51:09 UTC (rev 8547)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2006-12-22 16:51:49 UTC (rev 8548)
@@ -16,7 +16,7 @@
* versus full RPC (which requires the back end be running in some form).
* Can set it to DEBUG if you want to run it client side only.
*/
- public static boolean DEBUG = true;
+ public static boolean DEBUG = false;
public static RepositoryServiceAsync SERVICE;
public static RepositoryServiceAsync getService() {
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-22 16:51:09 UTC (rev 8547)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2006-12-22 16:51:49 UTC (rev 8548)
@@ -42,7 +42,7 @@
this.checkin = checkin;
String status = metaData.state;
- Label state = new Label("Status: [" + status + "] ");
+ HTML state = new HTML("<b>Status: <i>[" + status + "]</i></b>");
panel.add( state );
Image editState = new Image("images/edit.gif");
@@ -52,19 +52,14 @@
Image save = new Image("images/save_edit.gif");
save.setTitle( "Check in changes." );
save.addClickListener( new ClickListener() {
-
public void onClick(Widget w) {
-
doCheckinConfirm();
}
-
});
-
Image closeImg = new Image("images/close.gif");
closeImg.setTitle( "Close." );
closeImg.addClickListener( new ClickListener() {
-
public void onClick(Widget w) {
if (metaData.dirty) {
doCloseUnsavedWarning( );
@@ -72,9 +67,7 @@
//we can actually close
closeCommand.execute( );
}
-
}
-
});
Image maxMinImage = new Image("images/max_min.gif");
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2006-12-22 16:51:09 UTC (rev 8547)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2006-12-22 16:51:49 UTC (rev 8548)
@@ -6,6 +6,7 @@
import org.drools.brms.client.rpc.MetaData;
import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
@@ -48,7 +49,7 @@
addAttribute("Checkin note:", readOnlyText( data.lastCheckinComment ));
addAttribute("Created by:", readOnlyText(data.creator));
addAttribute("Created on:", readOnlyDate( data.createdDate ));
- addAttribute("Version number:", readOnlyText("" + data.versionNumber));
+ addAttribute("Version number:", getVersionNumberLabel());
addAttribute("Package:", readOnlyText(data.packageName));
@@ -87,7 +88,17 @@
}
+ private Widget getVersionNumberLabel() {
+ if (data.versionNumber == null || "".equals(data.versionNumber )) {
+ return new HTML("<i>Not checked in yet</i>");
+ } else {
+ return readOnlyText(data.versionNumber);
+ }
+
+ }
+
+
private Widget readOnlyDate(Date lastModifiedDate) {
if (lastModifiedDate == null) {
return null;
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-22 16:51:09 UTC (rev 8547)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-12-22 16:51:49 UTC (rev 8548)
@@ -284,11 +284,17 @@
AssetItem rule = repo.loadAssetByUUID( asset.uuid );
MetaData meta = asset.metaData;
+
getMetaDataMapper().copyFromMetaData( meta, rule );
+
rule.updateDateEffective( dateToCalendar( meta.dateEffective ) );
rule.updateDateExpired( dateToCalendar( meta.dateExpired ) );
+
+ rule.updateCategoryList( meta.categories );
updateContentToAsset( rule, asset.content );
+
+
rule.checkin( meta.checkinComment );
return rule.getUUID();
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/MetaDataMapper.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/MetaDataMapper.java 2006-12-22 16:51:09 UTC (rev 8547)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/MetaDataMapper.java 2006-12-22 16:51:49 UTC (rev 8548)
@@ -38,9 +38,6 @@
Method m = (Method) e.getValue();
try {
- if (f.getType() == Date.class) {
-
- }
m.invoke( target, new Object[] {f.get( data )} ) ;
} catch ( IllegalArgumentException e1 ) {
throw new RulesRepositoryException(e1);
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-22 16:51:09 UTC (rev 8547)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2006-12-22 16:51:49 UTC (rev 8548)
@@ -162,6 +162,8 @@
assertEquals("txt", asset.metaData.format);
assertNotNull(asset.metaData.createdDate);
+ assertEquals(1, asset.metaData.categories.length);
+ assertEquals("testLoadRuleAsset", asset.metaData.categories[0]);
AssetItem rule = impl.repo.loadPackage( "testLoadRuleAsset" ).loadAsset( "testLoadRuleAsset" );
rule.updateState( "whee" );
@@ -179,6 +181,8 @@
serv.listRulePackages();
serv.createCategory( "/", "testCheckinCategory", "this is a description" );
+ serv.createCategory( "/", "testCheckinCategory2", "this is a description" );
+
String uuid = serv.createNewRule( "testChecking", "this is a description", "testCheckinCategory", "default", "drl" );
RuleAsset asset = serv.loadRuleAsset( uuid );
@@ -200,12 +204,22 @@
asset2.metaData.coverage = "ya";
asset2.metaData.checkinComment = "checked in";
+
+ String cat = asset2.metaData.categories[0];
+ asset2.metaData.categories = new String[2];
+ asset2.metaData.categories[0] = cat;
+ asset2.metaData.categories[1] = "testCheckinCategory2";
+
+
serv.checkinVersion( asset2 );
asset2 = serv.loadRuleAsset( uuid );
assertEquals("ya", asset2.metaData.coverage);
assertEquals("2", asset2.metaData.versionNumber);
assertEquals("checked in", asset2.metaData.checkinComment);
+ assertEquals(2, asset2.metaData.categories.length);
+ assertEquals("testCheckinCategory", asset2.metaData.categories[0]);
+ assertEquals("testCheckinCategory2", asset2.metaData.categories[1]);
}
More information about the jboss-svn-commits
mailing list