aboutsummaryrefslogtreecommitdiffstats
path: root/compatibility-shared/src/main/java/com/vaadin
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2017-03-01 14:27:49 +0200
committerHenri Sara <henri.sara@gmail.com>2017-03-07 12:36:54 +0200
commitf5c15b9b2bcc4eeef210a5977449c76f3b952209 (patch)
tree6358ed330e0d2baa68d8cdbc5bc5f3893406f236 /compatibility-shared/src/main/java/com/vaadin
parent0cfb20938f2b15767ebbd367ad8312642b947c8c (diff)
downloadvaadin-framework-f5c15b9b2bcc4eeef210a5977449c76f3b952209.tar.gz
vaadin-framework-f5c15b9b2bcc4eeef210a5977449c76f3b952209.zip
Synchronize code between V7 and compatibility package
Diffstat (limited to 'compatibility-shared/src/main/java/com/vaadin')
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/ColumnResizeMode.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/MultiSelectionModelState.java2
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/SingleSelectionModelState.java1
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java1
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java2
5 files changed, 6 insertions, 4 deletions
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/ColumnResizeMode.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/ColumnResizeMode.java
index 63eacd1fc1..d05166cec9 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/ColumnResizeMode.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/ColumnResizeMode.java
@@ -17,7 +17,7 @@ package com.vaadin.v7.shared.ui.grid;
/**
* Collection of modes used for resizing columns in the Grid.
- *
+ *
* @since 7.7.5
*/
public enum ColumnResizeMode {
@@ -35,4 +35,4 @@ public enum ColumnResizeMode {
*/
SIMPLE
-} \ No newline at end of file
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/MultiSelectionModelState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/MultiSelectionModelState.java
index c04d9aaff5..f57399f6f8 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/MultiSelectionModelState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/MultiSelectionModelState.java
@@ -27,5 +27,5 @@ public class MultiSelectionModelState extends SharedState {
/* Select All -checkbox status */
public boolean allSelected;
-
+ public boolean userSelectionAllowed = true;
}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/SingleSelectionModelState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/SingleSelectionModelState.java
index a9fb816449..82f77e9bfb 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/SingleSelectionModelState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/selection/SingleSelectionModelState.java
@@ -27,4 +27,5 @@ public class SingleSelectionModelState extends SharedState {
/* Allow deselecting rows */
public boolean deselectAllowed = true;
+ public boolean userSelectionAllowed = true;
}
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
index 6c0a74b7ea..01f41174bd 100644
--- 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
@@ -18,6 +18,7 @@ package com.vaadin.v7.shared.ui.optiongroup;
import java.io.Serializable;
public class OptionGroupConstants implements Serializable {
+ // Vaadin 8 option group uses state for HTML content
public static final String ATTRIBUTE_OPTION_DISABLED = "disabled";
}
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
index b3e510b43d..a9a98e3395 100644
--- 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
@@ -34,6 +34,6 @@ public class ProgressBarState extends AbstractFieldState {
}
public boolean indeterminate = false;
@NoLayout
- public float state = 0.0f;
+ public Float state = 0.0f;
}