]> source.dussan.org Git - vaadin-framework.git/commitdiff
Move and duplicate client side and state to compatibility package
authorArtur Signell <artur@vaadin.com>
Tue, 30 Aug 2016 10:42:53 +0000 (13:42 +0300)
committerHenri Sara <hesara@vaadin.com>
Tue, 30 Aug 2016 14:10:21 +0000 (14:10 +0000)
* ProgressBar
* ProgressIndicator
* OptionGroup
* Table
* Tree
* TreeTable

Change-Id: Ie1249631cbdd2721f2c3a36e1b8ffc8160fca6aa

72 files changed:
client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java [deleted file]
compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ProgressBarRenderer.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressBar.java [new file with mode: 0644]
compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressIndicator.java [new file with mode: 0644]
compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTwinColSelect.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressBarConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressIndicatorConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/TreeConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java
compatibility-client/src/main/java/com/vaadin/v7/client/ui/twincolselect/TwinColSelectConnector.java
compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java
compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java
compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxState.java
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorServerRpc.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/CollapseMenuContent.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableConstants.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableServerRpc.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeConstants.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeServerRpc.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableConstants.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableState.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectConstants.java [new file with mode: 0644]
compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectState.java [new file with mode: 0644]
shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/table/TableState.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java [deleted file]
shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java [deleted file]
uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java

diff --git a/client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java b/client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java
deleted file mode 100644 (file)
index ad46639..0000000
+++ /dev/null
@@ -1,34 +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.client.ui;
-
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState;
-
-/**
- *
- * @author Vaadin Ltd
- *
- * @deprecated as of 7.1, renamed to VProgressBar
- */
-@Deprecated
-public class VProgressIndicator extends VProgressBar {
-
-    public VProgressIndicator() {
-        super();
-        setStylePrimaryName(ProgressIndicatorState.PRIMARY_STYLE_NAME);
-    }
-}
index be4a3d0dfbee5f62b9e5ef6d62addd5eb7a3cbdc..94e6d82fea681a244d54a9a80a3ac785f5ca1d75 100644 (file)
@@ -16,7 +16,7 @@
 package com.vaadin.v7.client.renderers;
 
 import com.google.gwt.core.shared.GWT;
-import com.vaadin.client.ui.VProgressBar;
+import com.vaadin.v7.client.ui.VProgressBar;
 import com.vaadin.v7.client.widget.grid.RendererCellReference;
 
 /**
index 632944c48bf001ca549e272e874da61c96a6a387..b67edfe93c5b9478fde716eb88f869691be7d303 100644 (file)
@@ -48,7 +48,7 @@ import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.Icon;
 import com.vaadin.client.ui.VCheckBox;
 import com.vaadin.shared.EventId;
-import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupConstants;
 
 public class VOptionGroup extends VOptionGroupBase
         implements FocusHandler, BlurHandler {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressBar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressBar.java
new file mode 100644 (file)
index 0000000..b4c5f7f
--- /dev/null
@@ -0,0 +1,101 @@
+/*
+ * 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.v7.client.ui;
+
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.ui.HasEnabled;
+import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.StyleConstants;
+
+/**
+ * Widget for showing the current progress of a long running task.
+ * <p>
+ * The default mode is to show the current progress internally represented by a
+ * floating point value between 0 and 1 (inclusive). The progress bar can also
+ * be in an indeterminate mode showing an animation indicating that the task is
+ * running but without providing any information about the current progress.
+ *
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+public class VProgressBar extends Widget implements HasEnabled {
+
+    public static final String PRIMARY_STYLE_NAME = "v-progressbar";
+
+    Element wrapper = DOM.createDiv();
+    Element indicator = DOM.createDiv();
+
+    private boolean indeterminate = false;
+    private float state = 0.0f;
+    private boolean enabled;
+
+    public VProgressBar() {
+        setElement(DOM.createDiv());
+        getElement().appendChild(wrapper);
+        wrapper.appendChild(indicator);
+
+        setStylePrimaryName(PRIMARY_STYLE_NAME);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * com.google.gwt.user.client.ui.UIObject#setStylePrimaryName(java.lang.
+     * String)
+     */
+    @Override
+    public void setStylePrimaryName(String style) {
+        super.setStylePrimaryName(style);
+        indicator.setClassName(getStylePrimaryName() + "-indicator");
+        wrapper.setClassName(getStylePrimaryName() + "-wrapper");
+
+    }
+
+    public void setIndeterminate(boolean indeterminate) {
+        this.indeterminate = indeterminate;
+        setStyleName(getStylePrimaryName() + "-indeterminate", indeterminate);
+    }
+
+    public void setState(float state) {
+        final int size = Math.round(100 * state);
+        indicator.getStyle().setWidth(size, Unit.PCT);
+    }
+
+    public boolean isIndeterminate() {
+        return indeterminate;
+    }
+
+    public float getState() {
+        return state;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (this.enabled != enabled) {
+            this.enabled = enabled;
+            setStyleName(StyleConstants.DISABLED, !enabled);
+        }
+    }
+}
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressIndicator.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressIndicator.java
new file mode 100644 (file)
index 0000000..8feee02
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * 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.v7.client.ui;
+
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState;
+
+/**
+ *
+ * @author Vaadin Ltd
+ *
+ * @deprecated as of 7.1, renamed to VProgressBar
+ */
+@Deprecated
+public class VProgressIndicator extends VProgressBar {
+
+    public VProgressIndicator() {
+        super();
+        setStylePrimaryName(ProgressIndicatorState.PRIMARY_STYLE_NAME);
+    }
+}
index 524e7f88cfe3d64b3fc54bdf137e4ea6a6d26d31..074e8d23da5ef40d7915e63239d977f9d6e97221 100644 (file)
@@ -113,9 +113,9 @@ import com.vaadin.client.ui.dd.VTransferable;
 import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.shared.ui.table.CollapseMenuContent;
