You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/03/24 19:56:30 UTC

svn commit: r1085073 - /incubator/clerezza/issues/CLEREZZA-388/rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/VirtualProperty.scala

Author: reto
Date: Thu Mar 24 18:56:30 2011
New Revision: 1085073

URL: http://svn.apache.org/viewvc?rev=1085073&view=rev
Log:
CLEREZZA-388: added alterantive constructors for use from Java

Modified:
    incubator/clerezza/issues/CLEREZZA-388/rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/VirtualProperty.scala

Modified: incubator/clerezza/issues/CLEREZZA-388/rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/VirtualProperty.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-388/rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/VirtualProperty.scala?rev=1085073&r1=1085072&r2=1085073&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-388/rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/VirtualProperty.scala (original)
+++ incubator/clerezza/issues/CLEREZZA-388/rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/VirtualProperty.scala Thu Mar 24 18:56:30 2011
@@ -60,7 +60,11 @@ case class PropertyHolder(property: UriR
 	protected[cris] def pathToIndexedResource(property: UriRef) = List[UriRef]()
 }
 
-case class JoinVirtualProperty(properties: List[VirtualProperty]) extends VirtualProperty {
+case class JoinVirtualProperty(properties: Iterable[VirtualProperty]) extends VirtualProperty {
+
+	def this(properties: java.util.List[VirtualProperty]) = this(
+		collection.JavaConversions.asScalaIterable(properties))
+
 	val stringKey = "J"+VirtualProperty.listDigest(properties)
 	private def singleValue(node: RichGraphNode): String = (for (property <- properties) yield {
 			property.value(node).mkString(" ")
@@ -81,9 +85,13 @@ case class JoinVirtualProperty(propertie
 }
 
 case class PathVirtualProperty(properties: List[UriRef]) extends VirtualProperty {
+
+	def this(properties: java.util.List[UriRef]) = this(
+		collection.JavaConversions.asScalaIterable(properties).toList)
+
 	val stringKey = "J"+VirtualProperty.listDigest(for (p <- properties) yield PropertyHolder(p))
 	def value(node: RichGraphNode): Seq[String] =  {
-		def getPathResults(node: RichGraphNode, properties: List[UriRef]): Seq[String] = {
+		def getPathResults(node: RichGraphNode, properties: Iterable[UriRef]): Seq[String] = {
 			if (properties.size == 1) {
 				PropertyHolder(properties.head).value(node)
 			} else {
@@ -97,7 +105,7 @@ case class PathVirtualProperty(propertie
 }
 
 object VirtualProperty {
-	protected[cris] def listDigest(properties: List[VirtualProperty]) = {
+	protected[cris] def listDigest(properties: Iterable[VirtualProperty]) = {
 		val longString = (for (p <- properties) yield {
 				p.stringKey
 			}).mkString("|")