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/09 12:42:32 UTC
svn commit: r1144633 - in
/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils:
EzLiteral.scala EzMGraph.scala Preamble.scala RichGraphNode.scala
Author: bblfish
Date: Sat Jul 9 10:42:32 2011
New Revision: 1144633
URL: http://svn.apache.org/viewvc?rev=1144633&view=rev
Log:
CLEREZZA-599: Fixes the import of too many implicits problem
Modified:
incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala?rev=1144633&r1=1144632&r2=1144633&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala Sat Jul 9 10:42:32 2011
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.scala.ut
import org.apache.clerezza.rdf.core.impl.{TypedLiteralImpl, PlainLiteralImpl}
import org.apache.clerezza.rdf.ontologies.XSD
-import org.apache.clerezza.rdf.core.{TypedLiteral, Language, PlainLiteral, UriRef}
+import org.apache.clerezza.rdf.core._
object EzLiteral extends EzLiteralImplicits
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala?rev=1144633&r1=1144632&r2=1144633&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala Sat Jul 9 10:42:32 2011
@@ -29,7 +29,7 @@ import scala.collection.mutable.HashMap
* readable, as it avoids a lot of repetition.
*
* @param graph: a Triple collection
- * @author hjs, reto
+ * @author bblfish, reto
* @created: 20/04/2011
*/
class EzMGraph(val baseTc: MGraph) extends AbstractMGraph with TcDependentConversions {
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala?rev=1144633&r1=1144632&r2=1144633&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala Sat Jul 9 10:42:32 2011
@@ -18,9 +18,6 @@
*/
package org.apache.clerezza.rdf.scala.utils
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl
-import org.apache.clerezza.rdf.core.impl.TypedLiteralImpl
-import org.apache.clerezza.rdf.ontologies.XSD
import org.apache.clerezza.rdf.utils.GraphNode
import java.math.BigInteger
import java.net.URI
@@ -28,6 +25,7 @@ import java.net.URL
import java.util.Date
import org.apache.clerezza.rdf.core._
+
/**
* This object provides the implicit conversions. Typically this is used by
* adding
@@ -58,10 +56,10 @@ object Preamble extends TcIndependentCon
*
* @author hjs, reto
*/
-class Preamble(val baseTc: TripleCollection) extends TcDependentConversions {
-
-}
-protected trait TcDependentConversions extends TcIndependentConversions {
+class Preamble(val baseTc: TripleCollection) extends TcDependentConversions with TcIndependentConversions
+
+
+protected trait TcDependentConversions {
def baseTc: TripleCollection
@@ -113,7 +111,4 @@ protected object TcIndependentConversion
val emptyGraph = new impl.SimpleGraph(new impl.SimpleMGraph)
val emptyLiteral = new RichGraphNode(new GraphNode(new impl.PlainLiteralImpl(""), emptyGraph))
-
-
-
}
\ No newline at end of file
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala?rev=1144633&r1=1144632&r2=1144633&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala Sat Jul 9 10:42:32 2011
@@ -27,6 +27,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.{TripleCollection, UriRef, Resource, Literal, TypedLiteral, LiteralFactory, NonLiteral, BNode}
import org.apache.clerezza.rdf.utils.UnionMGraph
+object RichGraphNode extends TcIndependentConversions
/**
* A RichGraphNode decorates A GraphNode with additional method to be part on a DSL-style scala library.