cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1067298 - in /cxf/trunk/rt/management-web: ./ src/main/java/org/apache/cxf/management/web/browser/ src/main/java/org/apache/cxf/management/web/browser/client/service/settings/ src/main/java/org/apache/cxf/management/web/browser/client/ui/ ...
Date Fri, 04 Feb 2011 21:53:33 GMT
Author: dkulp
Date: Fri Feb  4 21:53:33 2011
New Revision: 1067298

URL: http://svn.apache.org/viewvc?rev=1067298&view=rev
Log:
Fix for java 5

Modified:
    cxf/trunk/rt/management-web/pom.xml
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/LocalStorageImpl.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java

Modified: cxf/trunk/rt/management-web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/pom.xml?rev=1067298&r1=1067297&r2=1067298&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/pom.xml (original)
+++ cxf/trunk/rt/management-web/pom.xml Fri Feb  4 21:53:33 2011
@@ -146,17 +146,9 @@
         </dependency>
 
         <dependency>
-            <groupId>gwtexpui</groupId>
-            <artifactId>gwtexpui</artifactId>
-            <version>${gwt.expui.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>gwtexpui</groupId>
-            <artifactId>gwtexpui</artifactId>
-            <version>${gwt.expui.version}</version>
-            <classifier>sources</classifier>
-            <type>jar</type>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <version>1.1</version>
         </dependency>
 
         <dependency>
@@ -172,7 +164,6 @@
 -->
 
         <plugins>
-            <!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
@@ -194,22 +185,7 @@
                     <runTarget>logbrowser/LogBrowser.html</runTarget>
                 </configuration>
             </plugin>
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <excludes>
-                        <exclude>org/apache/cxf/management/web/browser/**</exclude>
-                    </excludes>
-                </configuration>
-             </plugin>
-
         </plugins>
-
-        
     </build>
 <!--
     <profiles>

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml?rev=1067298&r1=1067297&r2=1067298&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml
(original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/LogBrowser.gwt.xml
Fri Feb  4 21:53:33 2011
@@ -25,7 +25,6 @@
 	<inherits name="com.google.gwt.http.HTTP" />
 	<inherits name="com.google.gwt.json.JSON" />
     <inherits name="com.google.gwt.xml.XML"/>
-    <inherits name='com.google.gwtexpui.user.User'/>
 
     <script src="uuid.min.js" />
     <script src="json2.min.js" />

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/LocalStorageImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/LocalStorageImpl.java?rev=1067298&r1=1067297&r2=1067298&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/LocalStorageImpl.java
(original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/LocalStorageImpl.java
Fri Feb  4 21:53:33 2011
@@ -199,7 +199,7 @@ public class LocalStorageImpl implements
             }
         }-*/;
     }
-    @SuppressWarnings("unused")
+
     private static class LocalCredentials extends JavaScriptObject {
 
         protected LocalCredentials() { }
@@ -223,7 +223,6 @@ public class LocalStorageImpl implements
         }-*/;
     }
 
-    @SuppressWarnings("unused")
     private static class LocalSubscription extends JavaScriptObject {
 
         protected LocalSubscription() { }

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java?rev=1067298&r1=1067297&r2=1067298&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
(original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/ErrorDialog.java
Fri Feb  4 21:53:33 2011
@@ -31,7 +31,7 @@ import com.google.gwt.user.client.Window
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Label;
-import com.google.gwtexpui.user.client.PluginSafePopupPanel;
+import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.inject.Inject;
 
 import org.apache.cxf.management.web.browser.client.ui.resources.LogBrowserConstans;
@@ -40,7 +40,7 @@ import org.apache.cxf.management.web.bro
 /**
  * A dialog box showing an error message, when bad things happen.
  */
-public class ErrorDialog extends PluginSafePopupPanel {
+public class ErrorDialog extends PopupPanel {
     
     @Nonnull
     private final LogBrowserResources resources;

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java?rev=1067298&r1=1067297&r2=1067298&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
(original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
Fri Feb  4 21:53:33 2011
@@ -150,12 +150,12 @@ public class SettingsPresenter extends B
         Map<HasValue, String> errors = new HashMap<HasValue, String>();
 
         String nameValue = name.getValue();
-        if (nameValue == null || nameValue.isEmpty()) {
+        if (nameValue == null || nameValue.length() == 0) {
             errors.put(name, constans.settingsTabSubscriptionDialogEmptyName());
         }
 
         String urlValue = url.getValue();
-        if (urlValue == null || urlValue.isEmpty()) {
+        if (urlValue == null || urlValue.length() == 0) {
             errors.put(url, constans.settingsTabSubscriptionDialogEmptyUrl());
         }
 



Mime
View raw message