You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2005/05/18 22:21:25 UTC
svn commit: r170812 -
/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value
Author: jukka
Date: Wed May 18 13:21:25 2005
New Revision: 170812
URL: http://svn.apache.org/viewcvs?rev=170812&view=rev
Log:
JCR-RMI: Renamed StatefullValue and StatefullValueAdapter classes (s/ll/l/)
Added:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValue.java
- copied, changed from r170804, incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java
- copied, changed from r170807, incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValueAdapter.java
Removed:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValueAdapter.java
Modified:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BaseNonStreamValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValueFactory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BaseNonStreamValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BaseNonStreamValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BaseNonStreamValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BaseNonStreamValue.java Wed May 18 13:21:25 2005
@@ -39,7 +39,7 @@
* @author Felix Meschberger
* @since 0.16.4.1
*/
-public abstract class BaseNonStreamValue implements StatefullValue {
+public abstract class BaseNonStreamValue implements StatefulValue {
/**
* Default constructor with no special tasks.
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java Wed May 18 13:21:25 2005
@@ -48,7 +48,7 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class BinaryValue implements StatefullValue {
+public class BinaryValue implements StatefulValue {
/** The <code>InputStream</code> providing the value */
private InputStream stream;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java Wed May 18 13:21:25 2005
@@ -29,7 +29,7 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class BooleanValue extends BaseNonStreamValue implements StatefullValue {
+public class BooleanValue extends BaseNonStreamValue implements StatefulValue {
/** The boolean value */
private final boolean value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java Wed May 18 13:21:25 2005
@@ -41,7 +41,7 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class DateValue extends BaseNonStreamValue implements StatefullValue {
+public class DateValue extends BaseNonStreamValue implements StatefulValue {
/** The <code>Calendar</code> value */
private final Calendar value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java Wed May 18 13:21:25 2005
@@ -32,7 +32,7 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class DoubleValue extends BaseNonStreamValue implements StatefullValue {
+public class DoubleValue extends BaseNonStreamValue implements StatefulValue {
/** The double value */
private final double value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java Wed May 18 13:21:25 2005
@@ -39,13 +39,13 @@
*
* @see SerialValue
*/
-final class InitialValue implements StatefullValue {
+final class InitialValue implements StatefulValue {
/** The containing general value instance. */
private final SerialValue general;
/** The underlying concrete value instance. */
- private final StatefullValue value;
+ private final StatefulValue value;
/**
* Creates an initial value state instance.
@@ -53,7 +53,7 @@
* @param general containing general value
* @param value underlying concrete value
*/
- InitialValue(SerialValue general, StatefullValue value) {
+ InitialValue(SerialValue general, StatefulValue value) {
this.general = general;
this.value = value;
}
@@ -99,7 +99,7 @@
* @return stream value
*/
public InputStream getStream() throws ValueFormatException, RepositoryException {
- StatefullValue realValue;
+ StatefulValue realValue;
if (getType() != PropertyType.BINARY) {
realValue = SerialValueFactory.getInstance().createBinaryValue(value.getString());
} else {
@@ -124,7 +124,7 @@
* @see Value#getString()
*/
public String getString() throws ValueFormatException, RepositoryException {
- StatefullValue realValue;
+ StatefulValue realValue;
if (getType() == PropertyType.BINARY) {
realValue = new StringValue(toString(value.getStream()));
} else {
@@ -148,7 +148,7 @@
* @see Value#getLong()
*/
public long getLong() throws ValueFormatException, RepositoryException {
- StatefullValue realValue;
+ StatefulValue realValue;
if (getType() == PropertyType.BINARY) {
realValue = SerialValueFactory.getInstance().createLongValue(toString(value.getStream()));
} else {
@@ -172,7 +172,7 @@
* @see Value#getDouble()
*/
public double getDouble() throws ValueFormatException, RepositoryException {
- StatefullValue realValue;
+ StatefulValue realValue;
if (getType() == PropertyType.BINARY) {
realValue = SerialValueFactory.getInstance().createDoubleValue(toString(value.getStream()));
} else {
@@ -196,7 +196,7 @@
* @see Value#getDate()
*/
public Calendar getDate() throws ValueFormatException, RepositoryException {
- StatefullValue realValue;
+ StatefulValue realValue;
if (getType() == PropertyType.BINARY) {
realValue = SerialValueFactory.getInstance().createDateValue(toString(value.getStream()));
} else {
@@ -220,7 +220,7 @@
* @see Value#getBoolean()
*/
public boolean getBoolean() throws ValueFormatException, RepositoryException {
- StatefullValue realValue;
+ StatefulValue realValue;
if (getType() == PropertyType.BINARY) {
realValue = SerialValueFactory.getInstance().createBooleanValue(toString(value.getStream()));
} else {
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java Wed May 18 13:21:25 2005
@@ -32,7 +32,7 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class LongValue extends BaseNonStreamValue implements StatefullValue {
+public class LongValue extends BaseNonStreamValue implements StatefulValue {
/** The long value */
private final long value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java Wed May 18 13:21:25 2005
@@ -28,7 +28,7 @@
* @author Felix Meschberger
* @since 0.16.4.1
*/
-public class NameValue extends BaseNonStreamValue implements StatefullValue {
+public class NameValue extends BaseNonStreamValue implements StatefulValue {
/** The name value. */
private final String value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java Wed May 18 13:21:25 2005
@@ -28,7 +28,7 @@
* @author Felix Meschberger
* @since 0.16.4.1
*/
-public class PathValue extends BaseNonStreamValue implements StatefullValue {
+public class PathValue extends BaseNonStreamValue implements StatefulValue {
/** The path value. */
private final String value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java Wed May 18 13:21:25 2005
@@ -30,7 +30,7 @@
* @since 0.16.4.1
*/
public class ReferenceValue extends BaseNonStreamValue
- implements StatefullValue {
+ implements StatefulValue {
/** The reference value */
private final String value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValue.java Wed May 18 13:21:25 2005
@@ -51,7 +51,7 @@
* The underlying value instance. This is the state reference that
* changes during state transitions.
*/
- private StatefullValue value;
+ private StatefulValue value;
/**
* Creates a generic value instance. A new InitialValue instance
@@ -61,7 +61,7 @@
*
* @param value underlying static value instance
*/
- SerialValue(StatefullValue value) {
+ SerialValue(StatefulValue value) {
this.type = value.getType();
this.value = new InitialValue(this, value);
}
@@ -72,7 +72,7 @@
*
* @param value new value state
*/
- void setValue(StatefullValue value) {
+ void setValue(StatefulValue value) {
this.value = value;
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValueFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValueFactory.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValueFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/SerialValueFactory.java Wed May 18 13:21:25 2005
@@ -99,7 +99,7 @@
}
// convert to a general vaule
- return new SerialValue(new StatefullValueAdapter(value));
+ return new SerialValue(new StatefulValueAdapter(value));
}
/**
@@ -115,7 +115,7 @@
/** {@inheritDoc} */
public final Value createValue(String value, int type) throws ValueFormatException {
- StatefullValue intValue;
+ StatefulValue intValue;
switch (type) {
case PropertyType.BINARY:
intValue = createBinaryValue(value);
Copied: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValue.java (from r170804, incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValue.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValue.java?p2=incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValue.java&p1=incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValue.java&r1=170804&r2=170812&rev=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValue.java Wed May 18 13:21:25 2005
@@ -40,5 +40,5 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public interface StatefullValue extends Value, Serializable {
+public interface StatefulValue extends Value, Serializable {
}
Copied: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java (from r170807, incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValueAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java?p2=incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java&p1=incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValueAdapter.java&r1=170807&r2=170812&rev=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefullValueAdapter.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java Wed May 18 13:21:25 2005
@@ -46,7 +46,7 @@
*
* @see SerialValue
*/
-final class StatefullValueAdapter implements StatefullValue {
+final class StatefulValueAdapter implements StatefulValue {
/** The delegatee value. */
private Value delegatee;
@@ -57,7 +57,7 @@
*
* @param delegatee The JCR <code>Value</code> providing the value date.
*/
- StatefullValueAdapter(Value delegatee) {
+ StatefulValueAdapter(Value delegatee) {
this.delegatee = delegatee;
}
@@ -112,7 +112,7 @@
*/
private void writeObject(ObjectOutputStream out) throws IOException {
// if the delegatee value is a StatefullValue or SerialValue, serialize it
- if (delegatee instanceof StatefullValue ||
+ if (delegatee instanceof StatefulValue ||
delegatee instanceof SerialValue) {
out.writeObject(delegatee);
return;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java?rev=170812&r1=170811&r2=170812&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java Wed May 18 13:21:25 2005
@@ -32,7 +32,7 @@
*
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class StringValue extends BaseNonStreamValue implements StatefullValue {
+public class StringValue extends BaseNonStreamValue implements StatefulValue {
/** The string value */
private final String value;