[jboss-svn-commits] JBL Code SVN: r31137 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/rpc and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 19 09:28:22 EST 2010
Author: jervisliu
Date: 2010-01-19 09:28:21 -0500 (Tue, 19 Jan 2010)
New Revision: 31137
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-423: Able to choose multiple assets to delete in Archive Manager; but only one gets deleted
https://jira.jboss.org/jira/browse/GUVNOR-308: Possibility to restore more than one asset at the same time
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java 2010-01-19 14:22:56 UTC (rev 31136)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java 2010-01-19 14:28:21 UTC (rev 31137)
@@ -105,11 +105,11 @@
tb.addButton(restoreAsset);
restoreAsset.addListener(new ButtonListenerAdapter() {
public void onClick(com.gwtext.client.widgets.Button button, EventObject e) {
- if (grid.getSelectedRowUUID() == null) {
+ if (grid.getSelectedRowUUIDs() == null) {
Window.alert(constants.PleaseSelectAnItemToRestore());
return;
}
- RepositoryServiceFactory.getService().archiveAsset( grid.getSelectedRowUUID(), false, new GenericCallback() {
+ RepositoryServiceFactory.getService().archiveAssets( grid.getSelectedRowUUIDs(), false, new GenericCallback() {
public void onSuccess(Object arg0) {
Window.alert(constants.ItemRestored());
grid.refreshGrid();
@@ -128,14 +128,14 @@
public void onClick(
com.gwtext.client.widgets.Button button,
EventObject e) {
- if (grid.getSelectedRowUUID() == null) {
+ if (grid.getSelectedRowUUIDs() == null) {
Window.alert(constants.PleaseSelectAnItemToPermanentlyDelete());
return;
}
if (!Window.confirm(constants.AreYouSureDeletingAsset())) {
return;
}
- RepositoryServiceFactory.getService().removeAsset( grid.getSelectedRowUUID(), new GenericCallback() {
+ RepositoryServiceFactory.getService().removeAssets( grid.getSelectedRowUUIDs(), new GenericCallback() {
public void onSuccess(Object arg0) {
Window.alert(constants.ItemDeleted());
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-01-19 14:22:56 UTC (rev 31136)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-01-19 14:28:21 UTC (rev 31137)
@@ -350,10 +350,22 @@
public void archiveAsset(String uuid, boolean value );
/**
+ * Archive assets based on uuid
+ * @param uuids
+ */
+ public void archiveAssets(String[] uuids, boolean value );
+
+ /**
* Remove an asset based on uuid
* @param uuid
*/
public void removeAsset(String uuid);
+
+ /**
+ * Remove assets based on uuid
+ * @param uuids
+ */
+ public void removeAssets(String[] uuids);
/**
* Permanently remove a package (delete it).
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-01-19 14:22:56 UTC (rev 31136)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-01-19 14:28:21 UTC (rev 31137)
@@ -80,7 +80,9 @@
public void renameAsset(java.lang.String p0, java.lang.String p1, AsyncCallback<java.lang.String> cb);
public void renameCategory(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void archiveAsset(java.lang.String p0, boolean p1, AsyncCallback cb);
+ public void archiveAssets(java.lang.String[] p0, boolean p1, AsyncCallback cb);
public void removeAsset(java.lang.String p0, AsyncCallback cb);
+ public void removeAssets(java.lang.String[] p0, AsyncCallback cb);
public void removePackage(java.lang.String p0, AsyncCallback cb);
public void renamePackage(java.lang.String p0, java.lang.String p1, AsyncCallback<java.lang.String> cb);
public void rebuildSnapshots(AsyncCallback cb);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2010-01-19 14:22:56 UTC (rev 31136)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2010-01-19 14:28:21 UTC (rev 31137)
@@ -300,14 +300,26 @@
public String getSelectedRowUUID() {
Record r = currentGrid.getSelectionModel().getSelected();
- if ( r != null ) {
- return r.getAsString( "uuid" );
+ if ( r != null) {
+ return r.getAsString("uuid");
} else {
return null;
}
+ }
+ public String[] getSelectedRowUUIDs() {
+ Record[] records = currentGrid.getSelectionModel().getSelections();
+ if ( records != null && records.length !=0) {
+ String[] rtn = new String[records.length];
+ for(int i=0; i<records.length; i++) {
+ rtn[i] = records[i].getAsString("uuid");
+ }
+ return rtn;
+ } else {
+ return null;
+ }
}
-
+
private void navButton(final AssetItemGridDataLoader source,
final ColumnModel cm,
final RecordDef rd,
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-01-19 14:22:56 UTC (rev 31136)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-01-19 14:28:21 UTC (rev 31137)
@@ -234,9 +234,15 @@
public void archiveAsset(java.lang.String p0, boolean p1) {
getService().archiveAsset( p0, p1);
}
+ public void archiveAssets(java.lang.String[] p0, boolean p1) {
+ getService().archiveAssets( p0, p1);
+ }
public void removeAsset(java.lang.String p0) {
getService().removeAsset( p0);
}
+ public void removeAssets(java.lang.String[] p0) {
+ getService().removeAssets( p0);
+ }
public void removePackage(java.lang.String p0) {
getService().removePackage( p0);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-01-19 14:22:56 UTC (rev 31136)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-01-19 14:28:21 UTC (rev 31137)
@@ -1742,6 +1742,15 @@
throw e;
}
}
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void archiveAssets(String[] uuids,
+ boolean value) {
+ for(String uuid : uuids) {
+ archiveAsset(uuid, value);
+ }
+ }
@WebRemote
@Restrict("#{identity.loggedIn}")
@@ -1760,6 +1769,14 @@
throw e;
}
}
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void removeAssets(String[] uuids) {
+ for(String uuid : uuids) {
+ removeAsset(uuid);
+ }
+ }
@WebRemote
@Restrict("#{identity.loggedIn}")
More information about the jboss-svn-commits
mailing list