summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2011-06-20 08:33:11 -0700
committerShawn O. Pearce <sop@google.com>2011-06-20 08:35:51 -0700
commitbd728215f6db84e539ec1612350c5b08c37105eb (patch)
treeca1ca3fd3e46b9df3c8048a8c9a63b4c15b4f7bd
parent4ed98336b42a0bc4315c99581e5b7a5ea6513476 (diff)
downloadgwtexpui-bd728215f6db84e539ec1612350c5b08c37105eb.tar.gz
Update GWT to 2.3.0
Change-Id: Ide36d952df68c6ef27616b8d0d67312c15a9eb69
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java8
-rw-r--r--src/main/java/com/google/gwtexpui/user/client/View.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index 0463acd..e1ba6da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@ limitations under the License.
</licenses>
<properties>
- <gwtVersion>2.1.1</gwtVersion>
+ <gwtVersion>2.3.0</gwtVersion>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
diff --git a/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java b/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
index cc8c05f..4393583 100644
--- a/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
+++ b/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
@@ -15,6 +15,7 @@
package com.google.gwtexpui.clippy.client;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.Scheduler;
import com.google.gwt.event.dom.client.BlurEvent;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -24,7 +25,6 @@ import com.google.gwt.event.dom.client.KeyPressHandler;
import com.google.gwt.http.client.URL;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
@@ -128,7 +128,7 @@ public class CopyableLabel extends Composite implements HasText {
private void embedMovie() {
if (flashEnabled && UserAgent.hasFlash) {
- final String flashVars = "text=" + URL.encodeComponent(getText());
+ final String flashVars = "text=" + URL.encodeQueryString(getText());
final SafeHtmlBuilder h = new SafeHtmlBuilder();
h.openElement("span");
@@ -189,7 +189,7 @@ public class CopyableLabel extends Composite implements HasText {
switch (event.getCharCode()) {
case 'c':
case 'x':
- DeferredCommand.addCommand(new Command() {
+ Scheduler.get().scheduleDeferred(new Command() {
public void execute() {
hideTextBox();
}
@@ -210,7 +210,7 @@ public class CopyableLabel extends Composite implements HasText {
textLabel.setVisible(false);
textBox.setVisible(true);
- DeferredCommand.addCommand(new Command() {
+ Scheduler.get().scheduleDeferred(new Command() {
@Override
public void execute() {
textBox.selectAll();
diff --git a/src/main/java/com/google/gwtexpui/user/client/View.java b/src/main/java/com/google/gwtexpui/user/client/View.java
index 87668a7..35ecb12 100644
--- a/src/main/java/com/google/gwtexpui/user/client/View.java
+++ b/src/main/java/com/google/gwtexpui/user/client/View.java
@@ -40,7 +40,7 @@ public abstract class View extends Composite {
public final boolean isCurrentView() {
Widget p = getParent();
while (p != null) {
- if (p instanceof ViewSite) {
+ if (p instanceof ViewSite<?>) {
return ((ViewSite<?>) p).getView() == this;
}
p = p.getParent();