[jboss-svn-commits] JBL Code SVN: r36421 - 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
Thu Dec 16 01:15:32 EST 2010
Author: jervisliu
Date: 2010-12-16 01:15:31 -0500 (Thu, 16 Dec 2010)
New Revision: 36421
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GlobalAreaAssetSelector.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/ruleeditor/NewAssetWizard.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:
GUVNOR-1124: Can not use a fact model created in GlobalArea
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GlobalAreaAssetSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GlobalAreaAssetSelector.java 2010-12-16 03:22:06 UTC (rev 36420)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GlobalAreaAssetSelector.java 2010-12-16 06:15:31 UTC (rev 36421)
@@ -32,16 +32,16 @@
*/
-
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.Widget;
/**
* A rule package selector widget.
@@ -53,38 +53,45 @@
public static String currentlySelectedAsset;
private ListBox assetList;
+ private String format;
-
- public GlobalAreaAssetSelector() {
+ public GlobalAreaAssetSelector(String formatToImport) {
assetList = new ListBox();
+ if(formatToImport == null) {
+ //default format
+ this.format = AssetFormats.BUSINESS_RULE;
+ } else {
+ this.format = formatToImport;
+ }
+
- DeferredCommand.addCommand(new Command() {
+ Scheduler.get().scheduleDeferred( new Command() {
public void execute() {
loadAssetList();
}
});
-
initWidget( assetList );
}
-
+
private void loadAssetList() {
- RepositoryServiceFactory.getService().listRulesInPackage("globalArea", new GenericCallback<String[]>() {
+ RepositoryServiceFactory.getService().listAssetsWithPackageName("globalArea", new String[]{format}, 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID, new GenericCallback<TableDataResult>() {
- public void onSuccess(String[] list) {
- for ( int i = 0; i < list.length; i++ ) {
- assetList.addItem( list[i] );
+ public void onSuccess(TableDataResult result) {
+
+ for (int i = 0; i < result.data.length; i++) {
+ assetList.addItem(result.data[i].getDisplayName(), result.data[i].id);
if (currentlySelectedAsset != null &&
- list[i].equals( currentlySelectedAsset )) {
+ result.data[i].equals( currentlySelectedAsset )) {
assetList.setSelectedIndex( i );
- }
- }
- assetList.addChangeListener(new ChangeListener() {
- public void onChange(Widget sender) {
+ }
+ }
+
+ assetList.addChangeHandler(new ChangeHandler() {
+ public void onChange(ChangeEvent sender) {
currentlySelectedAsset = getSelectedAsset();
}
});
-
}
public void onFailure(Throwable t) {
@@ -98,13 +105,11 @@
});
}
-
+
/**
* Returns the selected package.
*/
public String getSelectedAsset() {
return assetList.getItemText( assetList.getSelectedIndex() );
}
-
-
}
\ No newline at end of file
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-12-16 03:22:06 UTC (rev 36420)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-12-16 06:15:31 UTC (rev 36421)
@@ -225,6 +225,22 @@
String tableConfig) throws SerializationException;
/**
+ * Given a format, this will return assets that match.
+ * It can also be used for "pagination" by passing in start and
+ * finish row numbers.
+ * @param packageName The name of package to search inside.
+ * @param format The format to filter on. If this is empty - it will look for all non "known" asset types (ie "misc" stuff).
+ * @param numRows The number of rows to return. -1 means all.
+ * @param startRow The starting row number if paging - if numRows is -1 then this is ignored.
+ * @deprecated by {@link #findAssetPage(AssetPageRequest)}
+ */
+ public TableDataResult listAssetsWithPackageName(String packageName,
+ String formats[],
+ int skip,
+ int numRows,
+ String tableConfig) throws SerializationException;
+
+ /**
* Returns a list of valid states.
*/
public String[] listStates() throws SerializationException;
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-12-16 03:22:06 UTC (rev 36420)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-12-16 06:15:31 UTC (rev 36421)
@@ -63,6 +63,7 @@
void listArchivedPackages(com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.PackageConfigData[]> arg1);
void findAssetPage(org.drools.guvnor.client.rpc.AssetPageRequest request, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.AssetPageResponse> cb);
void listAssets(java.lang.String packageUUID, java.lang.String[] formats, int skip, int numRows, java.lang.String tableConfig, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg6);
+ void listAssetsWithPackageName(java.lang.String packageName, java.lang.String[] formats, int skip, int numRows, java.lang.String tableConfig, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg6);
void listAvailablePermissionTypes(com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String[]> arg1);
void listPackages(com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.PackageConfigData[]> arg1);
void listRulesInPackage(java.lang.String packageName, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String[]> arg2);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2010-12-16 03:22:06 UTC (rev 36420)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2010-12-16 06:15:31 UTC (rev 36421)
@@ -70,7 +70,7 @@
private RulePackageSelector packageSelector = new RulePackageSelector();
private RulePackageSelector importedPackageSelector = new RulePackageSelector();
- private GlobalAreaAssetSelector globalAreaAssetSelector = new GlobalAreaAssetSelector();
+ private GlobalAreaAssetSelector globalAreaAssetSelector;
private EditItemEvent afterCreate;
private boolean showCats;
private String format;
@@ -180,6 +180,7 @@
ok );
//layout for importing share asset from global area.
+ globalAreaAssetSelector = new GlobalAreaAssetSelector(format);
importAssetLayout.addAttribute( constants.AssetToImport(),
globalAreaAssetSelector );
importAssetLayout.addAttribute( constants.Package() + ":",
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-12-16 03:22:06 UTC (rev 36420)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-12-16 06:15:31 UTC (rev 36421)
@@ -268,7 +268,11 @@
p3,
p4 );
}
-
+
+ public org.drools.guvnor.client.rpc.TableDataResult listAssetsWithPackageName(java.lang.String p0, java.lang.String[] p1, int p2, int p3, java.lang.String p4) throws SerializationException {
+ return getService().listAssetsWithPackageName( p0, p1, p2, p3, p4);
+ }
+
public java.lang.String[] listStates() throws SerializationException {
return getService().listStates();
}
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-12-16 03:22:06 UTC (rev 36420)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-12-16 06:15:31 UTC (rev 36421)
@@ -1142,18 +1142,29 @@
@WebRemote
@Restrict("#{identity.loggedIn}")
- public TableDataResult listAssets(String uuid,
+ public TableDataResult listAssetsWithPackageName(String packageName,
String formats[],
int skip,
int numRows,
String tableConfig) throws SerializationException {
- log.debug( "Loading asset list for [" + uuid + "]" );
+ PackageItem pkg = repository.loadPackage(packageName);
+ return listAssets(pkg.getUUID(), formats, skip, numRows, tableConfig);
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult listAssets(String packageUuid,
+ String formats[],
+ int skip,
+ int numRows,
+ String tableConfig) throws SerializationException {
+ log.debug( "Loading asset list for [" + packageUuid + "]" );
if ( numRows == 0 ) {
throw new DetailedSerializationException( "Unable to return zero results (bug)",
"probably have the parameters around the wrong way, sigh..." );
}
long start = System.currentTimeMillis();
- PackageItem pkg = repository.loadPackageByUUID( uuid );
+ PackageItem pkg = repository.loadPackageByUUID( packageUuid );
AssetItemIterator it;
if ( formats.length > 0 ) {
it = pkg.listAssetsByFormat( formats );
More information about the jboss-svn-commits
mailing list