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/06/18 15:38:10 UTC
svn commit: r1351338 - in
/jena/Scratch/AFS/Dev/trunk/src/main/java/projects: prefixes/
prefixes/test/ viewgraph/
Author: andy
Date: Mon Jun 18 13:38:10 2012
New Revision: 1351338
URL: http://svn.apache.org/viewvc?rev=1351338&view=rev
Log:
Final coding : prefix mappings and datasets prefixes.
Added:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java
Modified:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TS_Prefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java Mon Jun 18 13:38:10 2012
@@ -18,6 +18,8 @@
package projects.prefixes;
+import java.util.Iterator ;
+
import org.openjena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
@@ -29,6 +31,12 @@ public interface DatasetPrefixes // repl
/* Get the prefix mapping of a prefix */
public String get(Node graphNode, String prefix) ;
+ /* Access to the storage - access by graph name */
+ public Iterator<Pair<String, String>> get(Node graphNode) ;
+
+ /* Access to the storage - enumerate the graph nodes */
+ public Iterator<Node> listGraphNodes() ;
+
/** Add a prefix, overwites any existing association */
public void add(Node graphNode, String prefix, String iriStr) ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java Mon Jun 18 13:38:10 2012
@@ -18,9 +18,9 @@
package projects.prefixes;
-import java.util.HashMap ;
-import java.util.Map ;
+import java.util.* ;
+import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
@@ -30,8 +30,6 @@ import com.hp.hpl.jena.sparql.core.Quad
public class DatasetPrefixesMem implements DatasetPrefixes // No -- extends DatasetPrefixStorage
{
-
-
// Effectively this a map of maps
private Map<Node, PrefixMapI> map = new HashMap<Node, PrefixMapI>() ;
@@ -46,6 +44,29 @@ public class DatasetPrefixesMem implemen
return pmap.get(prefix) ;
}
+ @Override
+ public Iterator<Pair<String, String>> get(Node graphNode)
+ {
+ PrefixMapI pmap = map.get(canonical(graphNode)) ;
+ if (pmap == null)
+ return Iter.nullIterator() ;
+ PrefixMapStorage storage = pmap.getPrefixMapStorage() ;
+ if ( storage != null )
+ return storage.iterator() ;
+
+ // Do it the hard way
+ List<Pair<String, String>> x = new ArrayList<Pair<String, String>>() ;
+ for ( Map.Entry<String, String> e : pmap.getMappingCopyStr().entrySet() )
+ x.add(Pair.create(e.getKey(), e.getValue())) ;
+ return x.iterator() ;
+ }
+
+ @Override
+ public Iterator<Node> listGraphNodes()
+ {
+ return map.keySet().iterator() ;
+ }
+
/** Add a prefix, overwites any existing association */
@Override
public void add(Node graphNode, String prefix, String iriStr)
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java Mon Jun 18 13:38:10 2012
@@ -29,9 +29,10 @@ import org.openjena.atlas.lib.Pair ;
public class PrefixMapBase implements PrefixMapI {
static final IRIFactory factory = IRIFactory.iriImplementation() ;
- private PrefixMapStorage prefixes ;
+ private final PrefixMapStorage prefixes ;
- PrefixMapBase(PrefixMapStorage storage) { this.prefixes = storage ; }
+ PrefixMapBase(PrefixMapStorage storage)
+ { this.prefixes = storage ; }
// remove
@Override
@@ -60,6 +61,12 @@ public class PrefixMapBase implements Pr
}
@Override
+ public PrefixMapStorage getPrefixMapStorage()
+ {
+ return prefixes ;
+ }
+
+ @Override
public void add(String prefix, String iriString)
{
prefix = canonicalPrefix(prefix) ;
@@ -105,6 +112,8 @@ public class PrefixMapBase implements Pr
@Override
public String abbreviate(String uriStr)
{
+ prefixes.iterator() ;
+
for ( Pair<String, String> e : prefixes)
{
String prefix = e.getRight().toString() ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java Mon Jun 18 13:38:10 2012
@@ -33,6 +33,9 @@ public interface PrefixMapI
public abstract Map<String, String> getMappingCopyStr() ;
+ /* Return the underlying PrefixMapStorage - optional operation, may return null */
+ public abstract PrefixMapStorage getPrefixMapStorage() ;
+
/** Add a prefix, overwites any existing association */
public abstract void add(String prefix, String iriString) ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java Mon Jun 18 13:38:10 2012
@@ -19,7 +19,10 @@
package projects.prefixes;
import java.util.Iterator ;
+import java.util.List ;
+import org.openjena.atlas.iterator.Iter ;
+import org.openjena.atlas.iterator.Transform ;
import org.openjena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
@@ -33,7 +36,7 @@ public class PrefixMapStorageView implem
public static PrefixMapStorage viewDefaultGraph(DatasetPrefixes dsgPrefixes)
{ return new PrefixMapStorageView(dsgPrefixes, null) ; }
- public static PrefixMapStorage viewDefaultGraph(DatasetPrefixes dsgPrefixes, Node graphName)
+ public static PrefixMapStorage viewGraph(DatasetPrefixes dsgPrefixes, Node graphName)
{ return new PrefixMapStorageView(dsgPrefixes, graphName) ; }
private PrefixMapStorageView(DatasetPrefixes dsgPrefixes, Node graphName)
@@ -42,6 +45,8 @@ public class PrefixMapStorageView implem
this.graphName = graphName ;
}
+
+
@Override
public void put(String prefix, String uriStr) { dsgPrefixes.add(graphName, prefix, uriStr) ; }
@@ -50,24 +55,45 @@ public class PrefixMapStorageView implem
public String get(String prefix) { return dsgPrefixes.get(graphName, prefix) ; }
@Override
- public boolean containsKey(String key)
+ public boolean containsKey(String prefix)
{
- return false ;
+ return get(prefix) != null ;
}
@Override
- public void remove(String prefix) {}
+ public void remove(String prefix) { dsgPrefixes.delete(graphName, prefix) ; }
+
@Override
- public void clear() {}
+ public void clear() {
+ List<Pair<String, String>> x = Iter.toList(iterator()) ;
+ for ( Pair<String, String> e : x )
+ remove(e.getLeft()) ;
+ }
+
@Override
- public boolean isEmpty() { return false ; }
-
+ public boolean isEmpty() {
+ return ! dsgPrefixes.listGraphNodes().hasNext() ;
+ }
@Override
- public Iterator<Pair<String, String>> iterator() { return null ; }
+ public Iterator<Pair<String, String>> iterator()
+ {
+ return dsgPrefixes.get(graphName) ;
+ }
+
+
@Override
- public Iterator<String> keys() { return null ; }
+ public Iterator<String> keys()
+ {
+ Iterator<Node> iter = dsgPrefixes.listGraphNodes() ;
+ return Iter.map(iter, new Transform<Node, String>(){
+ @Override
+ public String convert(Node item)
+ {
+ return item.getURI() ;
+ }}) ;
+ }
@Override
public void sync() {}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java Mon Jun 18 13:38:10 2012
@@ -18,19 +18,17 @@
package projects.prefixes;
-import java.util.Collections ;
-import java.util.Map ;
+import java.util.Iterator ;
-import org.apache.jena.iri.IRI ;
-import org.openjena.atlas.lib.DS ;
+import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.lib.Pair ;
+import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.shared.PrefixMapping ;
public class PrefixesFactory
{
public static PrefixMapI createMem() { return newPrefixMap(newPrefixMapStorageMem() ) ; }
-
public static DatasetPrefixes newDatasetPrefixesMem()
{ return new DatasetPrefixesMem() ; }
@@ -44,81 +42,187 @@ public class PrefixesFactory
public static PrefixMapI newPrefixMap(PrefixMapStorage storage)
{ return new PrefixMapBase(storage) ; }
- public static PrefixMapI empty() { return emptyPrefixMapEmpty ; }
-
- static PrefixMapI emptyPrefixMapEmpty = new PrefixMapI() {
-
- @Override
- public Map<String, IRI> getMapping()
- {
- Map<String, IRI> x = DS.map() ;
- return Collections.unmodifiableMap(x) ;
- }
-
- @Override
- public Map<String, IRI> getMappingCopy()
- {
- return getMapping() ;
- }
-
- @Override
- public Map<String, String> getMappingCopyStr()
- {
- Map<String, String> x = DS.map() ;
- return Collections.unmodifiableMap(x) ;
- }
-
+ public static PrefixMapI empty() { return emptyPrefixMap ; }
+
+ static DatasetPrefixes emptyDatasetPrefixes = new EmptyDatasetPrefixes() ;
+ static PrefixMapI emptyPrefixMap = newPrefixMap(PrefixMapStorageView.viewDefaultGraph(emptyDatasetPrefixes)) ;
+
+ private static class EmptyDatasetPrefixes implements DatasetPrefixes
+ {
@Override
- public void add(String prefix, String iriString)
- { throw new UnsupportedOperationException() ; }
+ public String get(Node graphNode, String prefix)
+ { return null ; }
@Override
- public void add(String prefix, IRI iri)
- { throw new UnsupportedOperationException() ; }
+ public Iterator<Pair<String, String>> get(Node graphNode)
+ { return Iter.nullIterator() ; }
@Override
- public void putAll(PrefixMapI pmap)
- { throw new UnsupportedOperationException() ; }
+ public Iterator<Node> listGraphNodes()
+ { return Iter.nullIterator() ; }
@Override
- public void delete(String prefix)
- {}
+ public void add(Node graphNode, String prefix, String iriStr)
+ { new UnsupportedOperationException() ; }
@Override
- public String get(String prefix)
- {
- return null ;
- }
+ public void delete(Node graphNode, String prefix)
+ { new UnsupportedOperationException() ; }
@Override
- public boolean contains(String prefix)
- {
- return false ;
- }
-
- @Override
- public String abbreviate(String uriStr)
- {
- return null ;
+ public String abbreviate(Node graphNode, String iriStr)
+ {
+ return null ;
}
@Override
- public Pair<String, String> abbrev(String uriStr)
+ public Pair<String, String> abbrev(Node graphNode, String uriStr)
{
return null ;
}
@Override
- public String expand(String prefixedName)
+ public String expand(Node graphNode, String prefixedName)
{
return null ;
}
@Override
- public String expand(String prefix, String localName)
+ public String expand(Node graphNode, String prefix, String localName)
{
return null ;
}
- } ;
+ }
+//
+// static PrefixMapI emptyPrefixMapEmpty = new PrefixMapI() {
+//
+// @Override
+// public Map<String, IRI> getMapping()
+// {
+// Map<String, IRI> x = DS.map() ;
+// return Collections.unmodifiableMap(x) ;
+// }
+//
+// @Override
+// public Map<String, IRI> getMappingCopy()
+// {
+// return getMapping() ;
+// }
+//
+// @Override
+// public Map<String, String> getMappingCopyStr()
+// {
+// Map<String, String> x = DS.map() ;
+// return Collections.unmodifiableMap(x) ;
+// }
+//
+// @Override
+// public PrefixMapStorage getPrefixMapStorage()
+// {
+// return new PrefixMapStorage() {
+// @Override
+// public boolean containsKey(String key)
+// {
+// return false ;
+// }
+//
+// @Override
+// public void sync()
+// {}
+//
+// @Override
+// public void remove(String prefix)
+// {}
+//
+// @Override
+// public void put(String prefix, String uriStr)
+// {}
+//
+// @Override
+// public Iterator<String> keys()
+// {
+// return null ;
+// }
+//
+// @Override
+// public Iterator<Pair<String, String>> iterator()
+// {
+// return null ;
+// }
+//
+// @Override
+// public boolean isEmpty()
+// {
+// return false ;
+// }
+//
+// @Override
+// public String get(String prefix)
+// {
+// return null ;
+// }
+//
+// @Override
+// public void close()
+// {}
+//
+// @Override
+// public void clear()
+// {}
+// } ;
+// }
+//
+// @Override
+// public void add(String prefix, String iriString)
+// { throw new UnsupportedOperationException() ; }
+//
+// @Override
+// public void add(String prefix, IRI iri)
+// { throw new UnsupportedOperationException() ; }
+//
+// @Override
+// public void putAll(PrefixMapI pmap)
+// { throw new UnsupportedOperationException() ; }
+//
+// @Override
+// public void delete(String prefix)
+// {}
+//
+// @Override
+// public String get(String prefix)
+// {
+// return null ;
+// }
+//
+// @Override
+// public boolean contains(String prefix)
+// {
+// return false ;
+// }
+//
+// @Override
+// public String abbreviate(String uriStr)
+// {
+// return null ;
+// }
+//
+// @Override
+// public Pair<String, String> abbrev(String uriStr)
+// {
+// return null ;
+// }
+//
+// @Override
+// public String expand(String prefixedName)
+// {
+// return null ;
+// }
+//
+// @Override
+// public String expand(String prefix, String localName)
+// {
+// return null ;
+// }
+// } ;
}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java Mon Jun 18 13:38:10 2012
@@ -18,7 +18,11 @@
package projects.prefixes.test;
+
+import java.util.List ;
+
import org.junit.Test ;
+import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.atlas.lib.Pair ;
import projects.prefixes.DatasetPrefixes ;
@@ -135,5 +139,19 @@ public abstract class AbstractTestDatase
String x2 = prefixes.expand(g2, "pref1", "abc") ;
assertNull(x2) ;
}
+
+ // Accessors
+ @Test public void dsg_prefixes_11()
+ {
+ DatasetPrefixes prefixes = create() ;
+ prefixes.add(g1, pref1, "http://example.net/ns#") ;
+
+ List<Node> x = Iter.toList(prefixes.listGraphNodes()) ;
+ assertEquals(1, x.size()) ;
+
+ List<Pair<String, String>> y = Iter.toList(prefixes.get(g1)) ;
+ assertEquals(1, y.size()) ;
+ }
+
}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TS_Prefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TS_Prefixes.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TS_Prefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TS_Prefixes.java Mon Jun 18 13:38:10 2012
@@ -23,8 +23,9 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestPrefixMappingOverDatasetPrefixes.class
- , TestDatasetPrefixesMem.class
+ TestDatasetPrefixesMem.class
+ , TestPrefixMappingOverDatasetPrefixes.class
+ , TestPrefixMappingOverDatasetPrefixes2.class
, TestPrefixMappingOverPrefixMap.class
})
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes.java Mon Jun 18 13:38:10 2012
@@ -18,27 +18,29 @@
package projects.prefixes.test;
-import projects.prefixes.PrefixMapI ;
-import projects.prefixes.PrefixesFactory ;
+import projects.prefixes.* ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.graph.AbstractTestPrefixMapping2 ;
public class TestPrefixMappingOverDatasetPrefixes extends AbstractTestPrefixMapping2
{
- PrefixMapI lastPrefixMap ;
+ DatasetPrefixes dsgprefixes ;
+
@Override
protected PrefixMapping create()
{
- lastPrefixMap = PrefixesFactory.createMem() ;
+ dsgprefixes = PrefixesFactory.newDatasetPrefixesMem() ;
return view() ;
}
@Override
protected PrefixMapping view()
{
- return PrefixesFactory.newPrefixMappingOverPrefixMapI(lastPrefixMap) ;
+ PrefixMapStorage view = PrefixMapStorageView.viewDefaultGraph(dsgprefixes) ;
+ PrefixMapI pmap = PrefixesFactory.newPrefixMap(view) ;
+ return PrefixesFactory.newPrefixMappingOverPrefixMapI(pmap) ;
}
}
Added: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java?rev=1351338&view=auto
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java (added)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java Mon Jun 18 13:38:10 2012
@@ -0,0 +1,48 @@
+/**
+ * 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.test;
+
+import projects.prefixes.* ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.sparql.graph.AbstractTestPrefixMapping2 ;
+
+public class TestPrefixMappingOverDatasetPrefixes2 extends AbstractTestPrefixMapping2
+{
+ static Node gn = Node.createURI("http://test/graphName") ;
+ DatasetPrefixes dsgprefixes ;
+
+
+ @Override
+ protected PrefixMapping create()
+ {
+ dsgprefixes = PrefixesFactory.newDatasetPrefixesMem() ;
+ return view() ;
+ }
+
+ @Override
+ protected PrefixMapping view()
+ {
+ PrefixMapStorage view = PrefixMapStorageView.viewGraph(dsgprefixes, gn) ;
+ PrefixMapI pmap = PrefixesFactory.newPrefixMap(view) ;
+ return PrefixesFactory.newPrefixMappingOverPrefixMapI(pmap) ;
+ }
+}
+
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java?rev=1351338&r1=1351337&r2=1351338&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java Mon Jun 18 13:38:10 2012
@@ -101,7 +101,7 @@ public class GraphViewDataset extends Gr
PrefixMapStorage pmaps =
isDefaultGraph() ?
PrefixMapStorageView.viewDefaultGraph(dsgPrefixes) :
- PrefixMapStorageView.viewDefaultGraph(dsgPrefixes, gn) ;
+ PrefixMapStorageView.viewGraph(dsgPrefixes, gn) ;
pmap = PrefixesFactory.newPrefixMap(pmaps) ;
}
return PrefixesFactory.newPrefixMappingOverPrefixMapI(pmap) ;