-import com.vaadin.shared.ui.table.TableConstants;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
+import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
+import com.vaadin.v7.shared.ui.table.TableConstants;
 
 /**
  * VScrollTable
index cb07c0b8be38eaa8cbbc41e337a4944e7adba5ca..80b83c95045a8c8df46288a91ca795a4a6868710 100644 (file)
@@ -82,8 +82,8 @@ import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.MouseEventDetails.MouseButton;
 import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.shared.ui.tree.TreeConstants;
 import com.vaadin.v7.client.ui.tree.TreeConnector;
+import com.vaadin.v7.shared.ui.tree.TreeConstants;
 
 /**
  *
index c11dd7b56944432c06d8ccc9f5259bff20595cab..32bc14d330627298f1020e12536ba07082905768 100644 (file)
@@ -42,7 +42,7 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.SubPartAware;
 import com.vaadin.client.ui.VButton;
-import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectConstants;
 
 public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler,
         MouseDownHandler, DoubleClickHandler, SubPartAware {
index fdeb2e08dd993d59381ddf3c460649d7d5a5da21..53c0c0d06aa651b08f1a02e9fbaa2cc8ffc1aad1 100644 (file)
@@ -21,10 +21,10 @@ import com.vaadin.client.Paintable;
 import com.vaadin.client.StyleConstants;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.ui.VNativeButton;
-import com.vaadin.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.client.ui.AbstractFieldConnector;
 import com.vaadin.v7.client.ui.VOptionGroupBase;
 import com.vaadin.v7.client.ui.VTextField;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 
 public abstract class OptionGroupBaseConnector extends AbstractFieldConnector
         implements Paintable {
index 172c87277229636f443481ca2d133a134d1915c2..e88a2070bca2c817e1a3488886960fef9a95f19f 100644 (file)
@@ -25,8 +25,8 @@ import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.UIDL;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.v7.client.ui.VOptionGroup;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.v7.ui.OptionGroup;
 
 @Connect(OptionGroup.class)
index 77602a4974cb9999e0e248a2949f400089c15cff..c98d8acaffe236016794f460006b08f6d31a9137 100644 (file)
 package com.vaadin.v7.client.ui.progressindicator;
 
 import com.vaadin.client.communication.StateChangeEvent;
-import com.vaadin.client.ui.VProgressBar;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.progressindicator.ProgressBarState;
 import com.vaadin.v7.client.ui.AbstractFieldConnector;
+import com.vaadin.v7.client.ui.VProgressBar;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState;
 import com.vaadin.v7.ui.ProgressBar;
 
 /**
index d70055b3b330829d51f86af18679e9972b673450..0081ff34f972db558aa832ea13cba20a013d52d8 100644 (file)
@@ -18,11 +18,11 @@ package com.vaadin.v7.client.ui.progressindicator;
 
 import com.google.gwt.user.client.Timer;
 import com.vaadin.client.communication.StateChangeEvent;
-import com.vaadin.client.ui.VProgressBar;
-import com.vaadin.client.ui.VProgressIndicator;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState;
+import com.vaadin.v7.client.ui.VProgressBar;
+import com.vaadin.v7.client.ui.VProgressIndicator;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState;
 import com.vaadin.v7.ui.ProgressIndicator;
 
 /**
index 405fdd1393508e06fa06ee410b75122ca67546a7..8cb408fd7a62f35c5f7e0ef16841d47790bab0d8 100644 (file)
@@ -40,16 +40,16 @@ import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.PostLayoutListener;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.client.ui.AbstractFieldConnector;
 import com.vaadin.v7.client.ui.VScrollTable;
 import com.vaadin.v7.client.ui.VScrollTable.ContextMenuDetails;
 import com.vaadin.v7.client.ui.VScrollTable.FooterCell;
 import com.vaadin.v7.client.ui.VScrollTable.HeaderCell;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
-import com.vaadin.shared.ui.table.TableServerRpc;
-import com.vaadin.shared.ui.table.TableState;
+import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableServerRpc;
+import com.vaadin.v7.shared.ui.table.TableState;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 @Connect(com.vaadin.v7.ui.Table.class)
 public class TableConnector extends AbstractFieldConnector
index c9b58da9fcc9bea517eb2a7c76986277c98e527f..fd1927e895794ffa950b5ce2264e468b5377585d 100644 (file)
@@ -35,11 +35,11 @@ import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.MultiSelectMode;
-import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.shared.ui.tree.TreeServerRpc;
-import com.vaadin.shared.ui.tree.TreeState;
 import com.vaadin.v7.client.ui.VTree;
 import com.vaadin.v7.client.ui.VTree.TreeNode;
+import com.vaadin.v7.shared.ui.tree.TreeConstants;
+import com.vaadin.v7.shared.ui.tree.TreeServerRpc;
+import com.vaadin.v7.shared.ui.tree.TreeState;
 import com.vaadin.v7.ui.Tree;
 
 @Connect(Tree.class)
index 5fbdafe1b7b2eebc8c02796d2c4be5be0127faf1..094bbc0e9b6894422921e70e82cfca928d097f22 100644 (file)
@@ -22,13 +22,13 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.FocusableScrollPanel;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.treetable.TreeTableConstants;
-import com.vaadin.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.client.ui.VTreeTable;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.v7.client.ui.VTreeTable.PendingNavigationEvent;
 import com.vaadin.v7.client.ui.VTreeTable.VTreeTableScrollBody.VTreeTableRow;
 import com.vaadin.v7.client.ui.table.TableConnector;
+import com.vaadin.v7.shared.ui.treetable.TreeTableConstants;
+import com.vaadin.v7.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.TreeTable;
 
 @Connect(TreeTable.class)
index 62084366d89256641ef4884b52323cce3516fefa..8a8d5559c447449ec61aee2b5ec5c56425ebe3fc 100644 (file)
@@ -20,9 +20,9 @@ import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.DirectionalManagedLayout;
 import com.vaadin.client.UIDL;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
 import com.vaadin.v7.client.ui.VTwinColSelect;
 import com.vaadin.v7.client.ui.optiongroup.OptionGroupBaseConnector;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState;
 import com.vaadin.v7.ui.TwinColSelect;
 
 @Connect(TwinColSelect.class)
index e30d666ea0d6fb6c716b7e9aa73f35c70c10ce87..f522cef77a14b3c53af743e7029aa5c6f8e8b8c9 100644 (file)
@@ -44,7 +44,6 @@ import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.shared.ui.select.AbstractSelectState;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
@@ -60,6 +59,7 @@ import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
index f4e3415cf58d401cc1c5c69fe3fc3dad1a05f8c2..c85e0ff631d2748c8cd1bcc9aaf3a1cdca7ac5af 100644 (file)
@@ -30,11 +30,11 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupConstants;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
 
 /**
  * Configures select to be used as an option group.
index 444724fcf83d6b6dea26fb7db2ad2e9016b39d10..62074a69dbe2a9de99df3cb9b3cfd0705705b356 100644 (file)
@@ -18,10 +18,10 @@ package com.vaadin.v7.ui;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.shared.ui.progressindicator.ProgressBarState;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState;
 import com.vaadin.v7.ui.AbstractField;
 
 /**
index 8a969f96c3b6e084bf2d61c89347c69abe4b782b..1f3feb99ed86a23ef82509a2ca629d0c8cf4712f 100644 (file)
 package com.vaadin.v7.ui;
 
 import com.vaadin.shared.communication.PushMode;
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState;
 import com.vaadin.ui.UI;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState;
 
 /**
  * A {@link ProgressBar} which polls the server for updates.
index d47f5479f438b412fee06d485eb909af229fc563..33b74df857a300fcbe0ea5a8795950ee793defde 100644 (file)
@@ -54,11 +54,6 @@ import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.MultiSelectMode;
-import com.vaadin.shared.ui.table.CollapseMenuContent;
-import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.shared.ui.table.TableConstants.Section;
-import com.vaadin.shared.ui.table.TableServerRpc;
-import com.vaadin.shared.ui.table.TableState;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HasChildMeasurementHint;
@@ -80,6 +75,11 @@ import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
+import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
+import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableServerRpc;
+import com.vaadin.v7.shared.ui.table.TableState;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 /**
  * <p>
index 5744879ea6d32892a1a77184aa40858cfac70076..87917ffa536294d8385d8e3a602ac735f620eccf 100644 (file)
@@ -51,9 +51,6 @@ import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.shared.ui.tree.TreeServerRpc;
-import com.vaadin.shared.ui.tree.TreeState;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
@@ -67,6 +64,9 @@ import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
+import com.vaadin.v7.shared.ui.tree.TreeConstants;
+import com.vaadin.v7.shared.ui.tree.TreeServerRpc;
+import com.vaadin.v7.shared.ui.tree.TreeState;
 
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from
index 446c9c271cf7efcd8fd610c609a364e7d7d72e62..f9a35f2b462e0b574ad88c5bbb14296d71bffa39 100644 (file)
@@ -33,8 +33,6 @@ import org.jsoup.nodes.Element;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
-import com.vaadin.shared.ui.treetable.TreeTableConstants;
-import com.vaadin.shared.ui.treetable.TreeTableState;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
@@ -45,6 +43,8 @@ import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper;
+import com.vaadin.v7.shared.ui.treetable.TreeTableConstants;
+import com.vaadin.v7.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.Tree.CollapseEvent;
 import com.vaadin.v7.ui.Tree.CollapseListener;
 import com.vaadin.v7.ui.Tree.ExpandEvent;
index 68853ddaa15524046915bb8995cb0e9abfb31f9b..4766d938ea87f9f53054211d4441b3bb76a12250 100644 (file)
@@ -20,9 +20,9 @@ import java.util.Collection;
 
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
-import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectConstants;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState;
 
 /**
  * Multiselect component with two lists: left side for available items and right
index cc1c9f8d2707f90c82baceb38f3a59d1c6211871..14f03739d12a0c797988592068a524f9cca4b395 100644 (file)
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.abstractselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.ui.AbstractSelect;
 
 /**
index 8a34077e73acc552dc321eba7ba522e7cbd4a8cf..d9e31e6bc1a041571a0bc9257711170e14e264a1 100644 (file)
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.listselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.ui.ListSelect;
 
 /**
index f15c3aeb1eacb27a0638c3cc7abdfb824f13f5de..85aff227112ad28c20fdba29c7f76fa81d2fedbf 100644 (file)
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.optiongroup;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.optiongroup.OptionGroupState;
+import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.v7.ui.OptionGroup;
 
 /**
index 162d57c0da935c1024e6819e3067afb52fe78e2f..5f9f19f19da2c269ed4771dbe3f7fb4a8387e6eb 100644 (file)
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.ContextClickEvent.ContextClickListener;
-import com.vaadin.shared.ui.table.TableConstants.Section;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.ui.Table;
 
 public class TableContextClickTest extends Table {
index 2c993fe03f1f495f326958cb223f0bbe0755bfea..f61a027c0aabf7a8d5daadd8c273ccf2386fbd8c 100644 (file)
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.table;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.table.TableState;
+import com.vaadin.v7.shared.ui.table.TableState;
 import com.vaadin.v7.ui.Table;
 
 /**
index 04673af2bd1732a1bbe0df340eb781fcbc41bfc9..4f4bdead4eaa1dd5c9af869448b22f2c0d83f45f 100644 (file)
@@ -12,10 +12,10 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.tree.TreeState;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.shared.ui.tree.TreeState;
 import com.vaadin.v7.ui.Tree;
 
 public class TreeTest {
index a6948256df84622232d450693349b0482d5c7737..08e77db859dc8796fe285cf48b21e58b1bb56c5c 100644 (file)
@@ -20,8 +20,8 @@ import java.util.EnumSet;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.shared.ui.treetable.TreeTableState;
 import com.vaadin.v7.ui.TreeTable;
 
 /**
index 7479d3f8e60600ce2c59c1557038fadf164c0483..d2498d9160a1859cbe9bf0b48eae7e6e05956aab 100644 (file)
@@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.twincolselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
+import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState;
 import com.vaadin.v7.ui.TwinColSelect;
 
 /**
index a5ff1424908b6a6b6c92cebdc2bdecc8e94d9904..5accba796d6cf8f8ab25131a6309ad96c4d2c110 100644 (file)
@@ -20,8 +20,8 @@ import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 
 public class NativeSelectTest {
 
index bbab9113094760e1165c1cec96ad5dc968723127..59113081118d81dcb051769e9809b4390f906550 100644 (file)
@@ -15,7 +15,7 @@
  */
 package com.vaadin.v7.shared.ui.combobox;
 
