aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-12-11 13:42:06 +0200
committerVaadin Code Review <review@vaadin.com>2014-12-11 12:37:20 +0000
commit66e07930b9749046e65434eb7d5dc8125a1f761c (patch)
tree6cafdd48a660bc347955d7b22e3a2ab2506a9587 /server
parentea0be1f8dcff35ea8c652d69cd286d952c09ae5a (diff)
downloadvaadin-framework-66e07930b9749046e65434eb7d5dc8125a1f761c.tar.gz
vaadin-framework-66e07930b9749046e65434eb7d5dc8125a1f761c.zip
Move Renderers to com.vaadin.ui.renderer package (#13334)
Change-Id: I80370f05cfa8123d64728abd5ede9642931e0cd8
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/data/RpcDataProviderExtension.java6
-rw-r--r--server/src/com/vaadin/ui/Grid.java4
-rw-r--r--server/src/com/vaadin/ui/renderer/ButtonRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/ButtonRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/ClickableRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/DateRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/DateRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/HtmlRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/HtmlRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/ImageRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/ImageRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/NumberRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/NumberRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/ProgressBarRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/ProgressBarRenderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/Renderer.java (renamed from server/src/com/vaadin/ui/components/grid/Renderer.java)2
-rw-r--r--server/src/com/vaadin/ui/renderer/TextRenderer.java (renamed from server/src/com/vaadin/ui/components/grid/renderers/TextRenderer.java)2
-rw-r--r--server/tests/src/com/vaadin/tests/server/renderer/ImageRendererTest.java (renamed from server/tests/src/com/vaadin/tests/server/component/grid/ImageRendererTest.java)4
-rw-r--r--server/tests/src/com/vaadin/tests/server/renderer/RendererTest.java (renamed from server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java)4
13 files changed, 18 insertions, 18 deletions
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;