Upgrade to GWT2.4.0

zanata · Nov 28, 2011 · 8cd9739 · 8cd9739
1 parent c53637e
commit 8cd9739
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
@@ -34,7 +34,7 @@ interface PagerUiBinder extends UiBinder<HTMLPanel, Pager>
    }
 
    @UiField
-   Anchor firstPage, lastPage, nextPage, prevPage;
+   Image firstPage, lastPage, nextPage, prevPage;
 
    @UiField
    Image firstPageDisabled, lastPageDisabled, nextPageDisabled, prevPageDisabled;
@@ -190,9 +190,9 @@ else if (event.getSource() == prevPage)
       }
    };
 
-   private void setEnabled(Anchor link, Image disabledLink, boolean enabled)
+   private void setEnabled(Image enabledLink, Image disabledLink, boolean enabled)
    {
-      link.setVisible(enabled);
+      enabledLink.setVisible(enabled);
       disabledLink.setVisible(!enabled);
    }
 

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
@@ -31,29 +31,19 @@
 
 	<g:HTMLPanel>
 
-           <!-- *PageDisabled g:Image are acting as disabled g:Anchor, because we could not disable anchor due to HTML limitation. -->
-
-           <g:Anchor ui:field="firstPage" styleName="{style.link}">
-            <img src="{resources.firstPageImage.getURL}"/>
-           </g:Anchor>
+           <g:Image ui:field="firstPage" resource="{resources.firstPageImage}" visible="false" styleName="{style.link}" />
 			<g:Image ui:field="firstPageDisabled" resource="{resources.firstPageDisabledImage}" visible="false" />
 
-			<g:Anchor ui:field="prevPage" styleName="{style.link}">
-            <img src="{resources.prevPageImage.getURL}"/>
-           </g:Anchor>
+            <g:Image ui:field="prevPage" resource="{resources.prevPageImage}" visible="false" styleName="{style.link}" />
            <g:Image ui:field="prevPageDisabled" resource="{resources.prevPageDisabledImage}" visible="false" />
 
 			<g:TextBox ui:field="gotoPage" maxLength="8" width="40px" />
 			<g:Label ui:field="pageCountLabel" styleName="{style.inline-label}">of 0</g:Label>
-
-			<g:Anchor ui:field="nextPage" styleName="{style.link}">
-            <img src="{resources.nextPageImage.getURL}"/>
-           </g:Anchor>
+
+           <g:Image ui:field="nextPage" resource="{resources.nextPageImage}" visible="false" styleName="{style.link}" />
            <g:Image ui:field="nextPageDisabled" resource="{resources.nextPageDisabledImage}" visible="false" />
-
-			<g:Anchor ui:field="lastPage" styleName="{style.link}">
-            <img src="{resources.lastPageImage.getURL}"/>
-           </g:Anchor>
+
+           <g:Image ui:field="lastPage" resource="{resources.lastPageImage}" visible="false" styleName="{style.link}" />
            <g:Image ui:field="lastPageDisabled" resource="{resources.lastPageDisabledImage}" visible="false" />
 
 	</g:HTMLPanel>

diff --git a/zanata-parent/pom.xml b/zanata-parent/pom.xml
@@ -150,7 +150,7 @@
 		<!-- buildNumber is set by buildnumber-maven-plugin from git info -->
 		<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<gwt.version>2.2.0</gwt.version>
+		<gwt.version>2.4.0</gwt.version>
 		<gwt-incubator.version>2.2.0-zanata-0</gwt-incubator.version>
 		<!-- see http://community.jboss.org/wiki/HibernateCompatibilityMatrix?decorator=print -->
 		<hibernate.scope>provided</hibernate.scope>
@@ -316,7 +316,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>gwt-maven-plugin</artifactId>
-					<version>2.2.0</version>
+					<version>2.4.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-eclipse-plugin</artifactId>