-import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
 
 /**
  * Shared state for the ComboBox component.
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java
new file mode 100644 (file)
index 0000000..6c0a74b
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ * 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.v7.shared.ui.optiongroup;
+
+import java.io.Serializable;
+
+public class OptionGroupConstants implements Serializable {
+    public static final String ATTRIBUTE_OPTION_DISABLED = "disabled";
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java
new file mode 100644 (file)
index 0000000..167b1b3
--- /dev/null
@@ -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.v7.shared.ui.optiongroup;
+
+import com.vaadin.shared.annotations.DelegateToWidget;
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
+
+/**
+ * Shared state for the OptionGroup component.
+ *
+ * @since 7.0
+ */
+public class OptionGroupState extends AbstractSelectState {
+    {
+        primaryStyleName = "v-select-optiongroup";
+    }
+
+    @DelegateToWidget
+    public boolean htmlContentAllowed = false;
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java
new file mode 100644 (file)
index 0000000..c5b07dd
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * 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.v7.shared.ui.progressindicator;
+
+import com.vaadin.shared.AbstractFieldState;
+import com.vaadin.shared.annotations.NoLayout;
+import com.vaadin.shared.communication.SharedState;
+
+/**
+ * {@link SharedState} for {@link com.vaadin.ui.ProgressBar}
+ *
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+public class ProgressBarState extends AbstractFieldState {
+    public static final String PRIMARY_STYLE_NAME = "v-progressbar";
+
+    {
+        primaryStyleName = PRIMARY_STYLE_NAME;
+    }
+    public boolean indeterminate = false;
+    @NoLayout
+    public float state = 0.0f;
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
new file mode 100644 (file)
index 0000000..26ca114
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * 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.v7.shared.ui.progressindicator;
+
+import com.vaadin.shared.annotations.NoLoadingIndicator;
+import com.vaadin.shared.communication.ServerRpc;
+
+public interface ProgressIndicatorServerRpc extends ServerRpc {
+    @NoLoadingIndicator
+    public void poll();
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorState.java
new file mode 100644 (file)
index 0000000..9cc19d8
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * 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.v7.shared.ui.progressindicator;
+
+import com.vaadin.shared.annotations.NoLayout;
+
+@Deprecated
+public class ProgressIndicatorState extends ProgressBarState {
+    public static final String PRIMARY_STYLE_NAME = "v-progressindicator";
+
+    {
+        primaryStyleName = PRIMARY_STYLE_NAME;
+    }
+
+    @NoLayout
+    public int pollingInterval = 1000;
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java
new file mode 100644 (file)
index 0000000..624a201
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * 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.v7.shared.ui.select;
+
+import com.vaadin.shared.AbstractFieldState;
+
+/**
+ * Shared state for the AbstractSelect component.
+ *
+ * @since 7.6
+ */
+public class AbstractSelectState extends AbstractFieldState {
+
+    {
+        primaryStyleName = "v-select";
+    }
+
+    /**
+     * Is the select in multiselect mode?
+     *
+     * Note that Table and Tree still use the old communication mechanism for
+     * multi-mode support.
+     */
+    public boolean multiSelect;
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/CollapseMenuContent.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/CollapseMenuContent.java
new file mode 100644 (file)
index 0000000..adc2e7a
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * 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.v7.shared.ui.table;
+
+/**
+ * Defines whether only collapsible columns should be shown to the user in the
+ * column collapse menu.
+ *
+ * @see com.vaadin.ui.Table#setCollapseMenuContent(CollapseMenuContent)
+ *
+ * @since 7.6
+ * @author Vaadin Ltd
+ */
+public enum CollapseMenuContent {
+    /**
+     * All columns are shown in the collapse menu. Columns that are not
+     * collapsible are shown as disabled in the menu. This is the default
+     * setting.
+     */
+    ALL_COLUMNS,
+
+    /**
+     * Only collapsible columns are shown in the collapse menu.
+     */
+    COLLAPSIBLE_COLUMNS;
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableConstants.java
new file mode 100644 (file)
index 0000000..3fb5a4d
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * 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.v7.shared.ui.table;
+
+import java.io.Serializable;
+
+public class TableConstants implements Serializable {
+    /**
+     * Enum describing different sections of Table.
+     *
+     * @since 7.6
+     */
+    public enum Section {
+        HEADER, BODY, FOOTER
+    }
+
+    public static final String ITEM_CLICK_EVENT_ID = "itemClick";
+    public static final String HEADER_CLICK_EVENT_ID = "handleHeaderClick";
+    public static final String FOOTER_CLICK_EVENT_ID = "handleFooterClick";
+    public static final String COLUMN_RESIZE_EVENT_ID = "columnResize";
+    public static final String COLUMN_REORDER_EVENT_ID = "columnReorder";
+    public static final String COLUMN_COLLAPSE_EVENT_ID = "columnCollapse";
+
+    @Deprecated
+    public static final String ATTRIBUTE_PAGEBUFFER_FIRST = "pb-ft";
+    @Deprecated
+    public static final String ATTRIBUTE_PAGEBUFFER_LAST = "pb-l";
+    /**
+     * Tell the client that old keys are no longer valid because the server has
+     * cleared its key map.
+     */
+    @Deprecated
+    public static final String ATTRIBUTE_KEY_MAPPER_RESET = "clearKeyMap";
+
+    /**
+     * Default value for {@link TableState#collapseMenuContent}.
+     *
+     * @since 7.6
+     */
+    public static final CollapseMenuContent DEFAULT_COLLAPSE_MENU_CONTENT = CollapseMenuContent.ALL_COLUMNS;
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableServerRpc.java
new file mode 100644 (file)
index 0000000..18ba4e6
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * 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.v7.shared.ui.table;
+
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
+
+/**
+ * Client-to-server RPC interface for the Table component
+ *
+ * @since 7.6
+ * @author Vaadin Ltd
+ */
+public interface TableServerRpc extends ServerRpc {
+
+    /**
+     * Informs the server that a context click happened inside of Table
+     */
+    public void contextClick(String rowKey, String colKey, Section section,
+            MouseEventDetails details);
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableState.java
new file mode 100644 (file)
index 0000000..979a5e2
--- /dev/null
@@ -0,0 +1,31 @@
+/*
+ * 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.v7.shared.ui.table;
+
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
+
+/**
+ * Shared state for the Table component.
+ *
+ * @since 7.0
+ */
+public class TableState extends AbstractSelectState {
+    {
+        primaryStyleName = "v-table";
+    }
+
+    public CollapseMenuContent collapseMenuContent = TableConstants.DEFAULT_COLLAPSE_MENU_CONTENT;
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeConstants.java
new file mode 100644 (file)
index 0000000..7fe3779
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * 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.v7.shared.ui.tree;
+
+import java.io.Serializable;
+
+@Deprecated
+public class TreeConstants implements Serializable {
+
+    @Deprecated
+    public static final String ATTRIBUTE_NODE_STYLE = "style";
+    @Deprecated
+    public static final String ATTRIBUTE_NODE_CAPTION = "caption";
+    @Deprecated
+    public static final String ATTRIBUTE_NODE_ICON = "icon";
+    @Deprecated
+    public static final String ATTRIBUTE_NODE_ICON_ALT = "iconalt";
+
+    @Deprecated
+    public static final String ATTRIBUTE_ACTION_CAPTION = "caption";
+    @Deprecated
+    public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON;
+    @Deprecated
+    public static final String ATTRIBUTE_HTML_ALLOWED = "htmlAllowed";
+
+    public static final String ITEM_CLICK_EVENT_ID = "itemClick";
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeServerRpc.java
new file mode 100644 (file)
index 0000000..23587a4
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * 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.v7.shared.ui.tree;
+
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
+
+/**
+ * Client-to-server RPC interface for the Tree component
+ *
+ * @since 7.6
+ * @author Vaadin Ltd
+ */
+public interface TreeServerRpc extends ServerRpc {
+
+    /**
+     * Informs the server that a context click happened inside of Tree
+     */
+    public void contextClick(String rowKey, MouseEventDetails details);
+
+}
\ No newline at end of file
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeState.java
new file mode 100644 (file)
index 0000000..bc99ae6
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * 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.v7.shared.ui.tree;
+
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
+
+/**
+ * Shared state for the Table component.
+ *
+ * @since 7.0
+ */
+public class TreeState extends AbstractSelectState {
+    {
+        primaryStyleName = "v-tree";
+    }
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableConstants.java
new file mode 100644 (file)
index 0000000..3b2b68d
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * 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.v7.shared.ui.treetable;
+
+import java.io.Serializable;
+
+@Deprecated
+public class TreeTableConstants implements Serializable {
+    @Deprecated
+    public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci";
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableState.java
new file mode 100644 (file)
index 0000000..6bb4ee5
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * 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.v7.shared.ui.treetable;
+
+import com.vaadin.v7.shared.ui.table.TableState;
+
+public class TreeTableState extends TableState {
+    {
+        primaryStyleName = "v-table";
+    }
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectConstants.java
new file mode 100644 (file)
index 0000000..439334f
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.v7.shared.ui.twincolselect;
+
+import java.io.Serializable;
+
+@Deprecated
+public class TwinColSelectConstants implements Serializable {
+    @Deprecated
+    public static final String ATTRIBUTE_LEFT_CAPTION = "lc";
+    @Deprecated
+    public static final String ATTRIBUTE_RIGHT_CAPTION = "rc";
+
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectState.java
new file mode 100644 (file)
index 0000000..83a3c96
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * 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.v7.shared.ui.twincolselect;
+
+import com.vaadin.v7.shared.ui.select.AbstractSelectState;
+
+/**
+ * Shared state for the TwinColSelect component.
+ *
+ * @since 7.0
+ */
+public class TwinColSelectState extends AbstractSelectState {
+    {
+        primaryStyleName = "v-select-twincol";
+    }
+}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
deleted file mode 100644 (file)
index ef22967..0000000
+++ /dev/null
@@ -1,23 +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.optiongroup;
-
-import java.io.Serializable;
-
-public class OptionGroupConstants implements Serializable {
-    public static final String ATTRIBUTE_OPTION_DISABLED = "disabled";
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
deleted file mode 100644 (file)
index c754ded..0000000
+++ /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.optiongroup;
-
-import com.vaadin.shared.annotations.DelegateToWidget;
-import com.vaadin.shared.ui.select.AbstractSelectState;
-
-/**
- * Shared state for the OptionGroup component.
- *
- * @since 7.0
- */
-public class OptionGroupState extends AbstractSelectState {
-    {
-        primaryStyleName = "v-select-optiongroup";
-    }
-
-    @DelegateToWidget
-    public boolean htmlContentAllowed = false;
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
deleted file mode 100644 (file)
index 50680ef..0000000
+++ /dev/null
@@ -1,30 +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.progressindicator;
-
-import com.vaadin.shared.annotations.NoLayout;
-
-@Deprecated
-public class ProgressIndicatorState extends ProgressBarState {
-    public static final String PRIMARY_STYLE_NAME = "v-progressindicator";
-
-    {
-        primaryStyleName = PRIMARY_STYLE_NAME;
-    }
-
-    @NoLayout
-    public int pollingInterval = 1000;
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java
deleted file mode 100644 (file)
index 101fadc..0000000
+++ /dev/null
@@ -1,38 +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.select;
-
-import com.vaadin.shared.AbstractFieldState;
-
-/**
- * Shared state for the AbstractSelect component.
- *
- * @since 7.6
- */
-public class AbstractSelectState extends AbstractFieldState {
-
-    {
-        primaryStyleName = "v-select";
-    }
-
-    /**
-     * Is the select in multiselect mode?
-     *
-     * Note that Table and Tree still use the old communication mechanism for
-     * multi-mode support.
-     */
-    public boolean multiSelect;
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java b/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java
deleted file mode 100644 (file)
index e0a659a..0000000
+++ /dev/null
@@ -1,40 +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.table;
-
-/**
- * Defines whether only collapsible columns should be shown to the user in the
- * column collapse menu.
- *
- * @see com.vaadin.ui.Table#setCollapseMenuContent(CollapseMenuContent)
- *
- * @since 7.6
- * @author Vaadin Ltd
- */
-public enum CollapseMenuContent {
-    /**
-     * All columns are shown in the collapse menu. Columns that are not
-     * collapsible are shown as disabled in the menu. This is the default
-     * setting.
-     */
-    ALL_COLUMNS,
-
-    /**
-     * Only collapsible columns are shown in the collapse menu.
-     */
-    COLLAPSIBLE_COLUMNS;
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java
deleted file mode 100644 (file)
index f440b08..0000000
+++ /dev/null
@@ -1,55 +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.table;
-
-import java.io.Serializable;
-
-public class TableConstants implements Serializable {
-    /**
-     * Enum describing different sections of Table.
-     *
-     * @since 7.6
-     */
-    public enum Section {
-        HEADER, BODY, FOOTER
-    }
-
-    public static final String ITEM_CLICK_EVENT_ID = "itemClick";
-    public static final String HEADER_CLICK_EVENT_ID = "handleHeaderClick";
-    public static final String FOOTER_CLICK_EVENT_ID = "handleFooterClick";
-    public static final String COLUMN_RESIZE_EVENT_ID = "columnResize";
-    public static final String COLUMN_REORDER_EVENT_ID = "columnReorder";
-    public static final String COLUMN_COLLAPSE_EVENT_ID = "columnCollapse";
-
-    @Deprecated
-    public static final String ATTRIBUTE_PAGEBUFFER_FIRST = "pb-ft";
-    @Deprecated
-    public static final String ATTRIBUTE_PAGEBUFFER_LAST = "pb-l";
-    /**
-     * Tell the client that old keys are no longer valid because the server has
-     * cleared its key map.
-     */
-    @Deprecated
-    public static final String ATTRIBUTE_KEY_MAPPER_RESET = "clearKeyMap";
-
-    /**
-     * Default value for {@link TableState#collapseMenuContent}.
-     *
-     * @since 7.6
-     */
-    public static final CollapseMenuContent DEFAULT_COLLAPSE_MENU_CONTENT = CollapseMenuContent.ALL_COLUMNS;
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java
deleted file mode 100644 (file)
index 0811669..0000000
+++ /dev/null
@@ -1,36 +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.table;
-
-import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.shared.communication.ServerRpc;
-import com.vaadin.shared.ui.table.TableConstants.Section;
-
-/**
- * Client-to-server RPC interface for the Table component
- *
- * @since 7.6
- * @author Vaadin Ltd
- */
-public interface TableServerRpc extends ServerRpc {
-
-    /**
-     * Informs the server that a context click happened inside of Table
-     */
-    public void contextClick(String rowKey, String colKey, Section section,
-            MouseEventDetails details);
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java
deleted file mode 100644 (file)
index 82a58b7..0000000
+++ /dev/null
@@ -1,31 +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.table;
-
-import com.vaadin.shared.ui.select.AbstractSelectState;
-
-/**
- * Shared state for the Table component.
- *
- * @since 7.0
- */
-public class TableState extends AbstractSelectState {
-    {
-        primaryStyleName = "v-table";
-    }
-
-    public CollapseMenuContent collapseMenuContent = TableConstants.DEFAULT_COLLAPSE_MENU_CONTENT;
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java
deleted file mode 100644 (file)
index 1c3902c..0000000
+++ /dev/null
@@ -1,41 +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.tree;
-
-import java.io.Serializable;
-
-@Deprecated
-public class TreeConstants implements Serializable {
-
-    @Deprecated
-    public static final String ATTRIBUTE_NODE_STYLE = "style";
-    @Deprecated
-    public static final String ATTRIBUTE_NODE_CAPTION = "caption";
-    @Deprecated
-    public static final String ATTRIBUTE_NODE_ICON = "icon";
-    @Deprecated
-    public static final String ATTRIBUTE_NODE_ICON_ALT = "iconalt";
-
-    @Deprecated
-    public static final String ATTRIBUTE_ACTION_CAPTION = "caption";
-    @Deprecated
-    public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON;
-    @Deprecated
-    public static final String ATTRIBUTE_HTML_ALLOWED = "htmlAllowed";
-
-    public static final String ITEM_CLICK_EVENT_ID = "itemClick";
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java
deleted file mode 100644 (file)
index 4a20366..0000000
+++ /dev/null
@@ -1,34 +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.tree;
-
-import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.shared.communication.ServerRpc;
-
-/**
- * Client-to-server RPC interface for the Tree component
- *
- * @since 7.6
- * @author Vaadin Ltd
- */
-public interface TreeServerRpc extends ServerRpc {
-
-    /**
-     * Informs the server that a context click happened inside of Tree
-     */
-    public void contextClick(String rowKey, MouseEventDetails details);
-
-}
\ No newline at end of file
diff --git a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java
deleted file mode 100644 (file)
index f7f3ce2..0000000
+++ /dev/null
@@ -1,29 +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.tree;
-
-import com.vaadin.shared.ui.select.AbstractSelectState;
-
-/**
- * Shared state for the Table component.
- *
- * @since 7.0
- */
-public class TreeState extends AbstractSelectState {
-    {
-        primaryStyleName = "v-tree";
-    }
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java
deleted file mode 100644 (file)
index b854924..0000000
+++ /dev/null
@@ -1,25 +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.treetable;
-
-import java.io.Serializable;
-
-@Deprecated
-public class TreeTableConstants implements Serializable {
-    @Deprecated
-    public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci";
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java
deleted file mode 100644 (file)
index 3cf834c..0000000
+++ /dev/null
@@ -1,24 +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.treetable;
-
-import com.vaadin.shared.ui.table.TableState;
-
-public class TreeTableState extends TableState {
-    {
-        primaryStyleName = "v-table";
-    }
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
deleted file mode 100644 (file)
index 4d0e677..0000000
+++ /dev/null
@@ -1,27 +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.twincolselect;
-
-import java.io.Serializable;
-
-@Deprecated
-public class TwinColSelectConstants implements Serializable {
-    @Deprecated
-    public static final String ATTRIBUTE_LEFT_CAPTION = "lc";
-    @Deprecated
-    public static final String ATTRIBUTE_RIGHT_CAPTION = "rc";
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
deleted file mode 100644 (file)
index 7a6c8e8..0000000
+++ /dev/null
@@ -1,29 +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.twincolselect;
-
-import com.vaadin.shared.ui.select.AbstractSelectState;
-
-/**
- * Shared state for the TwinColSelect component.
- *
- * @since 7.0
- */
-public class TwinColSelectState extends AbstractSelectState {
-    {
-        primaryStyleName = "v-select-twincol";
-    }
-}
index ac24814e9ca290c501312ece68f48c50b82382db..eb021b966178ee8afb7bf0a816fbcb2254dcb3dd 100644 (file)
@@ -24,9 +24,9 @@ import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Link;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.v7.ui.ProgressIndicator;
 
 public class NavigateWithOngoingXHR extends AbstractTestUI {
index 4c264d42f61b036b51aa9d288219d8f69988f63e..f23e145ec36df29dc6350c970f4d8991b1827ed4 100644 (file)
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.richtextarea;
 
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc;
 import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.RichTextArea;
 
index 34ec27ea8e8b852005576e442914b65db4daa30a..2377049b47e33bff49c5e13db542f5d9a90eaa93 100644 (file)
@@ -9,12 +9,12 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.MultiSelectMode;
-import com.vaadin.shared.ui.table.CollapseMenuContent;
-import com.vaadin.shared.ui.table.TableConstants;
 import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
+import com.vaadin.v7.shared.ui.table.TableConstants;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.Align;
index 94f4268fc45368a8d9926c1b18ff80995a363f33..3a73b41074c5a3cacbb7d7f8ed73224b4d83aa82 100644 (file)
  */
 package com.vaadin.tests.contextclick;
 
-import com.vaadin.shared.ui.table.TableConstants.Section;
 import com.vaadin.tests.util.PersonContainer;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.TableContextClickEvent;
 
index 07cd5e34ddeb0871f80b34749e60560a9f140d11..1ab7a9567a0b5758846fbf1c9a06ad5c1bf16f65 100644 (file)
  */
 package com.vaadin.tests.contextclick;
 
-import com.vaadin.shared.ui.table.TableConstants.Section;
 import com.vaadin.tests.util.PersonContainer;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.ui.Table.TableContextClickEvent;
 import com.vaadin.v7.ui.TreeTable;
 
index 7e2fd588df91c9f714031ef43159114865f0b17c..7cca83be628fc78bb4ac309003422b6d6cfa9c2b 100644 (file)
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.shared.ui.table.CollapseMenuContent;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
 import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class OnlyCollapsibleInMenu extends SingleBrowserTest {