diff options
author | Aleksi Hietanen <aleksi@vaadin.com> | 2017-05-19 14:20:41 +0300 |
---|---|---|
committer | Henri Sara <henri.sara@gmail.com> | 2017-05-19 14:20:41 +0300 |
commit | a71abd42dad3966904c9d47df0b6908dcb747e66 (patch) | |
tree | cdeb87465b8c53a30a55e62d71394fd9364a9958 | |
parent | dfe4e3bf6f66b075c96ac2b0f30c0e79bd04ee6d (diff) | |
download | vaadin-framework-a71abd42dad3966904c9d47df0b6908dcb747e66.tar.gz vaadin-framework-a71abd42dad3966904c9d47df0b6908dcb747e66.zip |
Reorganize packages of connectors introduced in 8.1 (#9340)
* Move Tree and TreeGrid connectors to different package
* Move grid renderers to correct package
Only renderers introduced in 8.1 have been moved for
backwards compatibility.
-rw-r--r-- | client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java (renamed from client/src/main/java/com/vaadin/client/connectors/ComponentRendererConnector.java) | 4 | ||||
-rw-r--r-- | client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java (renamed from client/src/main/java/com/vaadin/client/connectors/tree/TreeRendererConnector.java) | 7 | ||||
-rw-r--r-- | client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java | 2 | ||||
-rw-r--r-- | client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java (renamed from client/src/main/java/com/vaadin/client/connectors/treegrid/TreeGridConnector.java) | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/ComponentRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java index ef14c5024e..cf6c2db79f 100644 --- a/client/src/main/java/com/vaadin/client/connectors/ComponentRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors; +package com.vaadin.client.connectors.grid; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.SimplePanel; @@ -35,7 +35,7 @@ import com.vaadin.ui.renderers.ComponentRenderer; */ @Connect(ComponentRenderer.class) public class ComponentRendererConnector - extends AbstractRendererConnector<String> { + extends AbstractGridRendererConnector<String> { @Override protected Renderer<String> createRenderer() { diff --git a/client/src/main/java/com/vaadin/client/connectors/tree/TreeRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java index 5e0be94d9b..4540ce5d63 100644 --- a/client/src/main/java/com/vaadin/client/connectors/tree/TreeRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java @@ -13,12 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.tree; +package com.vaadin.client.connectors.grid; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.client.Element; -import com.vaadin.client.connectors.AbstractRendererConnector; -import com.vaadin.client.connectors.grid.ColumnConnector; import com.vaadin.client.renderers.HtmlRenderer; import com.vaadin.client.renderers.Renderer; import com.vaadin.client.widget.grid.RendererCellReference; @@ -35,7 +33,8 @@ import elemental.json.JsonObject; * @since 8.1 */ @Connect(TreeRenderer.class) -public class TreeRendererConnector extends AbstractRendererConnector<String> { +public class TreeRendererConnector + extends AbstractGridRendererConnector<String> { @Override public Renderer<String> createRenderer() { diff --git a/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java b/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java index 30d243dd7c..03f6525c1c 100644 --- a/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/HierarchyRenderer.java @@ -30,7 +30,7 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.WidgetUtil; -import com.vaadin.client.connectors.treegrid.TreeGridConnector; +import com.vaadin.client.ui.treegrid.TreeGridConnector; import com.vaadin.client.widget.escalator.FlyweightCell; import com.vaadin.client.widget.grid.RendererCellReference; import com.vaadin.client.widget.grid.RowReference; diff --git a/client/src/main/java/com/vaadin/client/connectors/treegrid/TreeGridConnector.java b/client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java index 514bb7d01f..71c286aedf 100644 --- a/client/src/main/java/com/vaadin/client/connectors/treegrid/TreeGridConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.connectors.treegrid; +package com.vaadin.client.ui.treegrid; import java.util.Collection; import java.util.HashSet; |