summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/data
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/data')
-rw-r--r--server/src/com/vaadin/data/Container.java8
-rw-r--r--server/src/com/vaadin/data/Item.java4
-rw-r--r--server/src/com/vaadin/data/Property.java8
-rw-r--r--server/src/com/vaadin/data/util/AbstractBeanContainer.java4
-rw-r--r--server/src/com/vaadin/data/util/AbstractContainer.java8
-rw-r--r--server/src/com/vaadin/data/util/AbstractInMemoryContainer.java4
-rw-r--r--server/src/com/vaadin/data/util/AbstractProperty.java11
-rw-r--r--server/src/com/vaadin/data/util/BeanItemContainer.java3
-rw-r--r--server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java8
-rw-r--r--server/src/com/vaadin/data/util/ContainerOrderedWrapper.java8
-rw-r--r--server/src/com/vaadin/data/util/IndexedContainer.java20
-rw-r--r--server/src/com/vaadin/data/util/PropertyFormatter.java2
-rw-r--r--server/src/com/vaadin/data/util/PropertysetItem.java4
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java5
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java8
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java2
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java12
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java4
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java4
-rw-r--r--server/src/com/vaadin/data/validator/CompositeValidator.java4
-rw-r--r--server/src/com/vaadin/data/validator/DoubleValidator.java4
-rw-r--r--server/src/com/vaadin/data/validator/IntegerValidator.java4
22 files changed, 71 insertions, 68 deletions
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java
index 1a453c7cd6..b91665250d 100644
--- a/server/src/com/vaadin/data/Container.java
+++ b/server/src/com/vaadin/data/Container.java
@@ -1060,7 +1060,7 @@ public interface Container extends Serializable {
Container.ItemSetChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(ItemSetChangeListener)}
**/
@Deprecated
@@ -1076,7 +1076,7 @@ public interface Container extends Serializable {
Container.ItemSetChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeItemSetChangeListener(ItemSetChangeListener)}
**/
@Deprecated
@@ -1162,7 +1162,7 @@ public interface Container extends Serializable {
Container.PropertySetChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(PropertySetChangeListener)}
**/
@Deprecated
@@ -1178,7 +1178,7 @@ public interface Container extends Serializable {
Container.PropertySetChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(PropertySetChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/Item.java b/server/src/com/vaadin/data/Item.java
index bff046bd38..95b0aba59d 100644
--- a/server/src/com/vaadin/data/Item.java
+++ b/server/src/com/vaadin/data/Item.java
@@ -181,7 +181,7 @@ public interface Item extends Serializable {
Item.PropertySetChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(PropertySetChangeListener)}
**/
@Deprecated
@@ -197,7 +197,7 @@ public interface Item extends Serializable {
Item.PropertySetChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(PropertySetChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/Property.java b/server/src/com/vaadin/data/Property.java
index 146355cb48..0b2900a6c4 100644
--- a/server/src/com/vaadin/data/Property.java
+++ b/server/src/com/vaadin/data/Property.java
@@ -307,7 +307,7 @@ public interface Property<T> extends Serializable {
public void addValueChangeListener(Property.ValueChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addValueChangeListener(ValueChangeListener)}
**/
@Deprecated
@@ -323,7 +323,7 @@ public interface Property<T> extends Serializable {
Property.ValueChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeValueChangeListener(ValueChangeListener)}
**/
@Deprecated
@@ -398,7 +398,7 @@ public interface Property<T> extends Serializable {
Property.ReadOnlyStatusChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addReadOnlyStatusChangeListener(ReadOnlyStatusChangeListener)}
**/
@Deprecated
@@ -414,7 +414,7 @@ public interface Property<T> extends Serializable {
Property.ReadOnlyStatusChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeReadOnlyStatusChangeListener(ReadOnlyStatusChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
index 3767f816e9..dce071ccd5 100644
--- a/server/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -742,7 +742,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
}
/**
- * @deprecated Since 7.0, replaced by {@link #addPropertySetChangeListener}
+ * @deprecated As of 7.0, replaced by {@link #addPropertySetChangeListener}
**/
@Deprecated
@Override
@@ -757,7 +757,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractContainer.java b/server/src/com/vaadin/data/util/AbstractContainer.java
index ff8fc90651..e4f2b57f83 100644
--- a/server/src/com/vaadin/data/util/AbstractContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractContainer.java
@@ -109,7 +109,7 @@ public abstract class AbstractContainer implements Container {
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Deprecated
@@ -133,7 +133,7 @@ public abstract class AbstractContainer implements Container {
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Deprecated
@@ -159,7 +159,7 @@ public abstract class AbstractContainer implements Container {
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Deprecated
@@ -182,7 +182,7 @@ public abstract class AbstractContainer implements Container {
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index be8abe0c75..ffb3ddffe7 100644
--- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -360,7 +360,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
// ItemSetChangeNotifier
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Deprecated
@@ -382,7 +382,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractProperty.java b/server/src/com/vaadin/data/util/AbstractProperty.java
index aefe00ad32..674690c75e 100644
--- a/server/src/com/vaadin/data/util/AbstractProperty.java
+++ b/server/src/com/vaadin/data/util/AbstractProperty.java
@@ -74,7 +74,8 @@ public abstract class AbstractProperty<T> implements Property<T>,
* format.
*
* @return String representation of the value stored in the Property
- * @deprecated use {@link #getValue()} instead and possibly toString on that
+ * @deprecated As of 7.0, use {@link #getValue()} instead and possibly
+ * toString on that
*/
@Deprecated
@Override
@@ -139,7 +140,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
**/
@Override
@@ -163,7 +164,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
**/
@Override
@@ -226,7 +227,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
**/
@Override
@@ -244,7 +245,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
**/
@Override
diff --git a/server/src/com/vaadin/data/util/BeanItemContainer.java b/server/src/com/vaadin/data/util/BeanItemContainer.java
index 3f3bf1de9d..0177bf149d 100644
--- a/server/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/server/src/com/vaadin/data/util/BeanItemContainer.java
@@ -110,7 +110,8 @@ public class BeanItemContainer<BEANTYPE> extends
* @throws IllegalArgumentException
* If the collection is null or empty.
*
- * @deprecated use {@link #BeanItemContainer(Class, Collection)} instead
+ * @deprecated As of 6.5, use {@link #BeanItemContainer(Class, Collection)}
+ * instead
*/
@SuppressWarnings("unchecked")
@Deprecated
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index ade8c22745..a0d10f3e02 100644
--- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -719,7 +719,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Override
@@ -743,7 +743,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Override
@@ -768,7 +768,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Override
@@ -793,7 +793,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Override
diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index a44da84ae8..e248638fd6 100644
--- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -519,7 +519,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Override
@@ -543,7 +543,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Override
@@ -568,7 +568,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Override
@@ -593,7 +593,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Override
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index 6326d494b2..81ee4ae2a0 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -490,7 +490,7 @@ public class IndexedContainer extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Deprecated
@@ -506,7 +506,7 @@ public class IndexedContainer extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
**/
@Deprecated
@@ -530,7 +530,7 @@ public class IndexedContainer extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
**/
@Override
@@ -553,7 +553,7 @@ public class IndexedContainer extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
**/
@Override
@@ -956,8 +956,8 @@ public class IndexedContainer extends
*
* @return <code>String</code> representation of the value stored in the
* Property
- * @deprecated use {@link #getValue()} instead and possibly toString on
- * that
+ * @deprecated As of 7.0, use {@link #getValue()} instead and possibly
+ * toString on that
*/
@Deprecated
@Override
@@ -1026,7 +1026,7 @@ public class IndexedContainer extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
**/
@Override
@@ -1048,7 +1048,7 @@ public class IndexedContainer extends
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
**/
@Override
@@ -1101,8 +1101,8 @@ public class IndexedContainer extends
* @throws CloneNotSupportedException
* if an object cannot be cloned. .
*
- * @deprecated cloning support might be removed from IndexedContainer in the
- * future
+ * @deprecated As of 6.6. Cloning support might be removed from
+ * IndexedContainer in the future
*/
@Deprecated
@Override
diff --git a/server/src/com/vaadin/data/util/PropertyFormatter.java b/server/src/com/vaadin/data/util/PropertyFormatter.java
index 58a53cd7da..9c8d38825c 100644
--- a/server/src/com/vaadin/data/util/PropertyFormatter.java
+++ b/server/src/com/vaadin/data/util/PropertyFormatter.java
@@ -46,7 +46,7 @@ import com.vaadin.data.util.converter.Converter;
* type of the underlying property (a PropertyFormatter is always a
* Property&lt;String&gt;)
*
- * @deprecated Since 7.0 replaced by {@link Converter}
+ * @deprecated As of 7.0, replaced by {@link Converter}
* @author Vaadin Ltd.
* @since 5.3.0
*/
diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java
index 7ca0fc6973..86b9412ac0 100644
--- a/server/src/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/com/vaadin/data/util/PropertysetItem.java
@@ -209,7 +209,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
**/
@Override
@@ -233,7 +233,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
**/
@Override
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
index bd6b1a75bf..d40c518c3a 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
@@ -70,7 +70,7 @@ final public class ColumnProperty implements Property {
* @param value
* @param type
*
- * @deprecated as of 7.0. Use
+ * @deprecated As of 7.0. Use
* {@link #ColumnProperty(String, boolean, boolean, boolean, boolean, Object, Class)
* instead
*/
@@ -257,7 +257,8 @@ final public class ColumnProperty implements Property {
* Returns the value of the Property in human readable textual format.
*
* @see java.lang.Object#toString()
- * @deprecated get the string representation from the value
+ * @deprecated As of 7.0, use {@link #getValue()} instead and possibly
+ * toString on that
*/
@Deprecated
@Override
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 69186fc310..305b7d5861 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -1520,7 +1520,7 @@ public class SQLContainer implements Container, Container.Filterable,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Override
@@ -1546,7 +1546,7 @@ public class SQLContainer implements Container, Container.Filterable,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
**/
@Override
@@ -1601,7 +1601,7 @@ public class SQLContainer implements Container, Container.Filterable,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addRowIdChangeListener(RowIdChangeListener)}
**/
@Deprecated
@@ -1622,7 +1622,7 @@ public class SQLContainer implements Container, Container.Filterable,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeRowIdChangeListener(RowIdChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
index d6457bfe7b..a9d40b7ed2 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
@@ -61,7 +61,7 @@ public class FreeformQuery implements QueryDelegate {
* @param connectionPool
* the JDBCConnectionPool to use to open connections to the SQL
* database.
- * @deprecated @see
+ * @deprecated As of 6.7, @see
* {@link FreeformQuery#FreeformQuery(String, JDBCConnectionPool, String...)}
*/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index 5b14ab53b9..fa9d92e35e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
@@ -34,8 +34,8 @@ public interface FreeformQueryDelegate extends Serializable {
* @param pagelength
* the number of records (rows) to fetch. 0 means all records
* starting from offset.
- * @deprecated Implement {@link FreeformStatementDelegate} instead of
- * {@link FreeformQueryDelegate}
+ * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
+ * instead of {@link FreeformQueryDelegate}
*/
@Deprecated
public String getQueryString(int offset, int limit)
@@ -48,8 +48,8 @@ public interface FreeformQueryDelegate extends Serializable {
*
* @return row count
* @throws SQLException
- * @deprecated Implement {@link FreeformStatementDelegate} instead of
- * {@link FreeformQueryDelegate}
+ * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
+ * instead of {@link FreeformQueryDelegate}
*/
@Deprecated
public String getCountQuery() throws UnsupportedOperationException;
@@ -121,8 +121,8 @@ public interface FreeformQueryDelegate extends Serializable {
* the values of the primary keys
* @throws UnsupportedOperationException
* to use the default logic in FreeformQuery
- * @deprecated Implement {@link FreeformStatementDelegate} instead of
- * {@link FreeformQueryDelegate}
+ * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
+ * instead of {@link FreeformQueryDelegate}
*/
@Deprecated
public String getContainsRowQueryString(Object... keys)
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index 10a710e823..068251490e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
@@ -214,7 +214,7 @@ public interface QueryDelegate extends Serializable {
QueryDelegate.RowIdChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addRowIdChangeListener(RowIdChangeListener)}
**/
@Deprecated
@@ -230,7 +230,7 @@ public interface QueryDelegate extends Serializable {
QueryDelegate.RowIdChangeListener listener);
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeRowIdChangeListener(RowIdChangeListener)}
**/
@Deprecated
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 89dc5e41a7..f91794690d 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
@@ -712,7 +712,7 @@ public class TableQuery implements QueryDelegate,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
**/
@Override
@@ -732,7 +732,7 @@ public class TableQuery implements QueryDelegate,
}
/**
- * @deprecated Since 7.0, replaced by
+ * @deprecated As of 7.0, replaced by
* {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
**/
@Override
diff --git a/server/src/com/vaadin/data/validator/CompositeValidator.java b/server/src/com/vaadin/data/validator/CompositeValidator.java
index 58a7fd2192..33de2fd7f7 100644
--- a/server/src/com/vaadin/data/validator/CompositeValidator.java
+++ b/server/src/com/vaadin/data/validator/CompositeValidator.java
@@ -52,12 +52,12 @@ public class CompositeValidator implements Validator {
}
/**
- * @deprecated from 7.0, use {@link CombinationMode#AND} instead    
+ * @deprecated As of 7.0, use {@link CombinationMode#AND} instead    
*/
@Deprecated
public static final CombinationMode MODE_AND = CombinationMode.AND;
/**
- * @deprecated from 7.0, use {@link CombinationMode#OR} instead    
+ * @deprecated As of 7.0, use {@link CombinationMode#OR} instead    
*/
@Deprecated
public static final CombinationMode MODE_OR = CombinationMode.OR;
diff --git a/server/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/com/vaadin/data/validator/DoubleValidator.java
index b4c92abfe7..df5a3ca292 100644
--- a/server/src/com/vaadin/data/validator/DoubleValidator.java
+++ b/server/src/com/vaadin/data/validator/DoubleValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
*
* @author Vaadin Ltd.
* @since 5.4
- * @deprecated in Vaadin 7.0. Use an Double converter on the field instead.
+ * @deprecated As of 7.0. Use an Double converter on the field instead.
*/
@Deprecated
@SuppressWarnings("serial")
@@ -34,7 +34,7 @@ public class DoubleValidator extends AbstractStringValidator {
*
* @param errorMessage
* the message to display in case the value does not validate.
- * @deprecated in Vaadin 7.0. Use a Double converter on the field instead
+ * @deprecated As of 7.0. Use a Double converter on the field instead
* and/or use a {@link DoubleRangeValidator} for validating that
* the value is inside a given range.
*/
diff --git a/server/src/com/vaadin/data/validator/IntegerValidator.java b/server/src/com/vaadin/data/validator/IntegerValidator.java
index 732e7052fd..0173ca08fa 100644
--- a/server/src/com/vaadin/data/validator/IntegerValidator.java
+++ b/server/src/com/vaadin/data/validator/IntegerValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
*
* @author Vaadin Ltd.
* @since 5.4
- * @deprecated in Vaadin 7.0. Use an Integer converter on the field instead.
+ * @deprecated As of 7.0. Use an Integer converter on the field instead.
*/
@SuppressWarnings("serial")
@Deprecated
@@ -34,7 +34,7 @@ public class IntegerValidator extends AbstractStringValidator {
*
* @param errorMessage
* the message to display in case the value does not validate.
- * @deprecated in Vaadin 7.0. Use an Integer converter on the field instead
+ * @deprecated As of 7.0. Use an Integer converter on the field instead
* and/or use an {@link IntegerRangeValidator} for validating
* that the value is inside a given range.
*/