Fix compile errors (#13334)

Change-Id: Ib9210685ed70f98af78b5cc3ad756f37b09c326a

diff --git a/client/src/com/vaadin/client/ui/grid/FlyweightCell.java b/client/src/com/vaadin/client/ui/grid/FlyweightCell.java
index 8f52e415e5f8788dd019bc8b6a4edfe36317dfe3..296a70934b2bdfdbd636611c514e0b8d271d71fc 100644 (file)
--- a/client/src/com/vaadin/client/ui/grid/FlyweightCell.java
+++ b/client/src/com/vaadin/client/ui/grid/FlyweightCell.java
@@ -20,7 +20,6 @@ import java.util.List;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ui.grid.FlyweightRow.CellIterator;
@@ -192,7 +191,7 @@ class FlyweightCell implements Cell {
             widget.removeFromParent();
 
             // Physical attach.
-            DOM.appendChild(getElement(), widget.getElement());
+            getElement().appendChild(widget.getElement());
 
             Escalator.setParent(widget, escalator);
         }

diff --git a/client/src/com/vaadin/shared/ui/grid/ScrollDestination.java b/client/src/com/vaadin/shared/ui/grid/ScrollDestination.java
deleted file mode 100644 (file)
index decc2fa..0000000
--- a/client/src/com/vaadin/shared/ui/grid/ScrollDestination.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2000-2013 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.shared.ui.grid;
-
-/**
- * Enumeration, specifying the destinations that are supported when scrolling
- * rows or columns into view.
- * 
- * @since 7.2
- * @author Vaadin Ltd
- */
-public enum ScrollDestination {
-
-    /**
-     * Scroll as little as possible to show the target element. If the element
-     * fits into view, this works as START or END depending on the current
-     * scroll position. If the element does not fit into view, this works as
-     * START.
-     */
-    ANY,
-
-    /**
-     * Scrolls so that the element is shown at the start of the viewport. The
-     * viewport will, however, not scroll beyond its contents.
-     */
-    START,
-
-    /**
-     * Scrolls so that the element is shown in the middle of the viewport. The
-     * viewport will, however, not scroll beyond its contents, given more
-     * elements than what the viewport is able to show at once. Under no
-     * circumstances will the viewport scroll before its first element.
-     */
-    MIDDLE,
-
-    /**
-     * Scrolls so that the element is shown at the end of the viewport. The
-     * viewport will, however, not scroll before its first element.
-     */
-    END
-
-}

diff --git a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java b/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java
new file mode 100644 (file)
index 0000000..decc2fa
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.shared.ui.grid;
+
+/**
+ * Enumeration, specifying the destinations that are supported when scrolling
+ * rows or columns into view.
+ * 
+ * @since 7.2
+ * @author Vaadin Ltd
+ */
+public enum ScrollDestination {
+
+    /**
+     * Scroll as little as possible to show the target element. If the element
+     * fits into view, this works as START or END depending on the current
+     * scroll position. If the element does not fit into view, this works as
+     * START.
+     */
+    ANY,
+
+    /**
+     * Scrolls so that the element is shown at the start of the viewport. The
+     * viewport will, however, not scroll beyond its contents.
+     */
+    START,
+
+    /**
+     * Scrolls so that the element is shown in the middle of the viewport. The
+     * viewport will, however, not scroll beyond its contents, given more
+     * elements than what the viewport is able to show at once. Under no
+     * circumstances will the viewport scroll before its first element.
+     */
+    MIDDLE,
+
+    /**
+     * Scrolls so that the element is shown at the end of the viewport. The
+     * viewport will, however, not scroll before its first element.
+     */
+    END
+
+}