[graphl-cvs] graphl/src/org/mediavirus/graphl/vocabulary VocabularyRegistry.java SimpleVocabularyRegistry.java

[Flo L. <fl...@us...>]

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11488/src/org/mediavirus/graphl/vocabulary

Modified Files:
	VocabularyRegistry.java SimpleVocabularyRegistry.java 
Log Message:
- migrated from jxpath to jaxen, which gives a much cleaner implementation of custom axes


Index: VocabularyRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/VocabularyRegistry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VocabularyRegistry.java	18 Dec 2005 11:11:40 -0000	1.4
--- VocabularyRegistry.java	30 Jun 2006 14:31:39 -0000	1.5
***************
*** 9,12 ****
--- 9,14 ----
  import java.util.Map;
  
+ import org.jaxen.NamespaceContext;
+ 
  
  
***************
*** 15,19 ****
   * created: 30.05.2004 21:03:28
   */
! public interface VocabularyRegistry {
  
      /**
--- 17,21 ----
   * created: 30.05.2004 21:03:28
   */
! public interface VocabularyRegistry extends NamespaceContext{
  
      /**
***************
*** 35,37 ****
--- 37,42 ----
      
      public Map<String, String> getNamespaces();
+     
+     public String translateNamespacePrefixToUri(String prefix);
+ 
  }
\ No newline at end of file

Index: SimpleVocabularyRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/SimpleVocabularyRegistry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SimpleVocabularyRegistry.java	8 Jun 2006 13:15:01 -0000	1.7
--- SimpleVocabularyRegistry.java	30 Jun 2006 14:31:45 -0000	1.8
***************
*** 87,90 ****
--- 87,93 ----
          return prefixToNamespaceMap;
      }
+     public String translateNamespacePrefixToUri(String prefix) {
+         return resolveNamespace(prefix);
+     }
  
  }