[graphl-cvs] graphl/src/org/mediavirus/graphl/vocabulary ResourceGroup.java NS.java AbstractVocabulary.java VocabularyRegistry.java SimpleVocabularyRegistry.java Vocabulary.java

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

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

Modified Files:
	ResourceGroup.java NS.java AbstractVocabulary.java 
	VocabularyRegistry.java SimpleVocabularyRegistry.java 
	Vocabulary.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: ResourceGroup.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/ResourceGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceGroup.java	4 Oct 2004 10:21:01 -0000	1.2
--- ResourceGroup.java	18 Dec 2005 11:11:39 -0000	1.3
***************
*** 16,20 ****
  
      String description;
!     Vector resources = new Vector();
      
      /**
--- 16,20 ----
  
      String description;
!     Vector<ResourceDescriptor> resources = new Vector<ResourceDescriptor>();
      
      /**

Index: SimpleVocabularyRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/SimpleVocabularyRegistry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleVocabularyRegistry.java	21 Oct 2004 16:00:49 -0000	1.5
--- SimpleVocabularyRegistry.java	18 Dec 2005 11:11:40 -0000	1.6
***************
*** 6,10 ****
  
  import java.util.Enumeration;
! import java.util.Iterator;
  import java.util.Vector;
  
--- 6,11 ----
  
  import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.Map;
  import java.util.Vector;
  
***************
*** 17,21 ****
  public class SimpleVocabularyRegistry implements VocabularyRegistry {
  
!     Vector registeredVocabularies = new Vector();
      
  	/**
--- 18,25 ----
  public class SimpleVocabularyRegistry implements VocabularyRegistry {
  
!     Vector<Vocabulary> registeredVocabularies = new Vector<Vocabulary>();
!     
!     Map<String, String> prefixToNamespaceMap = new HashMap<String, String>();
!     Map<String, String> namespaceToPrefixMap = new HashMap<String, String>();
      
  	/**
***************
*** 31,65 ****
  	public void registerVocabulary(Vocabulary v) {
  		registeredVocabularies.add(v);
  	}
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#expandNamespace(java.lang.String)
       */    
!     public String expandNamespace(String uri) {
!         int pos = uri.indexOf(':');
!         if (pos == -1) return uri;
!         String prefix = uri.substring(0,pos);
!         for (Iterator iter = registeredVocabularies.iterator(); iter.hasNext();) {
!             Vocabulary vocab = (Vocabulary) iter.next();
!             if (vocab.getDefaultNamespacePrefix().equals(prefix)) {
!                 return vocab.getNamespace() + uri.substring(pos+1);
!             }
!         }
!         return uri;
      }
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#compactNamespace(java.lang.String)
       */
      public String compactNamespace(String uri) {
!         String prefix = ParseUtils.guessNamespace(uri);
!         if (prefix == null) return uri;
!         for (Iterator iter = registeredVocabularies.iterator(); iter.hasNext();) {
!             Vocabulary vocab = (Vocabulary) iter.next();
!             if (vocab.getNamespace().equals(prefix)) {
!                 return vocab.getDefaultNamespacePrefix() + ":" + ParseUtils.guessName(uri);
!             }
!         }
!         return uri;
      }
  
--- 35,79 ----
  	public void registerVocabulary(Vocabulary v) {
  		registeredVocabularies.add(v);
+         registerNamespace(v.getNamespacePrefix(), v.getNamespace());
  	}
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#resolveNamespace(java.lang.String)
       */    
!     public String resolveNamespace(String prefix) {
!         return prefixToNamespaceMap.get(prefix);
!     }
! 
!     public String resolvePrefix(String uri) {
!         return namespaceToPrefixMap.get(uri);
      }
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#expandPrefix(java.lang.String)
       */
+     public String expandPrefix(String qname) {
+         String prefix = ParseUtils.guessNamespace(qname);
+         if (prefix == null) return qname;
+         prefix = prefix.substring(0,prefix.length()-1); // strip ":"
+         String ns = prefixToNamespaceMap.get(prefix);
+         if (ns != null) return ns + ParseUtils.guessName(qname);
+         else return qname;
+     }
+ 
      public String compactNamespace(String uri) {
!         String ns = ParseUtils.guessNamespace(uri);
!         if (ns == null) return uri;
!         String prefix = namespaceToPrefixMap.get(ns);
!         if (prefix != null) return prefix + ":" + ParseUtils.guessName(uri);
!         else return uri;
!     }
! 
!     public void registerNamespace(String prefix, String uri) {
!         prefixToNamespaceMap.put(prefix, uri);
!         namespaceToPrefixMap.put(uri,prefix);
!     }
! 
!     public Map<String, String> getNamespaces() {
!         return prefixToNamespaceMap;
      }
  

Index: Vocabulary.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/Vocabulary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Vocabulary.java	30 Nov 2004 09:38:33 -0000	1.3
--- Vocabulary.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 21,25 ****
      public String getNamespace();
      
!     public String getDefaultNamespacePrefix();
      
      public String getName();
--- 21,25 ----
      public String getNamespace();
      
!     public String getNamespacePrefix();
      
      public String getName();

Index: NS.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/NS.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NS.java	5 Sep 2005 15:49:19 -0000	1.3
--- NS.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 12,14 ****
--- 12,15 ----
  	public static final String foaf = "http://xmlns.com/foaf/0.1/";
  	public static final String rdfs = "http://www.w3.org/2000/01/rdf-schema#";
+     public static final String rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
  }

Index: VocabularyRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/VocabularyRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VocabularyRegistry.java	14 Oct 2004 13:03:05 -0000	1.3
--- VocabularyRegistry.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
  
  import java.util.Enumeration;
+ import java.util.Map;
  
  
***************
*** 23,28 ****
      public void registerVocabulary(Vocabulary v);
      
!     public String expandNamespace(String uri);
      
      public String compactNamespace(String uri);
  }
\ No newline at end of file
--- 24,37 ----
      public void registerVocabulary(Vocabulary v);
      
!     public void registerNamespace(String prefix, String uri);
      
+     public String resolveNamespace(String prefix);
+     
+     public String resolvePrefix(String uri);
+ 
+     public String expandPrefix(String qname);
+ 
      public String compactNamespace(String uri);
+     
+     public Map<String, String> getNamespaces();
  }
\ No newline at end of file

Index: AbstractVocabulary.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/AbstractVocabulary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractVocabulary.java	4 Oct 2004 10:21:01 -0000	1.2
--- AbstractVocabulary.java	18 Dec 2005 11:11:40 -0000	1.3
***************
*** 20,25 ****
      String description;
  
!     Vector propertyGroups = new Vector();
!     Vector resourceGroups = new Vector();
  
      public void addPropertyGroup(ResourceGroup props){
--- 20,25 ----
      String description;
  
!     Vector<ResourceGroup> propertyGroups = new Vector<ResourceGroup>();
!     Vector<ResourceGroup> resourceGroups = new Vector<ResourceGroup>();
  
      public void addPropertyGroup(ResourceGroup props){
***************
*** 43,47 ****
      }
      
!     public String getDefaultNamespacePrefix() {
          return defaultNamespacePrefix;
      }
--- 43,47 ----
      }
      
!     public String getNamespacePrefix() {
          return defaultNamespacePrefix;
      }