Move Renderers to com.vaadin.ui.renderer package (#13334)

Change-Id: I80370f05cfa8123d64728abd5ede9642931e0cd8

24 files changed, 37 insertions, 38 deletions

diff --git a/client/src/com/vaadin/client/connectors/ButtonRendererConnector.java b/client/src/com/vaadin/client/connectors/ButtonRendererConnector.java
index 45556d6176..e4f850fb48 100644
--- a/client/src/com/vaadin/client/connectors/ButtonRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/ButtonRendererConnector.java
@@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.ButtonRenderer.class)
+@Connect(com.vaadin.ui.renderer.ButtonRenderer.class)
 public class ButtonRendererConnector extends ClickableRendererConnector<String> {
 
     @Override
diff --git a/client/src/com/vaadin/client/connectors/DateRendererConnector.java b/client/src/com/vaadin/client/connectors/DateRendererConnector.java
index b9fad95f0d..2df8184eaf 100644
--- a/client/src/com/vaadin/client/connectors/DateRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/DateRendererConnector.java
@@ -28,7 +28,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.DateRenderer.class)
+@Connect(com.vaadin.ui.renderer.DateRenderer.class)
 public class DateRendererConnector extends TextRendererConnector {
     // No implementation needed
 }
diff --git a/client/src/com/vaadin/client/connectors/ImageRendererConnector.java b/client/src/com/vaadin/client/connectors/ImageRendererConnector.java
index 33e108cd1e..c5dfd97f69 100644
--- a/client/src/com/vaadin/client/connectors/ImageRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/ImageRendererConnector.java
@@ -31,7 +31,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.ImageRenderer.class)
+@Connect(com.vaadin.ui.renderer.ImageRenderer.class)
 public class ImageRendererConnector extends ClickableRendererConnector<String> {
 
     @Override
diff --git a/client/src/com/vaadin/client/connectors/NumberRendererConnector.java b/client/src/com/vaadin/client/connectors/NumberRendererConnector.java
index cf8ef3e076..68c96d21bc 100644
--- a/client/src/com/vaadin/client/connectors/NumberRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/NumberRendererConnector.java
@@ -29,7 +29,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.NumberRenderer.class)
+@Connect(com.vaadin.ui.renderer.NumberRenderer.class)
 public class NumberRendererConnector extends TextRendererConnector {
     // no implementation needed
 }
