Checkstyle fixes.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4679 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/client/ui/Button.java b/user/src/com/google/gwt/user/client/ui/Button.java
index 33d17f4..3eb189f 100644
--- a/user/src/com/google/gwt/user/client/ui/Button.java
+++ b/user/src/com/google/gwt/user/client/ui/Button.java
@@ -18,7 +18,6 @@
import com.google.gwt.dom.client.ButtonElement;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.ButtonElement;
import com.google.gwt.event.dom.client.ClickHandler;
/**
diff --git a/user/src/com/google/gwt/user/client/ui/PopupPanel.java b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
index 8155ae4..542b653 100644
--- a/user/src/com/google/gwt/user/client/ui/PopupPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
@@ -109,16 +109,16 @@
*/
static class ResizeAnimation extends Animation {
/**
- * The offset height and width of the current {@link PopupPanel}.
- */
- private int offsetHeight, offsetWidth = -1;
-
- /**
* The {@link PopupPanel} being affected.
*/
private PopupPanel curPanel = null;
/**
+ * The offset height and width of the current {@link PopupPanel}.
+ */
+ private int offsetHeight, offsetWidth = -1;
+
+ /**
* A boolean indicating whether we are showing or hiding the popup.
*/
private boolean showing = false;
@@ -281,10 +281,10 @@
*/
private AnimationType animType = AnimationType.CENTER;
- private HandlerRegistration nativePreviewHandlerRegistration;
-
private boolean autoHide, previewAllNativeEvents, modal, showing;
+ private List<Element> autoHidePartners;
+
// Used to track requested size across changing child widgets
private String desiredHeight;
@@ -292,16 +292,16 @@
private boolean isAnimationEnabled = false;
- private List<Element> autoHidePartners;
+ // the left style attribute in pixels
+ private int leftPosition = -1;
+
+ private HandlerRegistration nativePreviewHandlerRegistration;
/**
* The {@link ResizeAnimation} used to open and close the {@link PopupPanel}s.
*/
private ResizeAnimation resizeAnimation = new ResizeAnimation(this);
- // the left style attribute in pixels
- private int leftPosition = -1;
-
// The top style attribute in pixels
private int topPosition = -1;
@@ -585,14 +585,6 @@
return true;
}
- @Override
- protected void onUnload() {
- // Just to be sure, we perform cleanup when the popup is unloaded (i.e.
- // removed from the DOM). This is normally taken care of in hide(), but it
- // can be missed if someone removes the popup directly from the RootPanel.
- cleanup();
- }
-
/**
* Remove an autoHide partner.
*
@@ -827,7 +819,7 @@
protected com.google.gwt.user.client.Element getStyleElement() {
return impl.getStyleElement(getPopupImplElement());
}
-
+
protected void onPreviewNativeEvent(NativePreviewEvent event) {
// Cancel the event based on the deprecated onEventPreview() method
if (event.isFirstHandler()
@@ -835,6 +827,14 @@
event.cancel();
}
}
+
+ @Override
+ protected void onUnload() {
+ // Just to be sure, we perform cleanup when the popup is unloaded (i.e.
+ // removed from the DOM). This is normally taken care of in hide(), but it
+ // can be missed if someone removes the popup directly from the RootPanel.
+ cleanup();
+ }
/**
* We control size by setting our child widget's size. However, if we don't
