From c1ecea9aa4729b1c8c3d00ebefa1a2a08a352ebf Mon Sep 17 00:00:00 2001 From: Adam Wagner Date: Fri, 7 Apr 2017 13:03:09 +0300 Subject: Remove Extension suffix from Grid DND classes (#9035) --- .../shared/ui/grid/GridDragSourceExtensionRpc.java | 50 ---------------------- .../ui/grid/GridDragSourceExtensionState.java | 33 -------------- .../vaadin/shared/ui/grid/GridDragSourceRpc.java | 50 ++++++++++++++++++++++ .../vaadin/shared/ui/grid/GridDragSourceState.java | 33 ++++++++++++++ .../shared/ui/grid/GridDropTargetExtensionRpc.java | 42 ------------------ .../ui/grid/GridDropTargetExtensionState.java | 32 -------------- .../vaadin/shared/ui/grid/GridDropTargetRpc.java | 42 ++++++++++++++++++ .../vaadin/shared/ui/grid/GridDropTargetState.java | 32 ++++++++++++++ 8 files changed, 157 insertions(+), 157 deletions(-) delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionRpc.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionState.java create mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceRpc.java create mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceState.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionRpc.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionState.java create mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetRpc.java create mode 100644 shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetState.java (limited to 'shared/src/main/java') diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionRpc.java deleted file mode 100644 index c0e24fe847..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionRpc.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import java.util.List; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.dnd.DropEffect; - -/** - * RPC for firing server side drag start and drag end events when the - * corresponding client side events happen on the drag source Grid. - * - * @author Vaadin Ltd. - * @since - */ -public interface GridDragSourceExtensionRpc extends ServerRpc { - - /** - * Called when dragstart event happens on client side. - * - * @param draggedItemKeys - * Keys of the items in Grid being dragged. - */ - public void dragStart(List draggedItemKeys); - - /** - * Called when dragend event happens on client side. - * - * @param dropEffect - * Drop effect of the dragend event, extracted from {@code - * DataTransfer.dropEffect} parameter. - * @param draggedItemKeys - * Keys of the items in Grid having been dragged. - */ - public void dragEnd(DropEffect dropEffect, List draggedItemKeys); -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionState.java deleted file mode 100644 index 682863ab88..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceExtensionState.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import com.vaadin.shared.ui.dnd.DragSourceState; - -/** - * State class containing parameters for GridDragSourceExtension. - * - * @author Vaadin Ltd - * @since - */ -public class GridDragSourceExtensionState extends DragSourceState { - - /** - * Json key for storing data for a dragged row. - */ - public static final String JSONKEY_DRAG_DATA = "drag-data"; - -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceRpc.java new file mode 100644 index 0000000000..066e193157 --- /dev/null +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceRpc.java @@ -0,0 +1,50 @@ +/* + * Copyright 2000-2016 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; + +import java.util.List; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.dnd.DropEffect; + +/** + * RPC for firing server side drag start and drag end events when the + * corresponding client side events happen on the drag source Grid. + * + * @author Vaadin Ltd. + * @since + */ +public interface GridDragSourceRpc extends ServerRpc { + + /** + * Called when dragstart event happens on client side. + * + * @param draggedItemKeys + * Keys of the items in Grid being dragged. + */ + public void dragStart(List draggedItemKeys); + + /** + * Called when dragend event happens on client side. + * + * @param dropEffect + * Drop effect of the dragend event, extracted from {@code + * DataTransfer.dropEffect} parameter. + * @param draggedItemKeys + * Keys of the items in Grid having been dragged. + */ + public void dragEnd(DropEffect dropEffect, List draggedItemKeys); +} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceState.java new file mode 100644 index 0000000000..3d020043fe --- /dev/null +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDragSourceState.java @@ -0,0 +1,33 @@ +/* + * Copyright 2000-2016 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; + +import com.vaadin.shared.ui.dnd.DragSourceState; + +/** + * State class containing parameters for GridDragSource. + * + * @author Vaadin Ltd + * @since + */ +public class GridDragSourceState extends DragSourceState { + + /** + * Json key for storing data for a dragged row. + */ + public static final String JSONKEY_DRAG_DATA = "drag-data"; + +} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionRpc.java deleted file mode 100644 index 212081d486..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionRpc.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * RPC for firing server side drop event when client side drop event happens on - * drop target Grid. - * - * @author Vaadin Ltd. - * @since - */ -public interface GridDropTargetExtensionRpc extends ServerRpc { - - /** - * Called when drop event happens on client side. - * - * @param dataTransferText - * Data of type {@code "text"} from the {@code DataTransfer} - * object. - * @param rowKey - * Key of the row on which the drop event occured. - * @param dropLocation - * Location of the drop within the row. - */ - public void drop(String dataTransferText, String rowKey, - DropLocation dropLocation); -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionState.java deleted file mode 100644 index 50b50a5d24..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetExtensionState.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import com.vaadin.shared.ui.dnd.DropTargetState; - -/** - * State class containing parameters for GridDropTargetExtension. - * - * @author Vaadin Ltd - * @since - */ -public class GridDropTargetExtensionState extends DropTargetState { - - /** - * Stores the drop mode of the drop target Grid. - */ - public DropMode dropMode; -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetRpc.java new file mode 100644 index 0000000000..84bb6ed890 --- /dev/null +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetRpc.java @@ -0,0 +1,42 @@ +/* + * Copyright 2000-2016 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; + +import com.vaadin.shared.communication.ServerRpc; + +/** + * RPC for firing server side drop event when client side drop event happens on + * drop target Grid. + * + * @author Vaadin Ltd. + * @since + */ +public interface GridDropTargetRpc extends ServerRpc { + + /** + * Called when drop event happens on client side. + * + * @param dataTransferText + * Data of type {@code "text"} from the {@code DataTransfer} + * object. + * @param rowKey + * Key of the row on which the drop event occured. + * @param dropLocation + * Location of the drop within the row. + */ + public void drop(String dataTransferText, String rowKey, + DropLocation dropLocation); +} diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetState.java new file mode 100644 index 0000000000..aae051b299 --- /dev/null +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridDropTargetState.java @@ -0,0 +1,32 @@ +/* + * Copyright 2000-2016 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; + +import com.vaadin.shared.ui.dnd.DropTargetState; + +/** + * State class containing parameters for GridDropTarget. + * + * @author Vaadin Ltd + * @since + */ +public class GridDropTargetState extends DropTargetState { + + /** + * Stores the drop mode of the drop target Grid. + */ + public DropMode dropMode; +} -- cgit v1.2.3