diff --git a/client/src/com/vaadin/client/connectors/ProgressBarRendererConnector.java b/client/src/com/vaadin/client/connectors/ProgressBarRendererConnector.java
index ec7e8d0d08..c3dfa66dbd 100644
--- a/client/src/com/vaadin/client/connectors/ProgressBarRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/ProgressBarRendererConnector.java
@@ -24,7 +24,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.ProgressBarRenderer.class)
+@Connect(com.vaadin.ui.renderer.ProgressBarRenderer.class)
 public class ProgressBarRendererConnector extends
         AbstractRendererConnector<Double> {
 
diff --git a/client/src/com/vaadin/client/connectors/TextRendererConnector.java b/client/src/com/vaadin/client/connectors/TextRendererConnector.java
index 6af095c540..53aee83497 100644
--- a/client/src/com/vaadin/client/connectors/TextRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/TextRendererConnector.java
@@ -24,7 +24,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.TextRenderer.class)
+@Connect(com.vaadin.ui.renderer.TextRenderer.class)
 public class TextRendererConnector extends AbstractRendererConnector<String> {
 
     @Override
diff --git a/client/src/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java b/client/src/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
index d696b50214..fd93dfd9e2 100644
--- a/client/src/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
+++ b/client/src/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
@@ -25,7 +25,7 @@ import com.vaadin.shared.ui.Connect;
  * @since
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.components.grid.renderers.HtmlRenderer.class)
+@Connect(com.vaadin.ui.renderer.HtmlRenderer.class)
 public class UnsafeHtmlRendererConnector extends
         AbstractRendererConnector<String> {
 
diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index aa0d6b3716..9f7c783537 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -52,7 +52,7 @@ import com.vaadin.shared.ui.grid.Range;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.CellStyleGenerator;
 import com.vaadin.ui.Grid.Column;
-import com.vaadin.ui.components.grid.Renderer;
+import com.vaadin.ui.renderer.Renderer;
 
 import elemental.json.Json;
 import elemental.json.JsonArray;
@@ -439,8 +439,8 @@ public class RpcDataProviderExtension extends AbstractExtension {
          * @param removedPropertyIds
          *            the property ids that have been removed from the container
          */
-        public void propertiesRemoved(
-                @SuppressWarnings("unused") Collection<Object> removedPropertyIds) {
+        public void propertiesRemoved(@SuppressWarnings("unused")
+        Collection<Object> removedPropertyIds) {
             /*
              * no-op, for now.
              * 
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 3896c53268..7a6e6abef2 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -77,10 +77,8 @@ import com.vaadin.shared.ui.grid.ScrollDestination;
 import com.vaadin.shared.ui.grid.SortDirection;
 import com.vaadin.shared.ui.grid.SortEventOriginator;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.ui.components.grid.Renderer;
 import com.vaadin.ui.components.grid.SortOrderChangeEvent;
 import com.vaadin.ui.components.grid.SortOrderChangeListener;
-import com.vaadin.ui.components.grid.renderers.TextRenderer;
 import com.vaadin.ui.components.grid.selection.MultiSelectionModel;
 import com.vaadin.ui.components.grid.selection.NoSelectionModel;
 import com.vaadin.ui.components.grid.selection.SelectionChangeEvent;
@@ -90,6 +88,8 @@ import com.vaadin.ui.components.grid.selection.SelectionModel;
 import com.vaadin.ui.components.grid.selection.SingleSelectionModel;
 import com.vaadin.ui.components.grid.sort.Sort;
 import com.vaadin.ui.components.grid.sort.SortOrder;
+import com.vaadin.ui.renderer.Renderer;
+import com.vaadin.ui.renderer.TextRenderer;
 import com.vaadin.util.ReflectTools;
 
 import elemental.json.Json;
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/ButtonRenderer.java b/server/src/com/vaadin/ui/renderer/ButtonRenderer.java
index dece41c7ab..4a7a86daa2 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/ButtonRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/ButtonRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 /**
  * A Renderer that displays a button with a textual caption. The value of the
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java b/server/src/com/vaadin/ui/renderer/ClickableRenderer.java
index c08ef73ae2..0d745ab29e 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/ClickableRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import java.lang.reflect.Method;
 
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/DateRenderer.java b/server/src/com/vaadin/ui/renderer/DateRenderer.java
index 94eeab7d34..4d1d702993 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/DateRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/DateRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import java.text.DateFormat;
 import java.util.Date;
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/HtmlRenderer.java b/server/src/com/vaadin/ui/renderer/HtmlRenderer.java
index 6507792cac..bdab51991c 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/HtmlRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/HtmlRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import com.vaadin.ui.Grid.AbstractRenderer;
 
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/ImageRenderer.java b/server/src/com/vaadin/ui/renderer/ImageRenderer.java
index be57a5ec19..87a044c4a6 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/ImageRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/ImageRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.Resource;
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/NumberRenderer.java b/server/src/com/vaadin/ui/renderer/NumberRenderer.java
index 955b36d0a9..9af5c4cffb 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/NumberRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/NumberRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import java.text.NumberFormat;
 import java.util.Locale;
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/ProgressBarRenderer.java b/server/src/com/vaadin/ui/renderer/ProgressBarRenderer.java
index 7021916cd7..cb688b178b 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/ProgressBarRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/ProgressBarRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import com.vaadin.ui.Grid.AbstractRenderer;
 
diff --git a/server/src/com/vaadin/ui/components/grid/Renderer.java b/server/src/com/vaadin/ui/renderer/Renderer.java
index 1e6361081e..6adddd1a20 100644
--- a/server/src/com/vaadin/ui/components/grid/Renderer.java
+++ b/server/src/com/vaadin/ui/renderer/Renderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid;
+package com.vaadin.ui.renderer;
 
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.Extension;
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/TextRenderer.java b/server/src/com/vaadin/ui/renderer/TextRenderer.java
index 554d57f295..42bd02fa2a 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/TextRenderer.java
+++ b/server/src/com/vaadin/ui/renderer/TextRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.grid.renderers;
+package com.vaadin.ui.renderer;
 
 import com.vaadin.ui.Grid.AbstractRenderer;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/ImageRendererTest.java b/server/tests/src/com/vaadin/tests/server/renderer/ImageRendererTest.java
index cdf386ef4b..08f045277d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/ImageRendererTest.java
+++ b/server/tests/src/com/vaadin/tests/server/renderer/ImageRendererTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.tests.server.renderer;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,7 +30,7 @@ import com.vaadin.server.FontAwesome;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.components.grid.renderers.ImageRenderer;
+import com.vaadin.ui.renderer.ImageRenderer;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java b/server/tests/src/com/vaadin/tests/server/renderer/RendererTest.java
index c2779bfe89..464d409543 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java
+++ b/server/tests/src/com/vaadin/tests/server/renderer/RendererTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.server.component.grid;
+package com.vaadin.tests.server.renderer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -36,7 +36,7 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.Column;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.components.grid.renderers.TextRenderer;
+import com.vaadin.ui.renderer.TextRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColspans.java b/uitest/src/com/vaadin/tests/components/grid/GridColspans.java
index 4c23c3bcab..f61a39a1f2 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColspans.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridColspans.java
@@ -25,7 +25,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.FooterRow;
 import com.vaadin.ui.Grid.HeaderRow;
-import com.vaadin.ui.components.grid.renderers.NumberRenderer;
+import com.vaadin.ui.renderer.NumberRenderer;
 
 public class GridColspans extends AbstractTestUI {
 
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidth.java b/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
index 6c61846e0e..5d9f4285a1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
@@ -22,7 +22,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.Column;
 import com.vaadin.ui.Grid.SelectionMode;
-import com.vaadin.ui.components.grid.renderers.HtmlRenderer;
+import com.vaadin.ui.renderer.HtmlRenderer;
 
 public class GridColumnAutoWidth extends AbstractTestUI {
     @Override
diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java
index 8c6037938c..de6fb30e1c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java
+++ b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java
@@ -25,11 +25,11 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.SelectionMode;
-import com.vaadin.ui.components.grid.renderers.ButtonRenderer;
-import com.vaadin.ui.components.grid.renderers.ClickableRenderer.RendererClickEvent;
-import com.vaadin.ui.components.grid.renderers.ClickableRenderer.RendererClickListener;
-import com.vaadin.ui.components.grid.renderers.ImageRenderer;
-import com.vaadin.ui.components.grid.renderers.ProgressBarRenderer;
+import com.vaadin.ui.renderer.ButtonRenderer;
+import com.vaadin.ui.renderer.ClickableRenderer.RendererClickEvent;
+import com.vaadin.ui.renderer.ClickableRenderer.RendererClickListener;
+import com.vaadin.ui.renderer.ImageRenderer;
+import com.vaadin.ui.renderer.ProgressBarRenderer;
 
 public class WidgetRenderers extends AbstractTestUI {
 
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index f03a1ae607..88579154dc 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -46,13 +46,12 @@ import com.vaadin.ui.Grid.HeaderRow;
 import com.vaadin.ui.Grid.SelectionMode;
 import com.vaadin.ui.components.grid.SortOrderChangeEvent;
 import com.vaadin.ui.components.grid.SortOrderChangeListener;
-import com.vaadin.ui.components.grid.renderers.DateRenderer;
-import com.vaadin.ui.components.grid.renderers.HtmlRenderer;
-import com.vaadin.ui.components.grid.renderers.NumberRenderer;
 import com.vaadin.ui.components.grid.selection.MultiSelectionModel;
-import com.vaadin.ui.components.grid.selection.SelectionModel;
 import com.vaadin.ui.components.grid.sort.Sort;
 import com.vaadin.ui.components.grid.sort.SortOrder;
+import com.vaadin.ui.renderer.DateRenderer;
+import com.vaadin.ui.renderer.HtmlRenderer;
+import com.vaadin.ui.renderer.NumberRenderer;
 
 /**
  * Tests the basic features like columns, footers and headers
@@ -267,8 +266,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
                             grid.setSelectionMode(SelectionMode.MULTI);
                         }
 
-                        ((MultiSelectionModel) grid.getSelectionModel()).setSelectionLimit(limit
-                                .intValue());
+                        ((MultiSelectionModel) grid.getSelectionModel())
+                                .setSelectionLimit(limit.intValue());
                     }
                 });