You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/05/24 14:50:04 UTC
svn commit: r1342234 - in
/jena/Scratch/AFS/Dev/trunk/src/main/java/projects: prefixes/
prefixes/PrefixMappingOverPrefixMap.java
prefixes/TestPrefixMappingOverPrefixMap.java viewgraph/DatasetPrefixes.java
viewgraph/PrefixMappingOverPrefixMap.java
Author: andy
Date: Thu May 24 12:50:03 2012
New Revision: 1342234
URL: http://svn.apache.org/viewvc?rev=1342234&view=rev
Log: (empty)
Added:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMap.java
- copied, changed from r1341454, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PrefixMappingOverPrefixMap.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/TestPrefixMappingOverPrefixMap.java
Removed:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PrefixMappingOverPrefixMap.java
Modified:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/DatasetPrefixes.java
Copied: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMap.java (from r1341454, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PrefixMappingOverPrefixMap.java)
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMap.java?p2=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMap.java&p1=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PrefixMappingOverPrefixMap.java&r1=1341454&r2=1342234&rev=1342234&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PrefixMappingOverPrefixMap.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMap.java Thu May 24 12:50:03 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package projects.viewgraph;
+package projects.prefixes;
import java.util.HashMap ;
import java.util.Map ;
@@ -30,18 +30,16 @@ import org.openjena.riot.system.PrefixMa
import com.hp.hpl.jena.shared.PrefixMapping ;
/** Converted from PrefixMap (a used by the parsers) to Jena's inferface PrefixMapping
- * (which is a bit XML -centric for historical reasons).
+ * (which is a bit XML-centric for historical reasons).
*/
public class PrefixMappingOverPrefixMap implements PrefixMapping
{
- // Delete me?? - use DatasetPrefixStorage+GraphPrefixesProjection
-
// Needs tests.
private PrefixMap pmap ;
- PrefixMappingOverPrefixMap(PrefixMap pmap) { this.pmap = pmap ; }
+ public PrefixMappingOverPrefixMap(PrefixMap pmap) { this.pmap = pmap ; }
@Override
public PrefixMapping setNsPrefix(String prefix, String uri)
@@ -124,7 +122,10 @@ public class PrefixMappingOverPrefixMap
@Override
public String expandPrefix(String prefixed)
{
- return pmap.expand(prefixed, "") ;
+ String str = pmap.expand(prefixed) ;
+ if ( str == null )
+ return prefixed ;
+ return str ;
}
@Override
Added: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/TestPrefixMappingOverPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/TestPrefixMappingOverPrefixMap.java?rev=1342234&view=auto
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/TestPrefixMappingOverPrefixMap.java (added)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/TestPrefixMappingOverPrefixMap.java Thu May 24 12:50:03 2012
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package projects.prefixes;
+
+import org.openjena.riot.system.PrefixMap ;
+
+import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.sparql.graph.AbstractTestPrefixMapping2 ;
+
+public class TestPrefixMappingOverPrefixMap extends AbstractTestPrefixMapping2
+{
+ PrefixMap lastPrefixMap ;
+
+ @Override
+ protected PrefixMapping create()
+ {
+ lastPrefixMap = new PrefixMap() ;
+ return view() ;
+ }
+
+ @Override
+ protected PrefixMapping view()
+ {
+ return new PrefixMappingOverPrefixMap(lastPrefixMap) ;
+ }
+
+}
+
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/DatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/DatasetPrefixes.java?rev=1342234&r1=1342233&r2=1342234&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/DatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/DatasetPrefixes.java Thu May 24 12:50:03 2012
@@ -18,16 +18,33 @@
package projects.viewgraph;
+import org.openjena.atlas.lib.Pair ;
import org.openjena.riot.system.PrefixMap ;
import com.hp.hpl.jena.graph.Node ;
-/** Like PrefixMapping, only for a dataset which can have different prefix maps for different graphs */
-public interface DatasetPrefixes
+/** Like PrefixMapping, only for a dataset which can have different prefix maps for different graphs */
+
+public interface DatasetPrefixes // No -- extends DatasetPrefixStorage
{
- // == DatasetPrefixStorage?
+ PrefixMap get(Node graphNode) ;
+
+ /** Add a prefix, overwites any existing association */
+ void add(Node graphNode, String prefix, String iriStr) ;
+
+ /** Delete a prefix mapping */
+ void delete(Node graphNode, String prefix) ;
- PrefixMap get(Node node) ;
+ /** Abbreviate an IRI or return null */
+ String abbreviate(Node graphNode, String iriStr) ;
+ public Pair<String, String> abbrev(Node graphNode,String uriStr) ;
+
+ /** Expand a prefix named, return null if it can't be expanded */
+ public String expand(Node graphNode, String prefixedName) ;
+
+ /** Expand a prefix, return null if it can't be expanded */
+ public String expand(Node graphNode, String prefix, String localName) ;
+
}