[jboss-svn-commits] JBL Code SVN: r31484 - 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
Mon Feb 8 03:30:06 EST 2010
Author: jervisliu
Date: 2010-02-08 03:30:05 -0500 (Mon, 08 Feb 2010)
New Revision: 31484
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
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/ActionToolbar.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.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:
Fixed a typo etc.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -2045,9 +2045,11 @@
String Asset0IsAlreadyOpenPleaseCloseItBeforeOpeningMultiview();
- String PromptToGlobal();
+ String PromoteToGlobal();
- String PromptAreYouSure();
+ String PromoteAreYouSure();
- String Prompted();
+ String Promoted();
+
+ String ItemAlreadyInGlobalArea();
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-02-08 08:30:05 UTC (rev 31484)
@@ -976,6 +976,7 @@
DescriptionAndDiscussion=Description and discussion
Show=Show
Asset0IsAlreadyOpenPleaseCloseItBeforeOpeningMultiview=Asset {0} is already open, please close it before opening multiview.
-PromptToGlobal=Prompt to Global
-PromptAreYouSure=Are you sure you want to prompt this item to Global area?
-Prompted=The item has been moved to Global area.
\ No newline at end of file
+PromoteToGlobal=Promote to Global
+PromoteAreYouSure=Are you sure you want to promote this item to global area?
+Promoted=The item has been moved to global area.
+ItemAlreadyInGlobalArea=The item is already in global area.
\ 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-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -224,7 +224,7 @@
* Prompt an asset into Global area.
* @param assetUUID The source assetID.
*/
- public void promptAssetToGlobalArea(String assetUUID);
+ public void promoteAssetToGlobalArea(String assetUUID);
/**
* Copies an asset into a new destination package.
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-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -67,7 +67,7 @@
public void removeState(java.lang.String p0, AsyncCallback cb);
public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, AsyncCallback cb);
public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
- public void promptAssetToGlobalArea(java.lang.String p0, AsyncCallback cb);
+ public void promoteAssetToGlobalArea(java.lang.String p0, AsyncCallback cb);
public void copyAsset(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback<java.lang.String> cb);
public void copyPackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void listSnapshots(java.lang.String p0, AsyncCallback<org.drools.guvnor.client.rpc.SnapshotInfo[]> cb);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -161,7 +161,7 @@
copyCommand.execute();
}
}));
- moreMenu.addItem(new Item(constants.PromptToGlobal(), new BaseItemListenerAdapter() {
+ moreMenu.addItem(new Item(constants.PromoteToGlobal(), new BaseItemListenerAdapter() {
@Override
public void onClick(BaseItem baseItem, EventObject eventObject) {
promptCommand.execute();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -465,11 +465,15 @@
}
private void doPromptToGlobal() {
- if (Window.confirm(constants.PromptAreYouSure()) ) {
- RepositoryServiceFactory.getService().promptAssetToGlobalArea(asset.uuid,
+ if (asset.metaData.packageName.equals("globalArea")) {
+ Window.alert( constants.ItemAlreadyInGlobalArea() );
+ return;
+ }
+ if (Window.confirm(constants.PromoteAreYouSure()) ) {
+ RepositoryServiceFactory.getService().promoteAssetToGlobalArea(asset.uuid,
new GenericCallback<String>() {
public void onSuccess(String data) {
- Window.alert(constants.Prompted());
+ Window.alert(constants.Promoted());
refreshMetaWidgetOnly();
}
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-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -183,8 +183,8 @@
public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
getService().changeAssetPackage( p0, p1, p2);
}
- public void promptAssetToGlobalArea(java.lang.String p0) {
- getService().promptAssetToGlobalArea( p0);
+ public void promoteAssetToGlobalArea(java.lang.String p0) {
+ getService().promoteAssetToGlobalArea( p0);
}
public java.lang.String copyAsset(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
return getService().copyAsset( p0, p1, p2);
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-02-08 07:38:29 UTC (rev 31483)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-02-08 08:30:05 UTC (rev 31484)
@@ -1261,7 +1261,7 @@
@WebRemote
@Restrict("#{identity.loggedIn}")
- public void promptAssetToGlobalArea(String uuid) {
+ public void promoteAssetToGlobalArea(String uuid) {
if ( Contexts.isSessionContextActive() ) {
Identity.instance().checkPermission( new PackageNameType(RulesRepository.RULE_GLOBAL_AREA),
RoleTypes.PACKAGE_DEVELOPER );
@@ -1270,7 +1270,7 @@
log.info( "USER:" + getCurrentUserName() + " CHANGING PACKAGE OF asset: [" + uuid + "] to [ globalArea ]" );
repository.moveRuleItemPackage(RulesRepository.RULE_GLOBAL_AREA,
uuid,
- "prompt asset to globalArea");
+ "promote asset to globalArea");
}
@WebRemote
More information about the jboss-svn-commits
mailing list