svn commit: r1138477 - in /incubator/clerezza/trunk/parent/rdf.scala.utils/src: main/scala/org/apache/clerezza/rdf/scala/utils/ test/scala/org/apache/clerezza/rdf/scala/utils/

[re...@apache.org]

Author: reto
Date: Wed Jun 22 14:16:11 2011
New Revision: 1138477

URL: http://svn.apache.org/viewvc?rev=1138477&view=rev
Log:
CLEREZZA-510: fixed regeression with TypedConversion introduced with r1138445, other test still failing

Modified:
    incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala
    incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Lang.scala
    incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EasyGraphTest.scala

Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala?rev=1138477&r1=1138476&r2=1138477&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala Wed Jun 22 14:16:11 2011
@@ -38,7 +38,7 @@ object EasyGraph {
 
 	implicit def string2litBuilder(str: String) = new EzLiteral(str)
 
-//	implicit def string2lit(str: String) = litFactory.createTypedLiteral(str)
+	implicit def string2lit(str: String) = litFactory.createTypedLiteral(str)
 
 	implicit def lit2String(lit: Literal) = lit.getLexicalForm
 
@@ -75,14 +75,14 @@ object EasyGraph {
  * An Easy Literal, contains functions for mapping literals to other literals, ie from String literals to
  * typed literals.
  */
-case class EzLiteral(lexicalForm: String) extends Literal {
+case class EzLiteral(lexicalForm: String) {
 
 
 	/**
 	 * @return a plain literal with language specified by lang
 	 */
 	//TODO get a better name for this
-	def lang(lang: LangId) = new PlainLiteralImpl(lexicalForm, lang)
+	def lang(lang: Lang) = new PlainLiteralImpl(lexicalForm, lang)
 	def lang(lang: Symbol) = new PlainLiteralImpl(lexicalForm, new Language(lang.name)) //todo lookup in LangId instead
 
 	def ^^(typ: UriRef) = new TypedLiteralImpl(lexicalForm, typ)

Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Lang.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Lang.scala?rev=1138477&r1=1138476&r2=1138477&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Lang.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Lang.scala Wed Jun 22 14:16:11 2011
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.core.Lang
  * A Language Identifier can be a language and a number of Language variations
  * Would be nice if this could just implement the java
  */
-class LangId(val id: String) extends Language(id: String) {
+class Lang(val id: String) extends Language(id: String) {
 }
 
 /**
@@ -42,7 +42,7 @@ class LangId(val id: String) extends Lan
  *    http://www.i18nguy.com/unicode/language-identifiers.html
  *
  */
-class LangRegion(lang: Lang, region: Region) extends LangId(lang.toString+"_"+region.toString)
+/*class LangRegion(lang: Lang, region: Region) extends LangId(lang.toString+"_"+region.toString)
 object LangRegion {
 	import Lang._
 	def apply(lang: Lang, region: Region) = new LangRegion(lang,region)
@@ -51,7 +51,7 @@ object LangRegion {
 	val fr_ch = LangRegion(fr,ch)
 	val de_ch = LangRegion(de,ch)
 	val it_ch = LangRegion(it,ch)
-}
+}*/
 
 /**
  * the simple two character language names
@@ -66,7 +66,6 @@ object Lang {
 	val rm = Lang("rm") //raeto-romance (swiss language)
 
 }
-class Lang(code: String) extends LangId(code)
 
 
 

Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EasyGraphTest.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EasyGraphTest.scala?rev=1138477&r1=1138476&r2=1138477&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EasyGraphTest.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EasyGraphTest.scala Wed Jun 22 14:16:11 2011
@@ -45,7 +45,7 @@ class EasyGraphTest {
 	final val public_exponent: UriRef = new UriRef("http://www.w3.org/ns/auth/rsa#public_exponent")
 
 
-		private val tinyGraph: Graph = {
+	private val tinyGraph: Graph = {
 		val gr = new SimpleMGraph
 		val reto= new BNode()
 		val danny = new BNode()
@@ -149,9 +149,9 @@ class EasyGraphTest {
 					    -- FOAF.knows --> ez.bnode("reto")
 			 )
 		 )
-		Assert.assertEquals("Both graphs should contain exactly the same triples",ez, tinyGraph)
+		Assert.assertEquals("Both graphs should contain exactly the same triples",tinyGraph, ez.getGraph)
 		ez.bnode("danny") -- FOAF.name --> "George"
-		Assert.assertNotSame("Added one more triple, so graphs should no longer be equal",ez, tinyGraph)
+		Assert.assertNotSame("Added one more triple, so graphs should no longer be equal", tinyGraph, ez.getGraph)
 
 	}