Merge branch 'deprecate-TripleMatch'
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b6a4bbc9 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b6a4bbc9 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b6a4bbc9 Branch: refs/heads/master Commit: b6a4bbc91ebd3fae93a8b6b8b2756ee2ce57d1ff Parents: e3b6d44 707ddf6 Author: Andy Seaborne <[email protected]> Authored: Fri Jan 2 16:02:51 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Fri Jan 2 16:02:51 2015 +0000 ---------------------------------------------------------------------- .../hp/hpl/jena/sparql/core/DatasetGraph.java | 4 +-- .../jena/sparql/core/DatasetGraphSimpleMem.java | 5 ++-- .../com/hp/hpl/jena/sparql/core/GraphView.java | 3 +- .../hp/hpl/jena/sparql/graph/GraphDataBag.java | 5 ++-- .../hp/hpl/jena/sparql/graph/GraphMemPlain.java | 5 ++-- .../hp/hpl/jena/sparql/graph/GraphSPARQL.java | 2 +- .../jena/sparql/graph/GraphSPARQLService.java | 5 +--- .../hpl/jena/sparql/graph/GraphUnionRead.java | 3 +- .../hp/hpl/jena/sparql/graph/GraphWrapper.java | 12 ++++++-- .../hpl/jena/sparql/modify/GraphStoreNull.java | 22 ++------------- .../hpl/jena/sparql/util/graph/GraphSink.java | 3 +- .../assemblers/UnionModelAssembler.java | 24 ++++++++-------- .../java/com/hp/hpl/jena/graph/Factory.java | 17 +++++++++++- .../main/java/com/hp/hpl/jena/graph/Graph.java | 18 ++++++++++-- .../main/java/com/hp/hpl/jena/graph/Triple.java | 12 ++++---- .../java/com/hp/hpl/jena/graph/TripleMatch.java | 4 +++ .../com/hp/hpl/jena/graph/compose/Delta.java | 4 +-- .../hp/hpl/jena/graph/compose/Difference.java | 2 +- .../hpl/jena/graph/compose/DisjointUnion.java | 3 +- .../com/hp/hpl/jena/graph/compose/Dyadic.java | 4 +-- .../hp/hpl/jena/graph/compose/Intersection.java | 2 +- .../hp/hpl/jena/graph/compose/MultiUnion.java | 6 ++-- .../com/hp/hpl/jena/graph/compose/Union.java | 11 ++++---- .../hp/hpl/jena/graph/impl/CollectionGraph.java | 29 +++++++++----------- .../com/hp/hpl/jena/graph/impl/GraphBase.java | 21 ++++++++++++-- .../com/hp/hpl/jena/graph/impl/TripleStore.java | 2 +- .../hp/hpl/jena/graph/impl/WrappedGraph.java | 6 ++++ .../main/java/com/hp/hpl/jena/mem/GraphMem.java | 4 +-- .../hp/hpl/jena/mem/GraphTripleStoreBase.java | 4 +-- .../hp/hpl/jena/rdf/model/impl/ReifierStd.java | 28 +++++++++++++++---- .../com/hp/hpl/jena/reasoner/BaseInfGraph.java | 6 ++-- .../com/hp/hpl/jena/reasoner/TriplePattern.java | 16 ++++++----- .../rulesys/BasicForwardRuleInfGraph.java | 2 +- .../jena/reasoner/rulesys/FBRuleInfGraph.java | 2 +- .../reasoner/rulesys/Node_RuleVariable.java | 2 +- .../jena/reasoner/rulesys/impl/SafeGraph.java | 19 ++++++------- .../hp/hpl/jena/shared/RandomOrderGraph.java | 4 +-- .../hpl/jena/graph/compose/test/TestDyadic.java | 2 +- .../graph/compose/test/TestUnionStatistics.java | 2 +- .../jena/graph/test/TestGraphBaseToString.java | 2 +- .../hp/hpl/jena/graph/test/TestGraphUtils.java | 3 +- .../com/hp/hpl/jena/mem/test/TestGraphMem.java | 2 +- .../rulesys/test/FRuleEngineIFactoryTest.java | 14 ++++------ .../jena/reasoner/rulesys/test/TestBasicLP.java | 12 ++++---- .../reasoner/rulesys/test/TestLPDerivation.java | 2 +- .../com/hp/hpl/jena/sdb/graph/GraphSDB.java | 5 ++-- .../com/hp/hpl/jena/tdb/store/GraphTDB.java | 6 ++-- 47 files changed, 207 insertions(+), 164 deletions(-) ----------------------------------------------------------------------
