[jboss-svn-commits] JBL Code SVN: r9671 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/rpc/mock and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 21 03:14:38 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-21 03:14:38 -0500 (Wed, 21 Feb 2007)
New Revision: 9671
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/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/server/JBRMSServiceServlet.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-694 Move package
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 2007-02-21 08:13:42 UTC (rev 9670)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-02-21 08:14:38 UTC (rev 9671)
@@ -123,4 +123,9 @@
* If this is true, UUID must be the status of a package, if false, it must be an asset.
*/
public void changeState(String uuid, String newState, boolean wholePackage);
+
+ /**
+ * This moves an asset to the given target package.
+ */
+ public void changeAssetPackage(String uuid, String newPackage, String comment);
}
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 2007-02-21 08:13:42 UTC (rev 9670)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-02-21 08:14:38 UTC (rev 9671)
@@ -32,7 +32,7 @@
public void listAssetsByFormat(java.lang.String p0, String[] p1, int p2, int p3, AsyncCallback cb);
public void listStates(AsyncCallback cb);
public void createState(java.lang.String p0, AsyncCallback cb);
+ public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, 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 2007-02-21 08:13:42 UTC (rev 9670)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2007-02-21 08:14:38 UTC (rev 9671)
@@ -416,6 +416,16 @@
cb.onSuccess( null );
}
+
+
+
+ public void changeAssetPackage(String p0,
+ String p1,
+ String p2,
+ AsyncCallback cb) {
+ cb.onSuccess( null );
+
+ }
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 2007-02-21 08:13:42 UTC (rev 9670)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2007-02-21 08:14:38 UTC (rev 9671)
@@ -3,11 +3,19 @@
import java.util.Date;
import org.drools.brms.client.common.FormStyleLayout;
+import org.drools.brms.client.common.FormStylePopup;
+import org.drools.brms.client.common.GenericCallback;
+import org.drools.brms.client.common.RulePackageSelector;
import org.drools.brms.client.rpc.MetaData;
+import org.drools.brms.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
@@ -52,7 +60,7 @@
addAttribute("Note:", readOnlyText( data.checkinComment ));
addAttribute("Created by:", readOnlyText(data.creator));
addAttribute("Version:", getVersionNumberLabel());
- addAttribute("Package:", readOnlyText(data.packageName));
+ addAttribute("Package:", packageEditor(data.packageName));
addAttribute("Format:", new HTML( "<b>" + data.format + "</b>" ));
if (!readOnly) {
@@ -111,6 +119,57 @@
}
+ private Widget packageEditor(final String packageName) {
+ if (this.readOnly) {
+ return readOnlyText( packageName );
+ } else {
+ HorizontalPanel horiz = new HorizontalPanel();
+ horiz.add( readOnlyText( packageName ) );
+ Image editPackage = new Image("images/edit.gif");
+ editPackage.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ showEditPackage(packageName, w);
+ }
+ });
+ horiz.add( editPackage );
+ return horiz;
+ }
+
+
+ }
+
+
+ private void showEditPackage(final String pkg, Widget source) {
+ final FormStylePopup pop = new FormStylePopup("images/package_large.png", "Change package");
+ pop.addAttribute( "Current package:", new Label(pkg) );
+ final RulePackageSelector sel = new RulePackageSelector();
+ pop.addAttribute( "New package:", sel );
+ Button ok = new Button("Change package");
+ pop.addAttribute( "", ok );
+ ok.addClickListener( new ClickListener() {
+
+ public void onClick(Widget w) {
+ RepositoryServiceFactory.getService().changeAssetPackage( uuid, sel.getSelectedPackage(),
+ "Moved from : " + pkg,
+ new GenericCallback() {
+
+
+ public void onSuccess(Object data) {
+ refreshView.execute();
+ pop.hide();
+ }
+
+ });
+
+
+ }
+
+ });
+ pop.setPopupPosition( source.getAbsoluteLeft(), source.getAbsoluteTop() );
+ pop.show();
+ }
+
+
private Widget getVersionNumberLabel() {
if (data.versionNumber == null || "".equals(data.versionNumber )) {
return new HTML("<i>Not checked in yet</i>");
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 2007-02-21 08:13:42 UTC (rev 9670)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-21 08:14:38 UTC (rev 9671)
@@ -417,6 +417,13 @@
}
repo.save();
}
+
+ public void changeAssetPackage(String uuid,
+ String newPackage,
+ String comment) {
+ getRulesRepository().moveRuleItemPackage( newPackage, uuid, comment );
+
+ }
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 2007-02-21 08:13:42 UTC (rev 9670)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-02-21 08:14:38 UTC (rev 9671)
@@ -444,6 +444,33 @@
}
+ public void testMovePackage() throws Exception {
+ JBRMSServiceServlet impl = new MockJBRMSServiceServlet();
+ String[] cats = impl.loadChildCategories( "/" );
+ if (cats.length == 0) {
+ impl.createCategory( "/", "la", "d" );
+ }
+ impl.createPackage( "sourcePackage", "description" );
+ impl.createPackage( "targetPackage", "description" );
+
+ String cat = impl.loadChildCategories( "/" )[0];
+
+ String uuid = impl.createNewRule( "testMovePackage", "desc", cat, "sourcePackage", "drl" );
+
+ TableDataResult res = impl.listAssetsByFormat( "targetPackage", new String[] {"drl"}, 2, 0 );
+ assertEquals(0, res.data.length);
+
+
+ impl.changeAssetPackage( uuid, "targetPackage", "yeah" );
+ res = impl.listAssetsByFormat( "targetPackage", new String[] {"drl"}, 2, 0 );
+
+ assertEquals(1, res.data.length);
+
+
+
+
+ }
+
}
More information about the jboss-svn-commits
mailing list