From 77ac7e6785dc97986e2f3e7ae742e2360560cf63 Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Mon, 25 Nov 2013 08:52:05 +0000 Subject: [PATCH] Avoid some code that will be deprecated in GWT 2.6.0 and make gwt:run work git-svn-id: https://zxing.googlecode.com/svn/trunk@2923 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- zxing.appspot.com/pom.xml | 1 + .../zxing/web/generator/client/CalendarEventGenerator.java | 4 ++-- .../java/com/google/zxing/web/generator/client/Generator.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zxing.appspot.com/pom.xml b/zxing.appspot.com/pom.xml index ad911460e..49811f2ce 100644 --- a/zxing.appspot.com/pom.xml +++ b/zxing.appspot.com/pom.xml @@ -53,6 +53,7 @@ gwt-maven-plugin ${gwt.version} + Generator.html true diff --git a/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/CalendarEventGenerator.java b/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/CalendarEventGenerator.java index 3d6be41a4..f9597057e 100644 --- a/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/CalendarEventGenerator.java +++ b/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/CalendarEventGenerator.java @@ -16,6 +16,7 @@ package com.google.zxing.web.generator.client; +import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -25,7 +26,6 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.HasText; @@ -179,7 +179,7 @@ public final class CalendarEventGenerator implements GeneratorSource { for (String s : FULL_DAY_ONLY_IDS) { Element element = DOM.getElementById(s); String style = cb.getValue() ? "none" : ""; - DOM.setStyleAttribute(element, "display", style); + element.getStyle().setProperty("display", style); } } }); diff --git a/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java b/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java index 91fa7e19a..b780d9e66 100644 --- a/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java +++ b/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java @@ -17,6 +17,7 @@ package com.google.zxing.web.generator.client; import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -25,7 +26,6 @@ import com.google.gwt.event.dom.client.KeyPressEvent; import com.google.gwt.event.dom.client.KeyPressHandler; import com.google.gwt.http.client.URL; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.HTML;