You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/01/10 19:17:28 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/common RequestedProperty.java RequestedPropertyImpl.java
luetzkendorf 2005/01/10 10:17:28
Modified: src/share/org/apache/slide/search/basic
ComparableResourceImpl.java
src/share/org/apache/slide/search PropertyProvider.java
src/share/org/apache/slide/common RequestedProperty.java
RequestedPropertyImpl.java
Log:
new methods with full qualified PropertyName instead of String
Revision Changes Path
1.16 +12 -5 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ComparableResourceImpl.java 21 Dec 2004 16:12:44 -0000 1.15
+++ ComparableResourceImpl.java 10 Jan 2005 18:17:28 -0000 1.16
@@ -321,7 +321,14 @@
* @throws SlideException
*/
public NodeProperty getProperty(PropertyName propertyName) throws SlideException {
- return getProperty(propertyName.getName(), propertyName.getNamespace());
+ NodeProperty property = null;
+ if ( (propertyProvider != null) && propertyProvider.isSupportedProperty(getUri(), propertyName) ) {
+ property = propertyProvider.getProperty(getUri(), propertyName);
+ }
+ else {
+ property = revisionDescriptor.getProperty(propertyName);
+ }
+ return property;
}
/**
1.4 +22 -5 jakarta-slide/src/share/org/apache/slide/search/PropertyProvider.java
Index: PropertyProvider.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/PropertyProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropertyProvider.java 28 Jul 2004 09:35:11 -0000 1.3
+++ PropertyProvider.java 10 Jan 2005 18:17:28 -0000 1.4
@@ -23,6 +23,7 @@
package org.apache.slide.search;
// import list
+import org.apache.slide.common.PropertyName;
import org.apache.slide.common.SlideException;
import org.apache.slide.content.NodeProperty;
@@ -55,6 +56,20 @@
* @throws SlideException
*/
public boolean isSupportedProperty(String resourceUri, String propertyName, String propertyNamespace) throws SlideException;
+
+ /**
+ * Returns <code>true</code> if this PropertyProvider can provide the NodeProperty
+ * specified by <code>propertyNamespace</code> and <code>propertyName</code>
+ * for the resource with the given <code>resourceUri</code>.
+ *
+ * @param resourceUri the URI of the resource.
+ * @param propertyName the name of the property.
+ *
+ * @return <code>true</code> if this PropertyProvider can provide the NodeProperty.
+ *
+ * @throws SlideException
+ */
+ public boolean isSupportedProperty(String resourceUri, PropertyName propertyName) throws SlideException;
/**
@@ -88,7 +103,9 @@
* @throws SlideException
*/
public NodeProperty getProperty(String resourceUri, String propertyName, String propertyNamespace) throws SlideException;
-
+
+ public NodeProperty getProperty(String resourceUri, PropertyName propertyName) throws SlideException;
+
/**
* Returns an Iterator of all NodeProperties supported by this PropertyProvider.
*
1.5 +8 -3 jakarta-slide/src/share/org/apache/slide/common/RequestedProperty.java
Index: RequestedProperty.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/RequestedProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestedProperty.java 11 Feb 2004 11:30:11 -0000 1.4
+++ RequestedProperty.java 10 Jan 2005 18:17:28 -0000 1.5
@@ -42,5 +42,10 @@
*
*/
String getNamespace();
+
+ /**
+ * The properties name.
+ */
+ PropertyName getPropertyName();
}
1.9 +17 -18 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RequestedPropertyImpl.java 29 Nov 2004 18:48:46 -0000 1.8
+++ RequestedPropertyImpl.java 10 Jan 2005 18:17:28 -0000 1.9
@@ -22,7 +22,6 @@
*/
package org.apache.slide.common;
-//import org.apache.slide.search.basic.*;
import org.apache.slide.content.NodeProperty;
@@ -34,7 +33,8 @@
public class RequestedPropertyImpl implements RequestedProperty {
/** @deprecated this should be private. We should use PropertyName. */
protected String namespace;
- private String propertyName;
+ private String name;
+ private PropertyName propertyName;
/**
* Constructs a RequestedProperty using the default namespace as defined
@@ -43,8 +43,9 @@
* @param propertyName the name of the property
*/
public RequestedPropertyImpl (String propertyName) {
- this.propertyName = propertyName;
- this.namespace = NodeProperty.DEFAULT_NAMESPACE;
+ this.name = propertyName;
+ this.namespace = NodeProperty.DEFAULT_NAMESPACE;
+ this.propertyName = PropertyName.getPropertyName(this.name, this.namespace);
}
/**
@@ -54,8 +55,9 @@
* @param namespace the namespace of the property
*/
public RequestedPropertyImpl (String propertyName, String namespace) {
- this.propertyName = propertyName;
+ this.name = propertyName;
this.namespace = namespace;
+ this.propertyName = PropertyName.getPropertyName(this.name, this.namespace);
}
@@ -64,7 +66,7 @@
*
* @return the property's name
*/
- public String getPropertyName() {
+ public PropertyName getPropertyName() {
return propertyName;
}
@@ -85,7 +87,7 @@
*
*/
public String getName() {
- return propertyName;
+ return name;
}
/**
@@ -98,12 +100,9 @@
public boolean equals (Object o) {
if (! (o instanceof RequestedProperty))
return false;
+
RequestedProperty other = (RequestedProperty)o;
- if (!namespace.equals (other.getNamespace()))
- return false;
- if (!propertyName.equals (other.getName()))
- return false;
- return true;
+ return this.propertyName.equals(other.getPropertyName());
}
/**
@@ -112,11 +111,11 @@
* @return String representation of this RequestedProperty
*/
public String toString () {
- return namespace + propertyName;
+ return namespace + name;
}
public int hashCode() {
- return toString().hashCode();
+ return this.propertyName.hashCode();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org