You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by bb...@apache.org on 2011/07/01 20:01:31 UTC

svn commit: r1142011 - in /incubator/clerezza/trunk/parent: platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/

Author: bblfish
Date: Fri Jul  1 18:01:31 2011
New Revision: 1142011

URL: http://svn.apache.org/viewvc?rev=1142011&view=rev
Log:
CLEREZZA-510 remove uncessary methods where implicit transforms can do a better job. One has to be careful not to overdose on implicits, but since it makes the API simpler and since teh implicits will be used anyway...

Modified:
    incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PingBack.scala
    incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzGraph.scala

Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PingBack.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PingBack.scala?rev=1142011&r1=1142010&r2=1142011&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PingBack.scala (original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PingBack.scala Fri Jul  1 18:01:31 2011
@@ -233,7 +233,7 @@ class PingBack {
 		         -- PINGBACK.source -->  source
 		         -- PINGBACK.target -->  target
 				   -- SIOC.content --> comment
-			      -<- SIOC.container_of -- pingCollUriStr
+			      -<- SIOC.container_of -- pingCollUriStr.uri
 			)
 
 		val resultNode = item.protect().a(PLATFORM.HeadedPage)

Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzGraph.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzGraph.scala?rev=1142011&r1=1142010&r2=1142011&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzGraph.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzGraph.scala Fri Jul  1 18:01:31 2011
@@ -229,11 +229,6 @@ class EzGraphNodeU(ref: NonLiteral, grap
 	def ⟝(rel: UriRef) = predicate(rel)
 
 	/**
-	 * relate the subject via the given relation to....
-	 */
-	def ⟝(rel: String) = predicate(new UriRef(rel))
-
-	/**
 	 * relate the subject via the inverse of the given relation to....
 	 */
 	def ⟵(rel: UriRef) = inverse(rel)
@@ -251,11 +246,6 @@ class EzGraphNodeU(ref: NonLiteral, grap
 		def ⟞(subj: NonLiteral) = add(subj)
 
 		/**
-		 * ...to the following resource (given as a string)
-		 */
-		def ⟞(uri: String) = add(new UriRef(uri))
-
-		/**
 		 * ...to the following EzGraphNode
 		 * (useful for opening a new parenthesis and specifying other things in more detail
 		 */
@@ -264,10 +254,6 @@ class EzGraphNodeU(ref: NonLiteral, grap
 
 	class PredicateU(rel: UriRef) extends Predicate(rel) {
 
-		/**
-		 * ...to the following literal string
-		 */
-		def ⟶(obj: String) = add(new EzLiteral(obj))
 
 		/**
 		 * ...to the following resource
@@ -339,11 +325,6 @@ class EzGraphNodeA(ref: NonLiteral, grap
 	def --(rel: UriRef) = predicate(rel)
 
 	/**
-	 * relate the subject via the given (expressed as string) relation to....
-	 */
-	def --(rel: String) = predicate(new UriRef(rel))
-
-	/**
 	 * relate the subject via the inverse of the given relation to....
 	 * note: we can't have <-- as that messes up the balance of precedence
 	 */
@@ -356,11 +337,6 @@ class EzGraphNodeA(ref: NonLiteral, grap
 		def -->(obj: Resource) = add(obj)
 
 		/**
-		 * ...to the following string literal
-		 */
-		def -->(lit: String) = add(new EzLiteral(lit))
-
-		/**
 		 * Adds a relation to a real linked list.
 		 * If you want one relation to each entry use -->> or ⟶*
 		 */
@@ -384,10 +360,6 @@ class EzGraphNodeA(ref: NonLiteral, grap
 		 * ...to the following non literal
 		 */
 		def --(subj: NonLiteral) = add(subj)
-		/**
-		 * ...to the following resource (given as a string)
-		 */
-		def --(subj: String) = add(new UriRef(subj))
 
 		/**
 		 * ...to the following EzGraphNode
@@ -421,29 +393,18 @@ class EzGraphNodeEn(ref: NonLiteral, gra
 	def has(rel: UriRef) = predicate(rel)
 
 	/**
-	 * the subject has the given relation (specified as string) to....
-	 */
-	def has(rel: String) = predicate(new UriRef(rel))
-
-	/**
 	 * the subject is the inverse relation of ...
 	 */
 	def is(rel: UriRef) = inverse(rel)
 
 	class InversePredicateEn(rel: UriRef) extends InversePredicate(rel) {
 
-
 		/**
 		  * ...the following non literal
 		  */
 		def of(subj: NonLiteral) = add(subj)
 
 		/**
-		  * ...the following resource (as String)
-		  */
-		def of(subj: String) = add(new UriRef(subj))
-
-		/**
 		  * ...the following EzGraphNode - useful for opening a new bracket
 		  */
 		def of(subj: EzGraphNode) = addGN(subj)
@@ -451,12 +412,6 @@ class EzGraphNodeEn(ref: NonLiteral, gra
 
 	class PredicateEn(rel: UriRef) extends Predicate(rel) {
 
-
-		/**
-		 * ...to the following literal string
-		 */
-		def to(lit: String) = add(new EzLiteral(lit))
-
 		/**
 		 * ...to the following resource
 		 */