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/17 21:14:58 UTC
svn commit: r1351142 - in
/jena/Scratch/AFS/Dev/trunk/src/main/java/projects: prefixes/
prefixes/test/ viewgraph/
Author: andy
Date: Sun Jun 17 19:14:57 2012
New Revision: 1351142
URL: http://svn.apache.org/viewvc?rev=1351142&view=rev
Log: (empty)
Modified:
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/PrefixMappingOverPrefixMapI.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestDatasetPrefixesMem.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverPrefixMap.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
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=1351142&r1=1351141&r2=1351142&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 Sun Jun 17 19:14:57 2012
@@ -30,9 +30,13 @@ 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>() ;
+ DatasetPrefixesMem() {}
+
@Override
public String get(Node graphNode, String prefix)
{
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=1351142&r1=1351141&r2=1351142&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 Sun Jun 17 19:14:57 2012
@@ -26,7 +26,7 @@ import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.openjena.atlas.lib.Pair ;
-public class PrefixMapBase implements PrefixMapI {
+public class PrefixMapBase implements PrefixMapI {
static final IRIFactory factory = IRIFactory.iriImplementation() ;
private PrefixMapStorage prefixes ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java?rev=1351142&r1=1351141&r2=1351142&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java Sun Jun 17 19:14:57 2012
@@ -36,7 +36,7 @@ public class PrefixMappingOverPrefixMapI
{
private PrefixMapI pmap ;
- public PrefixMappingOverPrefixMapI(PrefixMapI pmap) { this.pmap = pmap ; }
+ PrefixMappingOverPrefixMapI(PrefixMapI pmap) { this.pmap = pmap ; }
@Override
public PrefixMapping setNsPrefix(String prefix, String uri)
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=1351142&r1=1351141&r2=1351142&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 Sun Jun 17 19:14:57 2012
@@ -25,13 +25,26 @@ import org.apache.jena.iri.IRI ;
import org.openjena.atlas.lib.DS ;
import org.openjena.atlas.lib.Pair ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
+
public class PrefixesFactory
{
- public static PrefixMapI createMem() { return create(new PrefixMapStorageMem() ) ; }
+ public static PrefixMapI createMem() { return newPrefixMap(newPrefixMapStorageMem() ) ; }
+
- public static PrefixMapI empty() { return emptyPrefixMapEmpty ; }
+ public static DatasetPrefixes newDatasetPrefixesMem()
+ { return new DatasetPrefixesMem() ; }
+
+ public static PrefixMapping newPrefixMappingOverPrefixMapI(PrefixMapI pmap)
+ { return new PrefixMappingOverPrefixMapI(pmap) ; }
- public static PrefixMapI create(PrefixMapStorage storage) { return new PrefixMapBase(storage) ; }
+ public static PrefixMapStorage newPrefixMapStorageMem()
+ { return new PrefixMapStorageMem() ; }
+
+ public static PrefixMapI newPrefixMap(PrefixMapStorage storage)
+ { return new PrefixMapBase(storage) ; }
+
+ public static PrefixMapI empty() { return emptyPrefixMapEmpty ; }
static PrefixMapI emptyPrefixMapEmpty = new PrefixMapI() {
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestDatasetPrefixesMem.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestDatasetPrefixesMem.java?rev=1351142&r1=1351141&r2=1351142&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestDatasetPrefixesMem.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestDatasetPrefixesMem.java Sun Jun 17 19:14:57 2012
@@ -19,7 +19,7 @@
package projects.prefixes.test;
import projects.prefixes.DatasetPrefixes ;
-import projects.prefixes.DatasetPrefixesMem ;
+import projects.prefixes.PrefixesFactory ;
public class TestDatasetPrefixesMem extends AbstractTestDatasetPrefixes
{
@@ -29,7 +29,7 @@ public class TestDatasetPrefixesMem exte
@Override
protected DatasetPrefixes create()
{
- prefixes = new DatasetPrefixesMem() ;
+ prefixes = PrefixesFactory.newDatasetPrefixesMem() ;
return view() ;
}
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=1351142&r1=1351141&r2=1351142&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 Sun Jun 17 19:14:57 2012
@@ -18,9 +18,8 @@
package projects.prefixes.test;
-import projects.prefixes.PrefixesFactory ;
import projects.prefixes.PrefixMapI ;
-import projects.prefixes.PrefixMappingOverPrefixMapI ;
+import projects.prefixes.PrefixesFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.graph.AbstractTestPrefixMapping2 ;
@@ -39,7 +38,7 @@ public class TestPrefixMappingOverDatase
@Override
protected PrefixMapping view()
{
- return new PrefixMappingOverPrefixMapI(lastPrefixMap) ;
+ return PrefixesFactory.newPrefixMappingOverPrefixMapI(lastPrefixMap) ;
}
}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverPrefixMap.java?rev=1351142&r1=1351141&r2=1351142&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverPrefixMap.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverPrefixMap.java Sun Jun 17 19:14:57 2012
@@ -18,9 +18,8 @@
package projects.prefixes.test;
-import projects.prefixes.PrefixesFactory ;
import projects.prefixes.PrefixMapI ;
-import projects.prefixes.PrefixMappingOverPrefixMapI ;
+import projects.prefixes.PrefixesFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.graph.AbstractTestPrefixMapping2 ;
@@ -40,7 +39,7 @@ public class TestPrefixMappingOverPrefix
@Override
protected PrefixMapping view()
{
- return new PrefixMappingOverPrefixMapI(lastPrefixMap) ;
+ return PrefixesFactory.newPrefixMappingOverPrefixMapI(lastPrefixMap) ;
}
}
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=1351142&r1=1351141&r2=1351142&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 Sun Jun 17 19:14:57 2012
@@ -102,9 +102,9 @@ public class GraphViewDataset extends Gr
isDefaultGraph() ?
PrefixMapStorageView.viewDefaultGraph(dsgPrefixes) :
PrefixMapStorageView.viewDefaultGraph(dsgPrefixes, gn) ;
- pmap = PrefixesFactory.create(pmaps) ;
+ pmap = PrefixesFactory.newPrefixMap(pmaps) ;
}
- return new PrefixMappingOverPrefixMapI(pmap) ;
+ return PrefixesFactory.newPrefixMappingOverPrefixMapI(pmap) ;
}
// two ideas - need to choose