[prev in list] [next in list] [prev in thread] [next in thread]
List: slide-dev
Subject: cvs commit: jakarta-slide/src/share/org/apache/slide/common RequestedPropertyImpl.java
From: luetzkendorf () apache ! org
Date: 2004-11-29 18:48:46
Message-ID: 20041129184846.31633.qmail () minotaur ! apache ! org
[Download RAW message or body]
luetzkendorf 2004/11/29 10:48:46
Modified: src/share/org/apache/slide/search/basic
ComparableResourceImpl.java
ComparableResourcesPool.java OrderBy.java
src/share/org/apache/slide/search/basic/expression
ComparedProperty.java
src/share/org/apache/slide/content NodeProperty.java
NodeRevisionDescriptor.java
src/share/org/apache/slide/common RequestedPropertyImpl.java
Log:
adaption to new PropertyName instance pooling
Revision Changes Path
1.14 +5 -6 \
jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java
Index: ComparableResourceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ComparableResourceImpl.java 26 Nov 2004 23:37:42 -0000 1.13
+++ ComparableResourceImpl.java 29 Nov 2004 18:48:46 -0000 1.14
@@ -363,8 +363,7 @@
if (props != null) {
while (props.hasMoreElements()) {
property = (NodeProperty)props.nextElement();
- propertyNamesSet.add(new PropertyName(property.getName(),
- property.getNamespace()));
+ propertyNamesSet.add(property.getPropertyName());
}
}
1.5 +4 -11 \
jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourcesPool.java
Index: ComparableResourcesPool.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourcesPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComparableResourcesPool.java 1 Nov 2004 17:52:07 -0000 1.4
+++ ComparableResourcesPool.java 29 Nov 2004 18:48:46 -0000 1.5
@@ -63,12 +63,5 @@
*
*/
boolean partialResult ();
-
- /**
- * Returns the scope of this ResourcePool.
- *
- * @return the scope of this ResourcePool.
- */
- QueryScope getScope();
}
1.11 +5 -5 \
jakarta-slide/src/share/org/apache/slide/search/basic/OrderBy.java
Index: OrderBy.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/OrderBy.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OrderBy.java 28 Jul 2004 09:35:01 -0000 1.10
+++ OrderBy.java 29 Nov 2004 18:48:46 -0000 1.11
@@ -173,7 +173,7 @@
protected PropertyName createProperty (Element propElem) throws \
InvalidQueryException { String name = propElem.getName();
String nameSpace = propElem.getNamespace().getURI();
- return new PropertyName (name, nameSpace);
+ return PropertyName.getPropertyName(name, nameSpace);
}
1.5 +7 -6 \
jakarta-slide/src/share/org/apache/slide/search/basic/expression/ComparedProperty.java
Index: ComparedProperty.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/expression/ComparedProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComparedProperty.java 28 Jul 2004 09:34:50 -0000 1.4
+++ ComparedProperty.java 29 Nov 2004 18:48:46 -0000 1.5
@@ -42,7 +42,7 @@
/** a list of known properties, that have a numeric type */
private static final List NUMERIC_PROPERTIES = new ArrayList ();
static {
- NUMERIC_PROPERTIES.add (new PropertyName ("getcontentlength",
+ NUMERIC_PROPERTIES.add (PropertyName.getPropertyName("getcontentlength",
NamespaceCache.DEFAULT_URI));
}
@@ -132,7 +132,8 @@
*
*/
public boolean isNumeric () {
- return NUMERIC_PROPERTIES.contains (new PropertyName (property, \
propNamespace)); + return NUMERIC_PROPERTIES.contains \
(PropertyName.getPropertyName( + property, propNamespace));
}
/**
1.28 +57 -105 \
jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java
Index: NodeProperty.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- NodeProperty.java 8 Nov 2004 09:33:03 -0000 1.27
+++ NodeProperty.java 29 Nov 2004 18:48:46 -0000 1.28
@@ -34,6 +34,7 @@
import org.apache.slide.common.Domain;
import org.apache.slide.common.ObjectValidationFailedException;
+import org.apache.slide.common.PropertyName;
import org.apache.slide.security.NodePermission;
import org.apache.slide.util.EmptyEnumeration;
import org.apache.slide.util.Messages;
@@ -102,11 +103,7 @@
* @param value Value
*/
public NodeProperty(String name, Object value) {
- setName(name);
- setValue(value);
- this.namespace = DEFAULT_NAMESPACE;
- this.type = "";
- this.kind = determineKind( namespace, name );
+ this(name, value, DEFAULT_NAMESPACE);
}
@@ -118,11 +115,22 @@
* @param namespace Namespace
*/
public NodeProperty(String name, Object value, String namespace) {
- this(name, value);
- setNamespace(namespace);
- this.kind = determineKind( namespace, name );
+ if (value == null) throw new NullPointerException();
+ this.propertyName = PropertyName.getPropertyName(name, namespace);
+ this.value = value;
+ this.type = "";
+ this.kind = determineKind(this.propertyName.getNamespace(),
+ this.propertyName.getName());
}
+ public NodeProperty(PropertyName name, Object value) {
+ if (value == null) throw new NullPointerException();
+ this.propertyName = name;
+ this.value = value;
+ this.type = "";
+ this.kind = determineKind(this.propertyName.getNamespace(),
+ this.propertyName.getName());
+ }
/**
* Constructor.
@@ -133,10 +141,8 @@
* @param type the type
*/
public NodeProperty(String name, Object value, String namespace, String type) \
{
- this(name, value);
- setNamespace(namespace);
+ this(name, value, namespace);
this.type = type;
- this.kind = determineKind( namespace, name );
}
@@ -148,7 +154,15 @@
* @param protectedProperty Is the property protected?
*/
public NodeProperty(String name, Object value, boolean protectedProperty) {
- this(name, value);
+ this(name, value, DEFAULT_NAMESPACE);
+ if( protectedProperty )
+ this.kind = Kind.PROTECTED;
+ else
+ this.kind = determineKind( DEFAULT_NAMESPACE, name );
+ }
+
+ public NodeProperty(String name, Object value, String namespace, boolean \
protectedProperty) { + this(name, value, namespace);
if( protectedProperty )
this.kind = Kind.PROTECTED;
else
@@ -168,9 +182,9 @@
public NodeProperty(String name, Object value, String namespace,
String type, boolean protectedProperty) {
this(name, value, namespace);
- setType(type);
+ this.type = type;
if( protectedProperty )
- setKind( Kind.PROTECTED );
+ this.kind = Kind.PROTECTED;
else
this.kind = determineKind( namespace, name );
}
@@ -179,18 +193,10 @@
// ----------------------------------------------------- Instance Variables
-
/**
- * Property name.
+ * The properties name.
*/
- private String name;
-
-
- /**
- * Namespace of the property.
- */
- private String namespace;
-
+ private PropertyName propertyName;
/**
* Property value.
@@ -261,8 +267,7 @@
* @return true, if this is a protected (live) property
*/
public boolean isProtected() {
- return(
- (this.kind == Kind.PROTECTED) || (this.kind == Kind.COMPUTED) );
+ return((this.kind == Kind.PROTECTED) || (this.kind == Kind.COMPUTED));
}
@@ -272,8 +277,9 @@
* @return true, if this is a live property
*/
public boolean isLiveProperty() {
- return(
- (this.kind == Kind.LIVE) || (this.kind == Kind.PROTECTED) || \
(this.kind == Kind.COMPUTED) ); + return((this.kind == Kind.LIVE)
+ || (this.kind == Kind.PROTECTED)
+ || (this.kind == Kind.COMPUTED) );
}
@@ -283,48 +289,25 @@
* @return String property name
*/
public String getName() {
- return this.name;
+ return this.propertyName.getName();
}
-
- /**
- * Property name mutator.
- *
- * @param name Name
- */
- void setName(String name) {
- if (name == null) {
- this.name = "";
- } else {
- this.name = name;
- }
- }
-
-
/**
* Namespace accessor.
*
* @return String definition
*/
public String getNamespace() {
- return this.namespace;
+ return this.propertyName.getNamespace();
}
-
/**
- * Namespace mutator.
- *
- * @param namespace New namespace
+ * Returnd the property name object.
*/
- void setNamespace(String namespace) {
- if (namespace == null) {
- this.namespace = "";
- } else {
- this.namespace = namespace;
- }
+ public PropertyName getPropertyName() {
+ return this.propertyName;
}
-
/**
* Value accessor.
*
@@ -336,20 +319,6 @@
/**
- * Value mutator.
- *
- * @param value Value
- */
- void setValue(Object value) {
- if (value == null) {
- this.value = "";
- } else {
- this.value = value;
- }
- }
-
-
- /**
* Type accessor.
*
* @return String type
@@ -358,21 +327,6 @@
return type;
}
-
- /**
- * Type mutator.
- *
- * @param type Type
- */
- void setType(String type) {
- if (type == null) {
- this.type = "";
- } else {
- this.type = type;
- }
- }
-
-
/**
* Kind accessor.
*
@@ -386,6 +340,7 @@
/**
* Kind mutator.
*
+ * @deprecated use apropriate ctor
* @param kind the kind
*/
public void setKind( Kind kind ) {
@@ -460,6 +415,7 @@
* @return int Hash code value
*/
public int hashCode() {
+ // FIXME this does not correspont to equals
return getName().hashCode();
}
@@ -472,7 +428,11 @@
* @return String String representation
*/
public String toString() {
- return getNamespace()+getName()+"="+getValue();
+ return new StringBuffer(128)
+ .append(this.propertyName)
+ .append('=')
+ .append(this.value)
+ .toString();
}
@@ -485,12 +445,14 @@
* <li>The property names are equal</li>
*/
public boolean equals(Object obj) {
- if (!(obj instanceof NodeProperty)) {
- return false;
+ if (this == obj) return true;
+ // FIXME this does not consider value !!??
+ if (obj instanceof NodeProperty) {
+ NodeProperty that = (NodeProperty) obj;
+ return this.propertyName.equals(that.propertyName);
}
- NodeProperty other = (NodeProperty) obj;
- return this.getName().equals(other.getName())
- && this.getNamespace().equals(other.getNamespace());
+
+ return false;
}
@@ -498,16 +460,6 @@
* Validate.
*/
public void validate() {
-
- if (name == null)
- throw new ObjectValidationFailedException
- (Messages.message(NodeProperty.class.getName() + ".nullName"));
-
- if (namespace == null)
- throw new ObjectValidationFailedException
- (Messages.message
- (NodeProperty.class.getName() + ".nullNamespace"));
-
if (value == null)
throw new ObjectValidationFailedException
(Messages.message
1.40 +112 -62 \
jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java
Index: NodeRevisionDescriptor.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- NodeRevisionDescriptor.java 8 Nov 2004 09:33:28 -0000 1.39
+++ NodeRevisionDescriptor.java 29 Nov 2004 18:48:46 -0000 1.40
@@ -29,11 +29,14 @@
import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import java.util.Vector;
import org.apache.slide.common.ObjectValidationFailedException;
+import org.apache.slide.common.PropertyName;
import org.apache.slide.util.EmptyEnumeration;
import org.apache.slide.util.Messages;
@@ -56,17 +59,30 @@
public static final String MODIFICATION_DATE = "modificationdate";
public static final String MODIFICATION_USER = "modificationuser";
+ private static final PropertyName CREATION_DATE_PROPERTY =
+ PropertyName.getPropertyName(CREATION_DATE);
+ private static final PropertyName CREATION_USER_PROPERTY =
+ PropertyName.getPropertyName(CREATION_USER);
+ private static final PropertyName MODIFICATION_DATE_PROPERTY =
+ PropertyName.getPropertyName(MODIFICATION_DATE);
+ private static final PropertyName MODIFICATION_USER_PROPERTY =
+ PropertyName.getPropertyName(MODIFICATION_USER);
+
/**
* Last modification date.
*/
public static final String LAST_MODIFIED = "getlastmodified";
+ private static final PropertyName LAST_MODIFIED_PROPERTY =
+ PropertyName.getPropertyName(LAST_MODIFIED);
/**
* Name.
*/
public static final String NAME = "displayname";
+ private static final PropertyName NAME_PROPERTY =
+ PropertyName.getPropertyName(NAME);
/**
@@ -74,7 +90,8 @@
*/
public static final String RESOURCE_TYPE = "resourcetype";
public static final String TYPE = RESOURCE_TYPE;
-
+ private static final PropertyName RESOURCE_TYPE_PROPERTY =
+ PropertyName.getPropertyName(RESOURCE_TYPE);
/**
* Source.
@@ -182,6 +199,9 @@
* Constructor used for retrieval. Can be used by client apps, but it is
* mostly useless as number and creationDate fields are ignored during
* revision creation.
+ *
+ * @deprecated because of weird structure of the <code>properties</code> \
parameter. + * please use {@link #NodeRevisionDescriptor(NodeRevisionNumber, \
String, Vector, List)}.
*/
public NodeRevisionDescriptor(NodeRevisionNumber number, String branchName,
Vector labels, Hashtable properties) {
@@ -191,7 +211,31 @@
this.branchName = branchName;
}
this.labels = labels;
- setProperties(properties);
+ for(Enumeration e = properties.elements(); e.hasMoreElements();) {
+ setProperty((NodeProperty)e.nextElement());
+ }
+ }
+
+ /**
+ * Creates a new NodeRevisionDescriptor.
+ * @param number The revision number of the descriptor.
+ * @param branchName The branch name.
+ * @param labels A Vector of labels (Strings)
+ * @param properties A list of {@link NodeProperty} objects used as the
+ * inititial property set.
+ */
+ public NodeRevisionDescriptor(NodeRevisionNumber number, String branchName,
+ Vector labels, List properties)
+ {
+ this();
+ this.number = number;
+ if (branchName != null) {
+ this.branchName = branchName;
+ }
+ this.labels = labels;
+ for (Iterator i = properties.iterator(); i.hasNext();) {
+ setProperty((NodeProperty) i.next());
+ }
}
@@ -218,6 +262,7 @@
/**
* Properties field.
+ * Maps {@link PropertyName}s to {@link NodeProperty}s.
*/
private Hashtable properties;
@@ -302,22 +347,22 @@
}
- /**
- * Properties accessor.
- */
- Hashtable getProperties() {
- return this.properties;
- }
-
-
- /**
- * Properties mutator.
- */
- void setProperties(Hashtable properties) {
- // FIXME : Do a clean merge
- this.properties = properties;
- this.updatedProperties = new Hashtable(properties);
- }
+// /**
+// * Properties accessor.
+// */
+// Hashtable getProperties() {
+// return this.properties;
+// }
+
+
+// /**
+// * Properties mutator.
+// */
+// void setProperties(Hashtable properties) {
+// // FIXME : Do a clean merge
+// this.properties = properties;
+// this.updatedProperties = new Hashtable(properties);
+// }
/**
@@ -327,7 +372,7 @@
* @return true if the property has been set
*/
public boolean exists(String name) {
- return exists(name, NodeProperty.DEFAULT_NAMESPACE);
+ return exists(PropertyName.getPropertyName(name, \
NodeProperty.DEFAULT_NAMESPACE)); }
@@ -338,12 +383,12 @@
* @return true if the property has been set
*/
public boolean exists(String name, String namespace) {
- if (name != null)
- return (properties.get(getNamespacedPropertyName(namespace,name)) != \
null);
- else
- return (false);
+ return exists(PropertyName.getPropertyName(name, namespace));
}
+ public boolean exists(PropertyName name) {
+ return properties.containsKey(name);
+ }
/**
* Property accessor.
@@ -352,7 +397,7 @@
* @return String property value
*/
public NodeProperty getProperty(String name) {
- return getProperty(name, NodeProperty.DEFAULT_NAMESPACE);
+ return getProperty(PropertyName.getPropertyName(name, \
NodeProperty.DEFAULT_NAMESPACE)); }
@@ -364,14 +409,12 @@
* @return String property value
*/
public NodeProperty getProperty(String name, String namespace) {
- Object result = properties.get(getNamespacedPropertyName(namespace,name));
- if (result != null) {
- return (NodeProperty) result;
- } else {
- return null;
- }
+ return getProperty(PropertyName.getPropertyName(name, namespace));
}
+ public NodeProperty getProperty(PropertyName name) {
+ return (NodeProperty)properties.get(name);
+ }
/**
* Property mutator.
@@ -380,7 +423,7 @@
* @param value Property value
*/
public void setProperty(String name, Object value) {
- setProperty(new NodeProperty(name, value));
+ setProperty(new NodeProperty(name, value, \
NodeProperty.DEFAULT_NAMESPACE)); }
@@ -395,6 +438,9 @@
setProperty(new NodeProperty(name, value, namespace));
}
+ public void setProperty(PropertyName name, Object value) {
+ setProperty(new NodeProperty(name, value));
+ }
/**
* Property mutatory.
@@ -402,7 +448,7 @@
* @param property Property
*/
public void setProperty(NodeProperty property) {
- String name = getNamespacedPropertyName(property.getNamespace(), \
property.getName()); + PropertyName name = property.getPropertyName();
properties.put(name, property);
if (this.updatedProperties == null) this.updatedProperties = new \
Hashtable(); @@ -419,7 +465,7 @@
* Property
*/
public void removeProperty(NodeProperty property) {
- removeProperty(property.getName(), property.getNamespace());
+ removeProperty(property.getPropertyName());
}
@@ -436,11 +482,15 @@
/**
* Remove a property.
*
- * @param property Property
+ * @param property property name
+ * @param nameSpace properties namespace
*/
public void removeProperty(String property, String nameSpace) {
- String name = getNamespacedPropertyName(nameSpace, property);
- NodeProperty nodeProperty = (NodeProperty )properties.remove(name);
+ removeProperty(PropertyName.getPropertyName(property, nameSpace));
+ }
+
+ public void removeProperty(PropertyName name) {
+ NodeProperty nodeProperty = (NodeProperty)properties.remove(name);
// check if the property existed before
if (nodeProperty != null) {
if (this.updatedProperties == null) this.updatedProperties = new \
Hashtable(); @@ -519,7 +569,7 @@
public void resetUpdatedProperties() {
updatedProperties = null;
}
-
+
public void resetRemovedProperties() {
removedProperties = null;
}
@@ -577,7 +627,7 @@
* @return String name
*/
public String getName() {
- NodeProperty name = getProperty(NAME);
+ NodeProperty name = getProperty(NAME_PROPERTY);
if (name == null) {
return "";
} else {
@@ -592,7 +642,7 @@
* @param name New name
*/
public void setName(String name) {
- setProperty(NAME, name); // live property, but can be modified
+ setProperty(NAME_PROPERTY, name); // live property, but can be modified
}
@@ -692,7 +742,7 @@
* @return String
*/
public String getResourceType() {
- NodeProperty resourceType = getProperty(RESOURCE_TYPE);
+ NodeProperty resourceType = getProperty(RESOURCE_TYPE_PROPERTY);
if (resourceType == null) {
return "";
} else {
@@ -709,7 +759,7 @@
* @param resourceType New ResourceType
*/
public void setResourceType(String resourceType) {
- setProperty(RESOURCE_TYPE, resourceType); // live property, can not be \
modified + setProperty(RESOURCE_TYPE_PROPERTY, resourceType); // live \
property, can not be modified }
@@ -771,7 +821,7 @@
* @return String creation date
*/
public String getCreationDate() {
- NodeProperty creationDate = getProperty(CREATION_DATE);
+ NodeProperty creationDate = getProperty(CREATION_DATE_PROPERTY);
if (creationDate == null) {
return null;
} else {
@@ -790,7 +840,7 @@
* @return String modification date
*/
public String getModificationDate() {
- NodeProperty modificationDate = getProperty(MODIFICATION_DATE);
+ NodeProperty modificationDate = getProperty(MODIFICATION_DATE_PROPERTY);
if (modificationDate == null) {
return null;
} else {
@@ -809,7 +859,7 @@
* @return String
*/
public String getCreationUser() {
- NodeProperty creationUser = getProperty(CREATION_USER);
+ NodeProperty creationUser = getProperty(CREATION_USER_PROPERTY);
if (creationUser == null) {
return "";
} else {
@@ -824,7 +874,7 @@
* @return String
*/
public String getModificationUser() {
- NodeProperty modificationUser = getProperty(MODIFICATION_USER);
+ NodeProperty modificationUser = getProperty(MODIFICATION_USER_PROPERTY);
if (modificationUser == null) {
return "";
} else {
@@ -839,7 +889,7 @@
* @return String creation date
*/
public Date getCreationDateAsDate() {
- NodeProperty creationDate = getProperty(CREATION_DATE);
+ NodeProperty creationDate = getProperty(CREATION_DATE_PROPERTY);
if (creationDate == null)
return null;
if (creationDate.getValue() instanceof Date) {
@@ -869,7 +919,7 @@
*/
public void setCreationDate(Date creationDate) {
// live property, can not be modified
- setProperty(CREATION_DATE, creationDateFormat.format(creationDate));
+ setProperty(CREATION_DATE_PROPERTY, \
creationDateFormat.format(creationDate)); }
@@ -880,7 +930,8 @@
*/
public void setModificationDate(Date modificationDate) {
// live property, can not be modified
- setProperty(MODIFICATION_DATE, \
creationDateFormat.format(modificationDate)); + \
setProperty(MODIFICATION_DATE_PROPERTY, + \
creationDateFormat.format(modificationDate)); }
@@ -891,7 +942,7 @@
*/
public void setModificationDate(String modificationDate) {
// live property, can not be modified
- setProperty(MODIFICATION_DATE, modificationDate);
+ setProperty(MODIFICATION_DATE_PROPERTY, modificationDate);
}
@@ -902,7 +953,7 @@
*/
public void setCreationUser(String creationUser) {
// live property, can not be modified
- setProperty(CREATION_USER, creationUser);
+ setProperty(CREATION_USER_PROPERTY, creationUser);
}
@@ -913,7 +964,7 @@
*/
public void setModificationUser(String modificationUser) {
// live property, can not be modified
- setProperty(MODIFICATION_USER, modificationUser);
+ setProperty(MODIFICATION_USER_PROPERTY, modificationUser);
}
@@ -923,7 +974,7 @@
* @param creationDate New creation date
*/
public void setCreationDate(String creationDate) {
- setProperty(CREATION_DATE, creationDate); // live property, can not be \
modified + setProperty(CREATION_DATE_PROPERTY, creationDate); // live \
property, can not be modified }
@@ -933,7 +984,7 @@
* @return String last modification date
*/
public String getLastModified() {
- NodeProperty lastModified = getProperty(LAST_MODIFIED);
+ NodeProperty lastModified = getProperty(LAST_MODIFIED_PROPERTY);
if (lastModified == null) {
return null;
} else {
@@ -952,7 +1003,7 @@
* @return String creation date
*/
public Date getLastModifiedAsDate() {
- NodeProperty lastModified = getProperty(LAST_MODIFIED);
+ NodeProperty lastModified = getProperty(LAST_MODIFIED_PROPERTY);
if (lastModified == null)
return null;
if (lastModified.getValue() instanceof Date) {
@@ -982,7 +1033,7 @@
*/
public void setLastModified(Date lastModified) {
// live property, can not be modified
- setProperty(LAST_MODIFIED, format.format(lastModified));
+ setProperty(LAST_MODIFIED_PROPERTY, format.format(lastModified));
}
@@ -992,7 +1043,7 @@
* @param lastModified New last modified
*/
public void setLastModified(String lastModified) {
- setProperty(LAST_MODIFIED, lastModified); // live property, can not be \
modified + setProperty(LAST_MODIFIED_PROPERTY, lastModified); // live \
property, can not be modified }
@@ -1084,9 +1135,8 @@
/**
* Calculate the property name concatenated with the namespace, if available
*
+ * @deprecated
* @param namespace the namespace name, possibly null
- * @return propertyName the property name
- *
* @return String the property name, including the namespace
*/
public String getNamespacedPropertyName(String namespace, String propertyName) \
{
1.8 +5 -5 \
jakarta-slide/src/share/org/apache/slide/common/RequestedPropertyImpl.java
Index: RequestedPropertyImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/RequestedPropertyImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RequestedPropertyImpl.java 28 Jul 2004 09:38:17 -0000 1.7
+++ RequestedPropertyImpl.java 29 Nov 2004 18:48:46 -0000 1.8
@@ -32,7 +32,7 @@
* @version $Revision$
*/
public class RequestedPropertyImpl implements RequestedProperty {
-
+ /** @deprecated this should be private. We should use PropertyName. */
protected String namespace;
private String propertyName;
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic