You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/06/03 13:52:29 UTC
svn commit: r781347 -
/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
Author: angela
Date: Wed Jun 3 11:52:29 2009
New Revision: 781347
URL: http://svn.apache.org/viewvc?rev=781347&view=rev
Log:
JCR-2109: Remove deprecated classes in jcr-commons
Modified:
jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java?rev=781347&r1=781346&r2=781347&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java Wed Jun 3 11:52:29 2009
@@ -52,22 +52,6 @@
}
/**
- * Same as {@link #convert(String, int, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
- *
- * @param srcValue
- * @param targetType
- * @throws ValueFormatException
- * @throws IllegalArgumentException
- * @deprecated Use {@link #convert(String, int, ValueFactory)} instead.
- * @see #convert(Value, int, ValueFactory)
- */
- public static Value convert(String srcValue, int targetType)
- throws ValueFormatException, IllegalArgumentException {
- return convert(srcValue, targetType, ValueFactoryImpl.getInstance());
- }
-
- /**
* @param srcValue
* @param targetType
* @param factory
@@ -85,21 +69,6 @@
}
/**
- * Same as {@link #convert(InputStream, int, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
- *
- * @param srcValue
- * @param targetType
- * @throws ValueFormatException
- * @throws IllegalArgumentException
- * @deprecated Use {@link #convert(InputStream, int, ValueFactory)} instead.
- */
- public static Value convert(InputStream srcValue, int targetType)
- throws ValueFormatException, IllegalArgumentException {
- return convert(srcValue, targetType, ValueFactoryImpl.getInstance());
- }
-
- /**
* @param srcValue
* @param targetType
* @param factory
@@ -123,22 +92,6 @@
* @param targetType
* @throws ValueFormatException
* @throws IllegalArgumentException
- * @deprecated Use {@link #convert(String[], int, ValueFactory)} instead.
- * @see #convert(Value, int, ValueFactory)
- */
- public static Value[] convert(String[] srcValues, int targetType)
- throws ValueFormatException, IllegalArgumentException {
- return convert(srcValues, targetType, ValueFactoryImpl.getInstance());
- }
-
- /**
- * Same as {@link #convert(String[], int, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
- *
- * @param srcValues
- * @param targetType
- * @throws ValueFormatException
- * @throws IllegalArgumentException
* @see #convert(Value, int, ValueFactory)
*/
public static Value[] convert(String[] srcValues, int targetType, ValueFactory factory)
@@ -174,22 +127,6 @@
}
/**
- * Same as {@link #convert(Value[], int, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
- *
- * @param srcValues
- * @param targetType
- * @throws ValueFormatException
- * @throws IllegalArgumentException
- * @deprecated Use {@link #convert(Value[], int, ValueFactory)} instead.
- * @see #convert(Value, int, ValueFactory)
- */
- public static Value[] convert(Value[] srcValues, int targetType)
- throws ValueFormatException, IllegalArgumentException {
- return convert(srcValues, targetType, ValueFactoryImpl.getInstance());
- }
-
- /**
* @param srcValues
* @param targetType
* @param factory
@@ -226,24 +163,6 @@
}
/**
- * Same as {@link #convert(Value, int, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
-
- * @param srcValue
- * @param targetType
- * @throws ValueFormatException
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- * @deprecated Use {@link #convert(Value, int, ValueFactory)} instead.
- * @see #convert(Value, int, ValueFactory)
- */
- public static Value convert(Value srcValue, int targetType)
- throws ValueFormatException, IllegalStateException,
- IllegalArgumentException {
- return convert(srcValue, targetType, ValueFactoryImpl.getInstance());
- }
-
- /**
* Converts the given value to a value of the specified target type.
* The conversion is performed according to the rules described in
* "3.6.4 Property Type Conversion" in the JSR 283 specification.
@@ -635,17 +554,6 @@
}
/**
- * Same as {@link #copy(Value, ValueFactory)} using <code>ValueFactoryImpl</code>.
- *
- * @param srcValue
- * @throws IllegalStateException
- * @deprecated Use {@link #copy(Value, ValueFactory)} instead.
- */
- public static Value copy(Value srcValue) throws IllegalStateException {
- return copy(srcValue, ValueFactoryImpl.getInstance());
- }
-
- /**
*
* @param srcValue
* @param factory
@@ -703,17 +611,6 @@
}
/**
- * Same as {@link #copy(Value[], ValueFactory)} using <code>ValueFactoryImpl</code>.
- *
- * @param srcValues
- * @throws IllegalStateException
- * @deprecated Use {@link #copy(Value[], ValueFactory)} instead.
- */
- public static Value[] copy(Value[] srcValues) throws IllegalStateException {
- return copy(srcValues, ValueFactoryImpl.getInstance());
- }
-
- /**
* @param srcValues
* @param factory
* @throws IllegalStateException
@@ -757,15 +654,6 @@
}
/**
- * @deprecated use {@link #serialize(Value, boolean, boolean, Writer)} instead
- */
- public static void serialize(Value value, boolean encodeBlanks,
- Writer writer)
- throws IllegalStateException, IOException, RepositoryException {
- serialize(value, encodeBlanks, false, writer);
- }
-
- /**
* Outputs the serialized value to a <code>Writer</code>. The serialization
* format is the same as used by Document & System View XML, i.e.
* binary values will be Base64-encoded whereas for all others
@@ -818,30 +706,6 @@
/**
* Deserializes the given string to a <code>Value</code> of the given type.
- * Same as {@link #deserialize(String, int, boolean, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
- *
- * @param value string to be deserialized
- * @param type type of value
- * @param decodeBlanks if <code>true</code> <code>"_x0020_"</code>
- * character sequences will be decoded to single space
- * characters each.
- * @return the deserialized <code>Value</code>
- * @throws ValueFormatException if the string data is not of the required
- * format
- * @throws RepositoryException if an error occured during the
- * deserialization.
- * @deprecated Use {@link #deserialize(String, int, boolean, ValueFactory)}
- * instead.
- */
- public static Value deserialize(String value, int type,
- boolean decodeBlanks)
- throws ValueFormatException, RepositoryException {
- return deserialize(value, type, decodeBlanks, ValueFactoryImpl.getInstance());
- }
-
- /**
- * Deserializes the given string to a <code>Value</code> of the given type.
*
* @param value string to be deserialized
* @param type type of value
@@ -886,33 +750,6 @@
/**
* Deserializes the string data read from the given reader to a
- * <code>Value</code> of the given type. Same as
- * {@link #deserialize(Reader, int, boolean, ValueFactory)} using
- * <code>ValueFactoryImpl</code>.
- *
- * @param reader reader for the string data to be deserialized
- * @param type type of value
- * @param decodeBlanks if <code>true</code> <code>"_x0020_"</code>
- * character sequences will be decoded to single space
- * characters each.
- * @return the deserialized <code>Value</code>
- * @throws IOException if an i/o error occured during the
- * serialization
- * @throws ValueFormatException if the string data is not of the required
- * format
- * @throws RepositoryException if an error occured during the
- * deserialization.
- * @deprecated Use {@link #deserialize(Reader, int, boolean, ValueFactory)}
- * instead.
- */
- public static Value deserialize(Reader reader, int type,
- boolean decodeBlanks)
- throws IOException, ValueFormatException, RepositoryException {
- return deserialize(reader, type, decodeBlanks, ValueFactoryImpl.getInstance());
- }
-
- /**
- * Deserializes the string data read from the given reader to a
* <code>Value</code> of the given type.
*
* @param reader reader for the string data to be deserialized