[jboss-svn-commits] JBL Code SVN: r7273 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/decisiontable 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/client/rulelist main/java/org/drools/brms/public 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
Wed Nov 1 08:29:02 EST 2006
Author: michael.neale at jboss.com
Date: 2006-11-01 08:28:50 -0500 (Wed, 01 Nov 2006)
New Revision: 7273
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/EditableDTGrid.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.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/RepositoryServiceAsync.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/MetaDataWidget.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/client/rulelist/RuleItemListViewer.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
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:
more changes for loading rules, a style fix
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/EditableDTGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/EditableDTGrid.java 2006-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/decisiontable/EditableDTGrid.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -332,7 +332,7 @@
private void editColumn(int row, int column, String text) {
TextBox box = new TextBox();
box.setText(text);
- box.setStyleName("dsl-field-TextBox");
+ box.setStyleName("dt-field-TextBox");
table.setWidget(row, column, box);
box.setFocus(true);
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java 2006-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -19,7 +19,9 @@
public String lastModifiedDate = "";
public String lastContributor = "";
public int versionNumber;
-
+ public String lastCheckinComment = "";
+
+
public String packageName = "";
public String[] categories = new String[0];
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-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -19,9 +19,8 @@
/**
* Return a a 2d array/grid of results for rules.
* @param A "/" delimited path to a category.
- * @param status The status flag. Leave blank to be all.
*/
- public TableDataResult loadRuleListForCategories(String categoryPath, String status) throws SerializableException;
+ public TableDataResult loadRuleListForCategories(String categoryPath) throws SerializableException;
/**
* This will return a TableConfig of header names.
@@ -45,9 +44,10 @@
public String[] listRulePackages();
/**
- * This loads up a rule asset based on the UUID (always head version)
+ * This loads up all the stuff for a
+ * rule asset based on the UUID (always latest and editable version).
*/
- public RuleAsset loadAsset(String UUID) throws SerializableException;
+ public RuleAsset loadRuleAsset(String UUID) throws SerializableException;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2006-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -16,10 +16,10 @@
RemoteService {
public void loadChildCategories(java.lang.String p0, AsyncCallback cb);
- public void loadRuleListForCategories(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
+ public void loadRuleListForCategories(java.lang.String p0, AsyncCallback cb);
public void loadTableConfig(java.lang.String p0, AsyncCallback cb);
public void createCategory(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void createNewRule(java.lang.String p0, java.lang.String p1, java.lang.String p2, java.lang.String p3, AsyncCallback cb);
public void listRulePackages(AsyncCallback cb);
- public void loadAsset(java.lang.String p0, AsyncCallback cb);
+ public void loadRuleAsset(java.lang.String p0, AsyncCallback cb);
}
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-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -50,7 +50,6 @@
public void loadRuleListForCategories(String categoryPath,
- String status,
AsyncCallback callback) {
log("loading rule list", "for cat path: " + categoryPath);
TableDataResult result = new TableDataResult();
@@ -132,7 +131,7 @@
- public void loadAsset(String uuid,
+ public void loadRuleAsset(String uuid,
AsyncCallback cb) {
log( "loadAsset", "loading UUID" + uuid);
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-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -9,6 +9,7 @@
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.StackPanel;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
@@ -29,13 +30,8 @@
public MetaDataWidget(String name, boolean readOnly) {
this.readOnly = readOnly;
-
initWidget( layout );
-
addHeader("images/meta_data.gif", name);
-
-
-
}
@@ -55,10 +51,11 @@
addAttribute("Last modified on:", readOnlyText(data.lastModifiedDate));
addAttribute("Last modified by:", readOnlyText(data.lastContributor));
+ addAttribute("Checkin note:", readOnlyText( data.lastCheckinComment ));
addAttribute("Created by:", readOnlyText(data.creator));
addAttribute("Version number:", readOnlyText("" + data.versionNumber));
addAttribute("Package:", readOnlyText(data.packageName));
-
+
addAttribute("Type:", editableText(new FieldBinding() {
public String getValue() {
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-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -47,7 +47,7 @@
layout.setWidget( 2, 0, new Label("") );
layout.setWidget( 2, 1, new Label("") );
- RepositoryServiceFactory.getService().loadAsset( this.resourceUUID, new AsyncCallback() {
+ RepositoryServiceFactory.getService().loadRuleAsset( this.resourceUUID, new AsyncCallback() {
public void onFailure(Throwable e) {
ErrorPopup.showMessage( e.getMessage() );
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java 2006-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -185,7 +185,6 @@
service .loadRuleListForCategories( selectedPath,
- "",
new AsyncCallback() {
public void onFailure(Throwable t) {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2006-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2006-11-01 13:28:50 UTC (rev 7273)
@@ -336,6 +336,12 @@
}
.dsl-field-TextBox {
+ border: 1px solid #87B3FF;
+ padding: 0px;
+ width: 100%;
+}
+
+.dt-field-TextBox {
border: none;
padding: 0px;
width: 100%;
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-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -96,8 +96,7 @@
- public TableDataResult loadRuleListForCategories(String categoryPath,
- String status) throws SerializableException {
+ public TableDataResult loadRuleListForCategories(String categoryPath) throws SerializableException {
RulesRepository repo = getRulesRepository();
List list = repo.findRulesByCategory( categoryPath );
@@ -184,7 +183,11 @@
return repository;
}
+ public RuleAsset loadRuleAsset(String uuid) throws SerializableException {
+ return null;
+ }
+
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-11-01 12:35:55 UTC (rev 7272)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2006-11-01 13:28:50 UTC (rev 7273)
@@ -5,8 +5,10 @@
import junit.framework.TestCase;
import org.drools.brms.client.rpc.RepositoryService;
+import org.drools.brms.client.rpc.RuleAsset;
import org.drools.brms.client.rpc.TableConfig;
import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.client.rpc.TableDataRow;
import org.drools.brms.client.rulelist.RuleItemListViewer;
import org.drools.repository.CategoryItem;
@@ -103,7 +105,7 @@
impl.createNewRule( "testRuleTableLoad", "ya", "testRuleTableLoad", "testRuleTableLoad" );
impl.createNewRule( "testRuleTableLoad2", "ya", "testRuleTableLoad", "testRuleTableLoad" );
- TableDataResult result = impl.loadRuleListForCategories( "testRuleTableLoad", null );
+ TableDataResult result = impl.loadRuleListForCategories( "testRuleTableLoad" );
assertEquals(2, result.numberOfRows);
assertEquals(2, result.data.length);
@@ -127,5 +129,28 @@
System.out.println(fmt);
}
+ public void testLoadRuleAsset() throws Exception {
+ MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
+ impl.repo.createRulePackage( "testLoadRuleAsset", "desc" );
+ impl.createCategory( "", "testLoadRuleAsset", "this is a cat" );
+
+
+ impl.createNewRule( "testLoadRuleAsset", "description", "testLoadRuleAsset", "testLoadRuleAsset" );
+
+ TableDataResult res = impl.loadRuleListForCategories( "testLoadRuleAsset" );
+ assertEquals(1, res.data.length);
+
+ TableDataRow row = res.data[0];
+ String uuid = row.id;
+
+ System.out.println("UUID: " + uuid);
+
+ RuleAsset asset = impl.loadRuleAsset( uuid );
+ assertNotNull(asset);
+ assertNotNull(asset.ruleAsset);
+
+
+ }
+
}
More information about the jboss-svn-commits
mailing list