[jboss-svn-commits] JBL Code SVN: r34849 - in labs/jbossrules/branches/5.1.x: drools-guvnor and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2010-08-23 18:53:08 -0400 (Mon, 23 Aug 2010)
New Revision: 34849

Modified:
   labs/jbossrules/branches/5.1.x/drools-guvnor/build.properties
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
   labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
   labs/jbossrules/branches/5.1.x/pom.xml
Log:
merging #34669 and #34670 into 5.1.x branch

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/build.properties
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/build.properties	2010-08-23 22:47:49 UTC (rev 34848)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/build.properties	2010-08-23 22:53:08 UTC (rev 34849)
@@ -1,4 +1,4 @@
 #this is needed to point to your version of GWT
-gwt.home=/users/rikkola/Codes/lib/gwt-2.0.3
+gwt.home=/users/rikkola/Codes/lib/gwt-2.0.4
 jbossAS.version=jboss-4.2.3.GA
 

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java	2010-08-23 22:47:49 UTC (rev 34848)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java	2010-08-23 22:53:08 UTC (rev 34849)
@@ -35,6 +35,7 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.core.client.GWT;
 import com.gwtext.client.core.EventObject;
+import com.gwtext.client.widgets.Button;
 import com.gwtext.client.widgets.Toolbar;
 import com.gwtext.client.widgets.ToolbarButton;
 import com.gwtext.client.widgets.event.ButtonListenerAdapter;
@@ -87,7 +88,7 @@
         final ToolbarButton restorePackage = new ToolbarButton();
         restorePackage.addListener(new ButtonListenerAdapter() {
         			public void onClick(
-        					com.gwtext.client.widgets.Button button,
+        					Button button,
         					EventObject e) {
         				restorePackage(packages.getValue(packages.getSelectedIndex()));
         			}
@@ -103,7 +104,7 @@
         delPackage.setText(constants.PermanentlyDeletePackage());
         delPackage.addListener(new ButtonListenerAdapter() {
         			public void onClick(
-        					com.gwtext.client.widgets.Button button,
+        					Button button,
         					EventObject e) {
         				if (Window.confirm(constants.AreYouSurePackageDelete())) {
         					deletePackage(packages.getValue(packages.getSelectedIndex()));
@@ -127,7 +128,7 @@
         restoreAsset.setText(constants.RestoreSelectedAsset());
         tb.addButton(restoreAsset);
         restoreAsset.addListener(new ButtonListenerAdapter() {
-        			public void onClick(com.gwtext.client.widgets.Button button, EventObject e) {
+        			public void onClick(Button button, EventObject e) {
                     	if (grid.getSelectedRowUUIDs() == null) {
                     		Window.alert(constants.PleaseSelectAnItemToRestore());
                     		return;
@@ -149,7 +150,7 @@
         deleteAsset.addListener(
         		new ButtonListenerAdapter() {
         			public void onClick(
-        					com.gwtext.client.widgets.Button button,
+        					Button button,
         					EventObject e) {
                     	if (grid.getSelectedRowUUIDs() == null) {
                     		Window.alert(constants.PleaseSelectAnItemToPermanentlyDelete());

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2010-08-23 22:47:49 UTC (rev 34848)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java	2010-08-23 22:53:08 UTC (rev 34849)
@@ -42,7 +42,11 @@
 import com.google.gwt.user.client.ui.*;
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.util.Format;
-import com.gwtext.client.widgets.*;
+import com.gwtext.client.widgets.QuickTipsConfig;
+import com.gwtext.client.widgets.Toolbar;
+import com.gwtext.client.widgets.ToolbarButton;
+import com.gwtext.client.widgets.ToolbarMenuButton;
+import com.gwtext.client.widgets.ToolbarTextItem;
 import com.gwtext.client.widgets.menu.Menu;
 import com.gwtext.client.widgets.menu.Item;
 import com.gwtext.client.widgets.menu.BaseItem;
@@ -152,7 +156,7 @@
         save.setText( constants.SaveChanges() );
         save.setTooltip( getTip( constants.CommitAnyChangesForThisAsset() ) );
         save.addListener( new ButtonListenerAdapter() {
-            public void onClick(com.gwtext.client.widgets.Button button,
+            public void onClick(Button button,
                                 EventObject e) {
                 verifyAndDoCheckinConfirm( button,
                                            false );

Modified: labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java	2010-08-23 22:47:49 UTC (rev 34848)
+++ labs/jbossrules/branches/5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java	2010-08-23 22:53:08 UTC (rev 34849)
@@ -37,7 +37,6 @@
 import com.google.gwt.core.client.GWT;
 import com.gwtext.client.util.Format;
 import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.form.DateField;
 
 public class QueryWidget extends Composite {
 

Modified: labs/jbossrules/branches/5.1.x/pom.xml
===================================================================
--- labs/jbossrules/branches/5.1.x/pom.xml	2010-08-23 22:47:49 UTC (rev 34848)
+++ labs/jbossrules/branches/5.1.x/pom.xml	2010-08-23 22:53:08 UTC (rev 34849)
@@ -1307,7 +1307,7 @@
          <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-servlet</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4</version>
          </dependency>
          <dependency>
             <groupId>commons-fileupload</groupId>