diff options
| author | Ahmed Ashour <asashour@yahoo.com> | 2017-10-02 10:23:09 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-10-02 11:23:09 +0300 |
| commit | 43f4a17f0d17e584e83ea3faaa40ac1def1dd4b1 (patch) | |
| tree | 8941d036822a00f7c893278d47ebc071f1236308 /compatibility-server | |
| parent | 763a5cbe8c13ff4a169aae9062c643ad1588cea0 (diff) | |
| download | vaadin-framework-43f4a17f0d17e584e83ea3faaa40ac1def1dd4b1.tar.gz vaadin-framework-43f4a17f0d17e584e83ea3faaa40ac1def1dd4b1.zip | |
Simplify conditional logic. (#10122)
And remove unused imports.
Diffstat (limited to 'compatibility-server')
| -rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java | 4 | ||||
| -rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java index 6a3c26a578..54959822a7 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java @@ -18,7 +18,6 @@ package com.vaadin.v7.data.util; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; -import java.util.logging.Logger; import com.vaadin.data.Binder; import com.vaadin.data.ValueProvider; @@ -33,7 +32,8 @@ import com.vaadin.v7.data.Property; * * @since 6.6 * - * @deprecated As of 8.0, replaced by {@link ValueProvider}, {@link Setter}, see {@link Binder} + * @deprecated As of 8.0, replaced by {@link ValueProvider}, {@link Setter}, see + * {@link Binder} */ @Deprecated public abstract class AbstractProperty<T> implements Property<T>, diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java index 6edf06edd3..b6f9e37c22 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java @@ -18,7 +18,6 @@ package com.vaadin.v7.data.util.sqlcontainer; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import java.util.logging.Logger; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.converter.Converter.ConversionException; @@ -30,6 +29,7 @@ import com.vaadin.v7.data.util.converter.Converter.ConversionException; * * Note that depending on the QueryDelegate in use this does not necessarily map * into an actual column in a database table. + * * @deprecated As of 8.0, no replacement available. */ @Deprecated @@ -294,11 +294,8 @@ public final class ColumnProperty implements Property { public boolean isPersistent() { if (isVersionColumn()) { return false; - } else if (isReadOnlyChangeAllowed() && !isReadOnly()) { - return true; - } else { - return false; } + return isReadOnlyChangeAllowed() && !isReadOnly(); } /** |