Return-Path: X-Original-To: apmail-commonsrdf-commits-archive@minotaur.apache.org Delivered-To: apmail-commonsrdf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9BF3518F5C for ; Fri, 31 Jul 2015 23:48:24 +0000 (UTC) Received: (qmail 92297 invoked by uid 500); 31 Jul 2015 23:48:24 -0000 Delivered-To: apmail-commonsrdf-commits-archive@commonsrdf.apache.org Received: (qmail 92270 invoked by uid 500); 31 Jul 2015 23:48:24 -0000 Mailing-List: contact commits-help@commonsrdf.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commonsrdf.incubator.apache.org Delivered-To: mailing list commits@commonsrdf.incubator.apache.org Received: (qmail 92261 invoked by uid 99); 31 Jul 2015 23:48:24 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 23:48:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 1B3E4196BEC for ; Fri, 31 Jul 2015 23:48:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id W9YVWcwNSKiO for ; Fri, 31 Jul 2015 23:48:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A308B20559 for ; Fri, 31 Jul 2015 23:48:21 +0000 (UTC) Received: (qmail 92181 invoked by uid 99); 31 Jul 2015 23:48:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 23:48:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEC99E039E; Fri, 31 Jul 2015 23:48:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stain@apache.org To: commits@commonsrdf.incubator.apache.org Date: Fri, 31 Jul 2015 23:48:20 -0000 Message-Id: <8a3956d7a64f4503806493920beb2bb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-commonsrdf git commit: COMMONSRDF-25 Remove mentions of "local scope" Repository: incubator-commonsrdf Updated Branches: refs/heads/master 8a2620284 -> 70fd93903 COMMONSRDF-25 Remove mentions of "local scope" (except for in BlankNode about parsing) Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/250c4394 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/250c4394 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/250c4394 Branch: refs/heads/master Commit: 250c4394cc066b75c643d0dd52c46df87d4ce821 Parents: 0f9d716 Author: Stian Soiland-Reyes Authored: Tue May 12 11:56:05 2015 +0100 Committer: Stian Soiland-Reyes Committed: Tue May 12 11:56:05 2015 +0100 ---------------------------------------------------------------------- api/src/main/java/org/apache/commons/rdf/api/BlankNode.java | 5 ++--- api/src/main/java/org/apache/commons/rdf/api/IRI.java | 4 +--- api/src/main/java/org/apache/commons/rdf/api/Literal.java | 2 -- api/src/main/java/org/apache/commons/rdf/api/Triple.java | 5 ----- 4 files changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/250c4394/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java b/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java index 52275ad..c382e60 100644 --- a/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java +++ b/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java @@ -87,13 +87,12 @@ public interface BlankNode extends BlankNodeOrIRI { * Check it this BlankNode is equal to another BlankNode. Two BlankNodes * MUST be equal if, and only if, they have the same * {@link #uniqueReference()}. - * + *

* Implementations MUST also override {@link #hashCode()} so that two equal * Literals produce the same hash code. * * @param other Another object - * @return true if other is a BlankNode, is in the same local scope and is - * equal to this BlankNode + * @return true if other is a BlankNode instance that represent the same blank node * @see Object#equals(Object) */ @Override http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/250c4394/api/src/main/java/org/apache/commons/rdf/api/IRI.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/commons/rdf/api/IRI.java b/api/src/main/java/org/apache/commons/rdf/api/IRI.java index 20ed071..f9283b6 100644 --- a/api/src/main/java/org/apache/commons/rdf/api/IRI.java +++ b/api/src/main/java/org/apache/commons/rdf/api/IRI.java @@ -43,11 +43,9 @@ public interface IRI extends BlankNodeOrIRI { * normalization MUST NOT be performed when comparing IRIs for equality. * * - * Two IRIs are equal are in the same local scope and their + * Two IRI instances are equal if and only if their * {@link #getIRIString()} are equal. * - * Implementations MAY check the local scope for IRI comparison. - * * Implementations MUST also override {@link #hashCode()} so that two equal * IRIs produce the same hash code. * http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/250c4394/api/src/main/java/org/apache/commons/rdf/api/Literal.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/commons/rdf/api/Literal.java b/api/src/main/java/org/apache/commons/rdf/api/Literal.java index 8e22acb..bb3c2de 100644 --- a/api/src/main/java/org/apache/commons/rdf/api/Literal.java +++ b/api/src/main/java/org/apache/commons/rdf/api/Literal.java @@ -92,8 +92,6 @@ public interface Literal extends RDFTerm { * literals can have the same value without being the same RDF term. * * - * Implementations MAY check the local scope for Literal comparison. - * * Implementations MUST also override {@link #hashCode()} so that two equal * Literals produce the same hash code. * http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/250c4394/api/src/main/java/org/apache/commons/rdf/api/Triple.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/commons/rdf/api/Triple.java b/api/src/main/java/org/apache/commons/rdf/api/Triple.java index f7dcd39..b91cca4 100644 --- a/api/src/main/java/org/apache/commons/rdf/api/Triple.java +++ b/api/src/main/java/org/apache/commons/rdf/api/Triple.java @@ -66,11 +66,6 @@ public interface Triple { * {@link #getPredicate()} and {@link #getObject()} are equal. *

*

- * Implementations MUST check the local scope for Triple comparison if - * either the subject or object is a BlankNode, and MAY check the local - * scope in other cases. - *

- *

* Implementations MUST also override {@link #hashCode()} so that two equal * Triples produce the same hash code. *