This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 9a91ef459ce77432240898e985292722f9fc9587 Author: Andy Seaborne <[email protected]> AuthorDate: Mon Aug 12 11:43:36 2024 +0100 GH-2638: Use specific suppress warnings --- .../jena/riot/adapters/AdapterFileManager.java | 7 ++ .../ext/xerces/impl/dv/xs/XSSimpleTypeDecl.java | 126 ++++++++++++--------- .../xerces/impl/validation/ValidationManager.java | 28 ++--- .../xerces/impl/validation/ValidationState.java | 14 +-- .../jena/ext/xerces/impl/xpath/regex/Op.java | 12 +- .../impl/xpath/regex/ParserForXMLSchema.java | 18 +-- .../ext/xerces/impl/xpath/regex/RegexParser.java | 34 +++--- .../xerces/impl/xpath/regex/RegularExpression.java | 2 +- .../jena/ext/xerces/impl/xpath/regex/Token.java | 49 ++++---- .../ext/xerces/impl/xs/util/ObjectListImpl.java | 24 ++-- .../ext/xerces/impl/xs/util/StringListImpl.java | 34 +++--- .../java/org/apache/jena/ontology/OntModel.java | 1 + .../org/apache/jena/rdf/model/impl/ModelCom.java | 3 + .../reasoner/rulesys/BasicForwardRuleReasoner.java | 1 + .../jena/reasoner/rulesys/FBRuleReasoner.java | 1 + .../reasoner/rulesys/LPBackwardRuleReasoner.java | 1 + .../jena/reasoner/rulesys/OWLMicroReasoner.java | 1 + .../jena/reasoner/rulesys/OWLMiniReasoner.java | 1 + .../jena/reasoner/rulesys/RDFSFBRuleReasoner.java | 1 + .../reasoner/rulesys/RDFSForwardRuleReasoner.java | 1 + .../jena/reasoner/rulesys/RDFSRuleReasoner.java | 1 + .../transitiveReasoner/TransitiveReasoner.java | 1 + .../java/org/apache/jena/util/FileManagerImpl.java | 3 +- .../org/apache/jena/commonsrdf/impl/JCR_Graph.java | 2 + .../java/org/apache/jena/ontapi/model/IOModel.java | 1 + 25 files changed, 203 insertions(+), 164 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java index c1d00045d0..6e0cdf1af2 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java @@ -240,39 +240,46 @@ public class AdapterFileManager implements org.apache.jena.util.FileManager // -------- Cache operations (start) /** Reset the model cache */ + @Deprecated @Override public void resetCache() { modelCache.resetCache() ; } /** Change the state of model cache : does not clear the cache */ + @Deprecated @Override public void setModelCaching(boolean state) { modelCache.setModelCaching(state) ; } /** return whether caching is on of off */ + @Deprecated @Override public boolean isCachingModels() { return modelCache.isCachingModels() ; } /** Read out of the cache - return null if not in the cache */ + @Deprecated @Override public Model getFromCache(String filenameOrURI) { return modelCache.getFromCache(filenameOrURI) ; } + @Deprecated @Override public boolean hasCachedModel(String filenameOrURI) { return modelCache.hasCachedModel(filenameOrURI) ; } + @Deprecated @Override public void addCacheModel(String uri, Model m) { modelCache.addCacheModel(uri, m) ; } + @Deprecated @Override public void removeCacheModel(String uri) { modelCache.removeCacheModel(uri) ; diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/xs/XSSimpleTypeDecl.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/xs/XSSimpleTypeDecl.java index 3bb2ddb92b..0d23e1368b 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/xs/XSSimpleTypeDecl.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/xs/XSSimpleTypeDecl.java @@ -39,13 +39,13 @@ import org.w3c.dom.TypeInfo; /** * {@literal @xerces.internal} - * + * * @author Sandy Gao, IBM * @author Neeraj Bajaj, Sun Microsystems, inc. * * @version $Id: XSSimpleTypeDecl.java 1026362 2010-10-22 15:15:18Z sandygao $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { protected static final short DV_STRING = PRIMITIVE_STRING; @@ -169,7 +169,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // XML Schema 1.1 type constants public static final short YEARMONTHDURATION_DT = 46; - public static final short DAYTIMEDURATION_DT = 47; + public static final short DAYTIMEDURATION_DT = 47; public static final short PRECISIONDECIMAL_DT = 48; public static final short ANYATOMICTYPE_DT = 49; public static final short DATETIMESTAMP_DT = 50; @@ -237,7 +237,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { protected void setDVs(TypeValidator[] dvs) { fDVs = dvs; } - + // this will be true if this is a static XSSimpleTypeDecl // and hence must remain immutable (i.e., applyFacets // may not be permitted to have any effect). @@ -309,8 +309,8 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { private boolean fFinite; private boolean fBounded; private boolean fNumeric; - - // The namespace schema information item corresponding to the target namespace + + // The namespace schema information item corresponding to the target namespace // of the simple type definition, if it is globally declared; or null otherwise. private XSNamespaceItem fNamespaceItem = null; @@ -333,7 +333,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { validateDV == DV_ANYATOMICTYPE || validateDV == DV_STRING) { fWhiteSpace = WS_PRESERVE; - } + } else { fWhiteSpace = WS_COLLAPSE; fFixedFacet = FACET_WHITESPACE; @@ -1186,11 +1186,11 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // fBase.length, minLength and maxLength defined reportError("length-minLength-maxLength.1.1", new Object[]{fTypeName, Integer.toString(fBase.fLength), Integer.toString(fMinLength)}); } - if ((fBase.fFacetsDefined & FACET_MINLENGTH) == 0){ - reportError("length-minLength-maxLength.1.2.a", new Object[]{fTypeName}); + if ((fBase.fFacetsDefined & FACET_MINLENGTH) == 0){ + reportError("length-minLength-maxLength.1.2.a", new Object[]{fTypeName}); } if (fMinLength != fBase.fMinLength){ - reportError("length-minLength-maxLength.1.2.b", new Object[]{fTypeName, Integer.toString(fMinLength), Integer.toString(fBase.fMinLength)}); + reportError("length-minLength-maxLength.1.2.b", new Object[]{fTypeName, Integer.toString(fMinLength), Integer.toString(fBase.fMinLength)}); } } if ((fFacetsDefined & FACET_MAXLENGTH) != 0){ @@ -1198,11 +1198,11 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // fBase.length, minLength and maxLength defined reportError("length-minLength-maxLength.2.1", new Object[]{fTypeName, Integer.toString(fBase.fLength), Integer.toString(fMaxLength)}); } - if ((fBase.fFacetsDefined & FACET_MAXLENGTH) == 0){ - reportError("length-minLength-maxLength.2.2.a", new Object[]{fTypeName}); + if ((fBase.fFacetsDefined & FACET_MAXLENGTH) == 0){ + reportError("length-minLength-maxLength.2.2.a", new Object[]{fTypeName}); } if (fMaxLength != fBase.fMaxLength){ - reportError("length-minLength-maxLength.2.2.b", new Object[]{fTypeName, Integer.toString(fMaxLength), Integer.toString(fBase.fBase.fMaxLength)}); + reportError("length-minLength-maxLength.2.2.b", new Object[]{fTypeName, Integer.toString(fMaxLength), Integer.toString(fBase.fBase.fMaxLength)}); } } } @@ -1967,7 +1967,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { if(decl.fEnumeration != null) { typesBuffer.append(" : "); decl.appendEnumString(typesBuffer); - } + } } throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.3", new Object[]{content, fTypeName, typesBuffer.toString()}); @@ -2652,15 +2652,15 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { * Checks if a type is derived from another by restriction, given the name * and namespace. See: * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#TypeInfo-isDerivedFrom - * + * * @param ancestorNS * The namspace of the ancestor type declaration * @param ancestorName * The name of the ancestor type declaration * @param derivationMethod * The derivation method - * - * @return boolean True if the ancestor type is derived from the reference type by the specifiied derivation method. + * + * @return boolean True if the ancestor type is derived from the reference type by the specifiied derivation method. */ public boolean isDOMDerivedFrom(String ancestorNS, String ancestorName, int derivationMethod) { @@ -2671,7 +2671,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // ancestor is anyType, return true if (SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(ancestorNS) && SchemaSymbols.ATTVAL_ANYTYPE.equals(ancestorName) - && (((derivationMethod & DERIVATION_RESTRICTION) != 0) + && (((derivationMethod & DERIVATION_RESTRICTION) != 0) || (derivationMethod == DERIVATION_ANY))) { return true; } @@ -2700,17 +2700,17 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // extension if (((derivationMethod & DERIVATION_EXTENSION) != 0) && (((derivationMethod & DERIVATION_RESTRICTION) == 0) - && ((derivationMethod & DERIVATION_LIST) == 0) + && ((derivationMethod & DERIVATION_LIST) == 0) && ((derivationMethod & DERIVATION_UNION) == 0))) { return false; } // If the value of the parameter is 0 i.e. no bit (corresponding to - // restriction, list, extension or union) is set to 1 for the - // derivationMethod parameter. + // restriction, list, extension or union) is set to 1 for the + // derivationMethod parameter. if (((derivationMethod & DERIVATION_EXTENSION) == 0) && (((derivationMethod & DERIVATION_RESTRICTION) == 0) - && ((derivationMethod & DERIVATION_LIST) == 0) + && ((derivationMethod & DERIVATION_LIST) == 0) && ((derivationMethod & DERIVATION_UNION) == 0))) { return isDerivedByAny(ancestorNS, ancestorName, this); } @@ -2722,14 +2722,14 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /** * Checks if a type is derived from another by any combination of restriction, list ir union. See: * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#TypeInfo-isDerivedFrom - * + * * @param ancestorNS * The namspace of the ancestor type declaration * @param ancestorName * The name of the ancestor type declaration * @param type * The reference type definition - * + * * @return boolean True if the type is derived by restriciton for the reference type */ private boolean isDerivedByAny(String ancestorNS, String ancestorName, @@ -2742,7 +2742,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // If the ancestor type is reached or is the same as this type. if ((ancestorName.equals(type.getName())) - && ((ancestorNS == null && type.getNamespace() == null) + && ((ancestorNS == null && type.getNamespace() == null) || (ancestorNS != null && ancestorNS.equals(type.getNamespace())))) { derivedFrom = true; break; @@ -2776,17 +2776,17 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { } /** - * DOM Level 3 + * DOM Level 3 * Checks if a type is derived from another by restriction. See: * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#TypeInfo-isDerivedFrom - * + * * @param ancestorNS * The namspace of the ancestor type declaration * @param ancestorName * The name of the ancestor type declaration * @param type * The reference type definition - * + * * @return boolean True if the type is derived by restriciton for the * reference type */ @@ -2794,8 +2794,8 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { XSTypeDefinition oldType = null; while (type != null && type != oldType) { if ((ancestorName.equals(type.getName())) - && ((ancestorNS != null && ancestorNS.equals(type.getNamespace())) - || (type.getNamespace() == null && ancestorNS == null))) { + && ((ancestorNS != null && ancestorNS.equals(type.getNamespace())) + || (type.getNamespace() == null && ancestorNS == null))) { return true; } @@ -2809,16 +2809,16 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /** * Checks if a type is derived from another by list. See: * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#TypeInfo-isDerivedFrom - * + * * @param ancestorNS * The namspace of the ancestor type declaration * @param ancestorName * The name of the ancestor type declaration * @param type * The reference type definition - * + * * @return boolean True if the type is derived by list for the reference type - */ + */ private boolean isDerivedByList (String ancestorNS, String ancestorName, XSTypeDefinition type) { // If the variety is union if (type !=null && ((XSSimpleTypeDefinition)type).getVariety() == VARIETY_LIST) { @@ -2832,7 +2832,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // T2 is derived from the other type definition by DERIVATION_RESTRICTION if (isDerivedByRestriction(ancestorNS, ancestorName, itemType)) { return true; - } + } } } return false; @@ -2841,16 +2841,16 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /** * Checks if a type is derived from another by union. See: * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#TypeInfo-isDerivedFrom - * + * * @param ancestorNS * The namspace of the ancestor type declaration * @param ancestorName * The name of the ancestor type declaration * @param type * The reference type definition - * + * * @return boolean True if the type is derived by union for the reference type - */ + */ private boolean isDerivedByUnion (String ancestorNS, String ancestorName, XSTypeDefinition type) { // If the variety is union @@ -2865,9 +2865,9 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // T2 is derived from the other type definition by DERIVATION_RESTRICTION if (isDerivedByRestriction(ancestorNS, ancestorName,(XSSimpleTypeDefinition)memberTypes.item(i))) { return true; - } + } } - } + } } return false; } @@ -2931,7 +2931,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { public String getURI(String prefix) { return null; } - + @Override public Locale getLocale() { return Locale.getDefault(); @@ -2947,7 +2947,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { static final class ValidationContextImpl implements ValidationContext { final ValidationContext fExternal; - + ValidationContextImpl(ValidationContext external) { fExternal = external; } @@ -3015,7 +3015,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { return fNSContext.getURI(prefix); } } - + @Override public Locale getLocale() { return fExternal.getLocale(); @@ -3077,7 +3077,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { // REVISIT: reset for fundamental facets } - + /** * @see org.apache.jena.ext.xerces.xs.XSObject#getNamespaceItem() */ @@ -3085,7 +3085,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { public XSNamespaceItem getNamespaceItem() { return fNamespaceItem; } - + public void setNamespaceItem(XSNamespaceItem namespaceItem) { fNamespaceItem = namespaceItem; } @@ -3261,7 +3261,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { } return null; } - + /** * A list of enumeration and pattern constraining facets if it exists, * otherwise an empty <code>XSObjectList</code>. @@ -3328,7 +3328,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { final int ivalue; Object avalue; final boolean fixed; - final XSObjectList annotations; + final XSObjectList annotations; public XSFacetImpl(short kind, String svalue, int ivalue, Object avalue, boolean fixed, XSAnnotation annotation) { this.kind = kind; @@ -3340,7 +3340,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { if (annotation != null) { this.annotations = new XSObjectListImpl(); ((XSObjectListImpl)this.annotations).addXSObject(annotation); - } + } else { this.annotations = XSObjectListImpl.EMPTY_LIST; } @@ -3348,7 +3348,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* * (non-Javadoc) - * + * * @see org.apache.xerces.xs.XSFacet#getAnnotation() */ /** @@ -3361,7 +3361,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* * (non-Javadoc) - * + * * @see org.apache.xerces.xs.XSFacet#getAnnotations() */ /** @@ -3401,12 +3401,12 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { } return avalue; } - + @Override public int getIntFacetValue() { return ivalue; } - + /* (non-Javadoc) * @see org.apache.xerces.xs.XSFacet#isFixed() */ @@ -3418,6 +3418,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getName() */ + @Override public String getName() { return null; } @@ -3425,6 +3426,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getNamespace() */ + @Override public String getNamespace() { return null; } @@ -3432,6 +3434,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getNamespaceItem() */ + @Override public XSNamespaceItem getNamespaceItem() { // REVISIT: implement return null; @@ -3440,6 +3443,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getType() */ + @Override public short getType() { return XSConstants.FACET; } @@ -3457,18 +3461,20 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { this.svalues = svalues; this.avalues = avalues; this.annotations = (annotations != null) ? annotations : XSObjectListImpl.EMPTY_LIST; - } + } /* (non-Javadoc) * @see org.apache.xerces.xs.XSFacet#getFacetKind() */ + @Override public short getFacetKind() { return kind; - } + } /* (non-Javadoc) * @see org.apache.xerces.xs.XSMultiValueFacet#getAnnotations() */ + @Override public XSObjectList getAnnotations() { return annotations; } @@ -3476,17 +3482,20 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSMultiValueFacet#getLexicalFacetValues() */ + @Override public StringList getLexicalFacetValues() { return svalues; } + @Override public ObjectList getEnumerationValues() { return avalues; } - + /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getName() */ + @Override public String getName() { return null; } @@ -3494,6 +3503,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getNamespace() */ + @Override public String getNamespace() { return null; } @@ -3501,6 +3511,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getNamespaceItem() */ + @Override public XSNamespaceItem getNamespaceItem() { // REVISIT: implement return null; @@ -3509,27 +3520,32 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { /* (non-Javadoc) * @see org.apache.xerces.xs.XSObject#getType() */ + @Override public short getType() { return XSConstants.MULTIVALUE_FACET; } } - + private static abstract class AbstractObjectList extends AbstractList<Object> implements ObjectList { + @Override public Object get(int index) { if (index >= 0 && index < getLength()) { return item(index); } throw new IndexOutOfBoundsException("Index: " + index); } + @Override public int size() { return getLength(); } } + @Override public String getTypeNamespace() { return getNamespace(); } + @Override public boolean isDerivedFrom(String typeNamespaceArg, String typeNameArg, int derivationMethod) { return isDOMDerivedFrom(typeNamespaceArg, typeNameArg, derivationMethod); } diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationManager.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationManager.java index 4942948990..4f5746b374 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationManager.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationManager.java @@ -5,9 +5,9 @@ * 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. @@ -20,28 +20,28 @@ package org.apache.jena.ext.xerces.impl.validation; import java.util.ArrayList; /** - * ValidationManager is a coordinator property for validators in the + * ValidationManager is a coordinator property for validators in the * pipeline. Each validator must know how to interact with - * this property. Validators are not required to know what kind of + * this property. Validators are not required to know what kind of * other validators present in the pipeline, but should understand * that there are others and that some coordination is required. - * + * * {@literal @xerces.internal} - * + * * @author Elena Litani, IBM * @version $Id: ValidationManager.java 606491 2007-12-22 21:00:53Z mrglavas $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) public class ValidationManager { protected final ArrayList fVSs = new ArrayList(); protected boolean fGrammarFound = false; // used by the DTD validator to tell other components that it has a - // cached DTD in hand so there's no reason to + // cached DTD in hand so there's no reason to // scan external subset or entity decls. - protected boolean fCachedDTD = false; - + protected boolean fCachedDTD = false; + /** * Each validator should call this method to add its ValidationState into * the validation manager. @@ -58,11 +58,11 @@ public class ValidationManager { ((ValidationState)fVSs.get(i)).setEntityState(state); } } - + public final void setGrammarFound(boolean grammar){ fGrammarFound = grammar; } - + public final boolean isGrammarFound(){ return fGrammarFound; } @@ -74,8 +74,8 @@ public class ValidationManager { public final boolean isCachedDTD() { return fCachedDTD; } // isCachedDTD(): boolean - - + + public final void reset () { fVSs.clear(); fGrammarFound = false; diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationState.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationState.java index e5048891c0..9978270f2d 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationState.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/validation/ValidationState.java @@ -5,9 +5,9 @@ * 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. @@ -28,13 +28,13 @@ import org.apache.jena.ext.xerces.xni.NamespaceContext; /** * Implementation of the ValidationContext interface. Used to establish an * environment for simple type validation. - * + * * {@literal @xerces.internal} * * @author Elena Litani, IBM * @version $Id: ValidationState.java 713638 2008-11-13 04:42:18Z mrglavas $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) public class ValidationState implements ValidationContext { // @@ -201,13 +201,13 @@ public class ValidationState implements ValidationContext { } return null; } - + // Locale - + public void setLocale(Locale locale) { fLocale = locale; } - + @Override public Locale getLocale() { return fLocale; diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Op.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Op.java index 09faaadd94..0cfc31676b 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Op.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Op.java @@ -5,9 +5,9 @@ * 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. @@ -21,17 +21,16 @@ import java.util.Vector; /** * {@literal @xerces.internal} - * + * * @version $Id: Op.java 572108 2007-09-02 18:48:31Z mrglavas $ */ -@SuppressWarnings("all") class Op { static final int DOT = 0; static final int CHAR = 1; // Single character static final int RANGE = 3; // [a-zA-Z] static final int NRANGE = 4; // [^a-zA-Z] static final int ANCHOR = 5; // ^ $ ... - static final int STRING = 6; // literal String + static final int STRING = 6; // literal String static final int CLOSURE = 7; // X* static final int NONGREEDYCLOSURE = 8; // X*? static final int QUESTION = 9; // X? @@ -141,7 +140,7 @@ class Op { throw new RuntimeException("Internal Error: type="+this.type); } // ModifierOp - int getData() { // CharOp for CHAR, BACKREFERENCE, CAPTURE, ANCHOR, + int getData() { // CharOp for CHAR, BACKREFERENCE, CAPTURE, ANCHOR, throw new RuntimeException("Internal Error: type="+this.type); } int getData2() { // ModifierOp @@ -168,6 +167,7 @@ class Op { } // ================================================================ + @SuppressWarnings({"unchecked", "rawtypes"}) static class UnionOp extends Op { final Vector branches; UnionOp(int type, int size) { diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/ParserForXMLSchema.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/ParserForXMLSchema.java index 390034f6b2..fae483ea2e 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/ParserForXMLSchema.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/ParserForXMLSchema.java @@ -5,9 +5,9 @@ * 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. @@ -22,13 +22,13 @@ import java.util.Locale; /** * A regular expression parser for the XML Schema. - * + * * {@literal @xerces.internal} * * @author TAMURA Kent <[email protected]> * @version $Id: ParserForXMLSchema.java 831926 2009-11-02 15:38:53Z knoaman $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) class ParserForXMLSchema extends RegexParser { public ParserForXMLSchema() { @@ -217,7 +217,7 @@ class ParserForXMLSchema extends RegexParser { int type; boolean firstloop = true; while ((type = this.read()) != T_EOF) { // Don't use 'cotinue' for this loop. - + wasDecoded = false; // single-range | from-to-range | subtraction if (type == T_CHAR && this.chardata == ']' && !firstloop) { @@ -243,7 +243,7 @@ class ParserForXMLSchema extends RegexParser { c = this.processCIinCharacterClass(tok, c); if (c < 0) end = true; break; - + case 'p': case 'P': int pstart = this.offset; @@ -252,7 +252,7 @@ class ParserForXMLSchema extends RegexParser { tok.mergeRanges(tok2); end = true; break; - + case '-': c = this.decodeEscaped(); wasDecoded = true; @@ -305,7 +305,7 @@ class ParserForXMLSchema extends RegexParser { else if (type == T_XMLSCHEMA_CC_SUBTRACTION) { throw this.ex("parser.cc.8", this.offset-1); } else { - + int rangeend = this.chardata; if (type == T_CHAR) { if (rangeend == '[') throw this.ex("parser.cc.6", this.offset-1); @@ -344,7 +344,7 @@ class ParserForXMLSchema extends RegexParser { protected RangeToken parseSetOperations() throws ParseException { throw this.ex("parser.process.1", this.offset); } - + @Override Token getTokenForShorthand(int ch) { switch (ch) { diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegexParser.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegexParser.java index 4fc3faffbe..a97b750f08 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegexParser.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegexParser.java @@ -5,9 +5,9 @@ * 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. @@ -24,12 +24,12 @@ import java.util.Vector; /** * A Regular Expression Parser. - * + * * {@literal @xerces.internal} * * @version $Id: RegexParser.java 1033661 2010-11-10 19:31:44Z knoaman $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) class RegexParser { static final int T_CHAR = 0; static final int T_EOF = 1; @@ -97,7 +97,7 @@ class RegexParser { else { this.resources = ResourceBundle.getBundle("org.apache.jena.ext.xerces.impl.xpath.regex.message"); } - } + } catch (MissingResourceException mre) { throw new RuntimeException("Installation Problem??? Couldn't load messages: " + mre.getMessage()); @@ -224,7 +224,7 @@ class RegexParser { ret = T_CARET; } break; - case '$': + case '$': if (this.isSet(RegularExpression.XMLSCHEMA_MODE)) { ret = T_CHAR; } @@ -279,7 +279,7 @@ class RegexParser { throw ex("parser.next.2", this.offset-2); } break; - + case '\\': ret = T_BACKSOLIDUS; if (this.offset >= this.regexlen) @@ -300,7 +300,7 @@ class RegexParser { * | atom (('*' | '+' | '?' | minmax ) '?'? )?) * | '(?=' regex ')' | '(?!' regex ')' | '(?<=' regex ')' | '(?<!' regex ')' * atom ::= char | '.' | range | '(' regex ')' | '(?:' regex ')' | '\' [0-9] - * | '\w' | '\W' | '\d' | '\D' | '\s' | '\S' | category-block + * | '\w' | '\W' | '\d' | '\D' | '\s' | '\S' | category-block */ Token parseRegex() throws ParseException { Token tok = this.parseTerm(); @@ -466,7 +466,7 @@ class RegexParser { if ('1' <= ch && ch <= '9') { refno = ch-'0'; int finalRefno = refno; - + if (this.parennumber <= refno) throw ex("parser.parse.2", this.offset); @@ -640,7 +640,7 @@ class RegexParser { * min ::= [0-9]+ * max ::= [0-9]+ */ - Token parseFactor() throws ParseException { + Token parseFactor() throws ParseException { int ch = this.read(); Token tok; switch (ch) { @@ -699,7 +699,7 @@ class RegexParser { if (off >= this.regexlen) { throw ex("parser.quantifier.3", this.offset); } - else if ((ch = this.regex.charAt(off++)) >= '0' && ch <= '9') { + else if ((ch = this.regex.charAt(off++)) >= '0' && ch <= '9') { max = ch -'0'; // {min,max} while (off < this.regexlen @@ -714,7 +714,7 @@ class RegexParser { throw ex("parser.quantifier.4", this.offset); } else { // assume {min,} - max = -1; + max = -1; } } @@ -905,7 +905,7 @@ class RegexParser { c = this.processCIinCharacterClass(tok, c); if (c < 0) end = true; break; - + case 'p': case 'P': int pstart = this.offset; @@ -1008,7 +1008,7 @@ class RegexParser { if (this.read() == T_EOF) { throw this.ex("parser.cc.2", this.offset); } - + if (!useNrange && nrange) { base.subtractRanges(tok); tok = base; @@ -1193,11 +1193,11 @@ class RegexParser { if (ch < 'a') return -1; return ch-'a'+10; } - + static protected final void addCaseInsensitiveChar(RangeToken tok, int c) { final int[] caseMap = CaseInsensitiveMap.get(c); tok.addRange(c, c); - + if (caseMap != null) { for (int i=0; i<caseMap.length; i+=2) { tok.addRange(caseMap[i], caseMap[i]); @@ -1205,7 +1205,7 @@ class RegexParser { } } - + static protected final void addCaseInsensitiveCharRange(RangeToken tok, int start, int end) { int[] caseMap; int r1, r2; diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java index 43615eaf2a..9bc439e428 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java @@ -488,7 +488,7 @@ import org.apache.jena.ext.xerces.util.IntStack; * @author TAMURA Kent <[email protected]> * @version $Id: RegularExpression.java 961928 2010-07-08 20:43:46Z knoaman $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) public class RegularExpression implements java.io.Serializable { private static final long serialVersionUID = 6242499334195006401L; diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Token.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Token.java index 6d21fdd232..6b9deac655 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Token.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/Token.java @@ -5,9 +5,9 @@ * 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. @@ -22,12 +22,12 @@ import java.util.Vector; /** * This class represents a node in parse tree. - * + * * {@literal @xerces.internal} * * @version $Id: Token.java 831926 2009-11-02 15:38:53Z knoaman $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) class Token implements java.io.Serializable { private static final long serialVersionUID = 8484976002585487481L; @@ -582,6 +582,7 @@ class Token implements java.io.Serializable { } // ------------------------------------------------------ + private final static Hashtable categories = new Hashtable(); private final static Hashtable categories2 = new Hashtable(); private static final String[] categoryNames = { @@ -592,7 +593,7 @@ class Token implements java.io.Serializable { "L", "M", "N", "Z", "C", "P", "S", // 31-37 }; - // Schema Rec. {Datatypes} - Punctuation + // Schema Rec. {Datatypes} - Punctuation static final int CHAR_INIT_QUOTE = 29; // Pi - initial quote static final int CHAR_FINAL_QUOTE = 30; // Pf - final quote static final int CHAR_LETTER = 31; @@ -602,8 +603,8 @@ class Token implements java.io.Serializable { static final int CHAR_OTHER = 35; static final int CHAR_PUNCTUATION = 36; static final int CHAR_SYMBOL = 37; - - //blockNames in UNICODE 3.1 that supported by XML Schema REC + + //blockNames in UNICODE 3.1 that supported by XML Schema REC private static final String[] blockNames = { /*0000..007F;*/ "Basic Latin", /*0080..00FF;*/ "Latin-1 Supplement", @@ -617,7 +618,7 @@ class Token implements java.io.Serializable { /*0530..058F;*/ "Armenian", /*0590..05FF;*/ "Hebrew", /*0600..06FF;*/ "Arabic", - /*0700..074F;*/ "Syriac", + /*0700..074F;*/ "Syriac", /*0780..07BF;*/ "Thaana", /*0900..097F;*/ "Devanagari", /*0980..09FF;*/ "Bengali", @@ -632,7 +633,7 @@ class Token implements java.io.Serializable { /*0E00..0E7F;*/ "Thai", /*0E80..0EFF;*/ "Lao", /*0F00..0FFF;*/ "Tibetan", - /*1000..109F;*/ "Myanmar", + /*1000..109F;*/ "Myanmar", /*10A0..10FF;*/ "Georgian", /*1100..11FF;*/ "Hangul Jamo", /*1200..137F;*/ "Ethiopic", @@ -705,8 +706,8 @@ class Token implements java.io.Serializable { //ADD THOSE MANUALLY //F0000..FFFFD; "Private Use", //100000..10FFFD; "Private Use" - //FFF0..FFFD; "Specials", - static final String blockRanges = + //FFF0..FFFD; "Specials", + static final String blockRanges = "\u0000\u007F\u0080\u00FF\u0100\u017F\u0180\u024F\u0250\u02AF\u02B0\u02FF\u0300\u036F" +"\u0370\u03FF\u0400\u04FF\u0530\u058F\u0590\u05FF\u0600\u06FF\u0700\u074F\u0780\u07BF" +"\u0900\u097F\u0980\u09FF\u0A00\u0A7F\u0A80\u0AFF\u0B00\u0B7F\u0B80\u0BFF\u0C00\u0C7F\u0C80\u0CFF" @@ -741,7 +742,7 @@ class Token implements java.io.Serializable { int type; for (int i = 0; i < 0x10000; i ++) { type = Character.getType((char)i); - if (type == Character.START_PUNCTUATION || + if (type == Character.START_PUNCTUATION || type == Character.END_PUNCTUATION) { //build table of Pi values if (i == 0x00AB || i == 0x2018 || i == 0x201B || i == 0x201C || @@ -1073,7 +1074,7 @@ class Token implements java.io.Serializable { static class StringToken extends Token implements java.io.Serializable { private static final long serialVersionUID = -4614366944218504172L; - + String string; final int refNumber; @@ -1091,7 +1092,7 @@ class Token implements java.io.Serializable { String getString() { // for STRING return this.string; } - + @Override public String toString(int options) { if (this.type == BACKREFERENCE) @@ -1107,10 +1108,10 @@ class Token implements java.io.Serializable { static class ConcatToken extends Token implements java.io.Serializable { private static final long serialVersionUID = 8717321425541346381L; - + final Token child; final Token child2; - + ConcatToken(Token t1, Token t2) { super(Token.CONCAT); this.child = t1; @@ -1145,7 +1146,7 @@ class Token implements java.io.Serializable { static class CharToken extends Token implements java.io.Serializable { private static final long serialVersionUID = -4394272816279496989L; - + final int chardata; CharToken(int type, int ch) { @@ -1187,7 +1188,7 @@ class Token implements java.io.Serializable { case ANCHOR: if (this == Token.token_linebeginning || this == Token.token_lineend) ret = ""+(char)this.chardata; - else + else ret = "\\"+(char)this.chardata; break; @@ -1212,7 +1213,7 @@ class Token implements java.io.Serializable { static class ClosureToken extends Token implements java.io.Serializable { private static final long serialVersionUID = 1308971930673997452L; - + int min; int max; final Token child; @@ -1288,7 +1289,7 @@ class Token implements java.io.Serializable { static class ParenToken extends Token implements java.io.Serializable { private static final long serialVersionUID = -5938014719827987704L; - + final Token child; final int parennumber; @@ -1350,7 +1351,7 @@ class Token implements java.io.Serializable { static class ConditionToken extends Token implements java.io.Serializable { private static final long serialVersionUID = 4353765277910594411L; - + final int refNumber; final Token condition; final Token yes; @@ -1399,7 +1400,7 @@ class Token implements java.io.Serializable { static class ModifierToken extends Token implements java.io.Serializable { private static final long serialVersionUID = -9114536559696480356L; - + final Token child; final int add; final int mask; @@ -1445,7 +1446,7 @@ class Token implements java.io.Serializable { static class UnionToken extends Token implements java.io.Serializable { private static final long serialVersionUID = -2568843945989489861L; - + Vector children; UnionToken(int type) { @@ -1477,7 +1478,7 @@ class Token implements java.io.Serializable { this.children.addElement(tok); return; } - + //System.err.println("Merge '"+previous+"' and '"+tok+"'."); StringBuffer buffer; diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/ObjectListImpl.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/ObjectListImpl.java index 353e601fb3..9e458dbead 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/ObjectListImpl.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/ObjectListImpl.java @@ -5,9 +5,9 @@ * 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. @@ -24,22 +24,22 @@ import org.apache.jena.ext.xerces.xs.datatypes.ObjectList; /** * Contains a list of Objects. - * + * * {@literal @xerces.internal} - * + * * @version $Id: ObjectListImpl.java 789785 2009-06-30 15:10:26Z knoaman $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) public final class ObjectListImpl extends AbstractList<Object> implements ObjectList { /** * An immutable empty list. */ public static final ObjectListImpl EMPTY_LIST = new ObjectListImpl(new Object[0], 0); - + // The array to hold all data private final Object[] fArray; - + // Number of elements in this list private final int fLength; @@ -52,7 +52,7 @@ public final class ObjectListImpl extends AbstractList<Object> implements Object public int getLength() { return fLength; } - + @Override public boolean contains(Object item) { if (item == null) { @@ -69,7 +69,7 @@ public final class ObjectListImpl extends AbstractList<Object> implements Object } return false; } - + @Override public Object item(int index) { if (index < 0 || index >= fLength) { @@ -77,7 +77,7 @@ public final class ObjectListImpl extends AbstractList<Object> implements Object } return fArray[index]; } - + /* * List methods */ @@ -93,14 +93,14 @@ public final class ObjectListImpl extends AbstractList<Object> implements Object public int size() { return getLength(); } - + @Override public Object[] toArray() { Object[] a = new Object[fLength]; toArray0(a); return a; } - + @Override public Object[] toArray(Object[] a) { if (a.length < fLength) { diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/StringListImpl.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/StringListImpl.java index ad046a7f96..4a76ea0f8f 100644 --- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/StringListImpl.java +++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xs/util/StringListImpl.java @@ -5,9 +5,9 @@ * 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. @@ -26,20 +26,20 @@ import org.apache.jena.ext.xerces.xs.StringList; /** * Contains a list of Strings. * - * {@literal @xerces.internal} + * {@literal @xerces.internal} * * @author Sandy Gao, IBM * * @version $Id: StringListImpl.java 776326 2009-05-19 14:27:24Z mrglavas $ */ -@SuppressWarnings("all") +@SuppressWarnings({"unchecked", "rawtypes"}) public final class StringListImpl extends AbstractList implements StringList { /** * An immutable empty list. */ public static final StringListImpl EMPTY_LIST = new StringListImpl(new String[0], 0); - + // The array to hold all data private final String[] fArray; // Number of elements in this list @@ -50,14 +50,14 @@ public final class StringListImpl extends AbstractList implements StringList { private final Vector fVector; public StringListImpl(Vector v) { - fVector = v; + fVector = v; fLength = (v == null) ? 0 : v.size(); fArray = null; } /** * Construct an XSObjectList implementation - * + * * @param array the data array * @param length the number of elements */ @@ -77,12 +77,12 @@ public final class StringListImpl extends AbstractList implements StringList { } /** - * Checks if the <code>GenericString</code> <code>item</code> is a member - * of this list. - * @param item <code>GenericString</code> whose presence in this list is - * to be tested. - * @return True if this list contains the <code>GenericString</code> - * <code>item</code>. + * Checks if the <code>GenericString</code> <code>item</code> is a member + * of this list. + * @param item <code>GenericString</code> whose presence in this list is + * to be tested. + * @return True if this list contains the <code>GenericString</code> + * <code>item</code>. */ @Override public boolean contains(String item) { @@ -114,7 +114,7 @@ public final class StringListImpl extends AbstractList implements StringList { } return fArray[index]; } - + /* * List methods */ @@ -134,7 +134,7 @@ public final class StringListImpl extends AbstractList implements StringList { public int size() { return getLength(); } - + @Override public Object[] toArray() { if (fVector != null) { @@ -144,7 +144,7 @@ public final class StringListImpl extends AbstractList implements StringList { toArray0(a); return a; } - + @Override public Object[] toArray(Object[] a) { if (fVector != null) { @@ -161,7 +161,7 @@ public final class StringListImpl extends AbstractList implements StringList { } return a; } - + private void toArray0(Object[] a) { if (fLength > 0) { System.arraycopy(fArray, 0, a, 0, fLength); diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java b/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java index 76a7879668..3a21fbe275 100644 --- a/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java +++ b/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java @@ -1514,6 +1514,7 @@ public interface OntModel * @param writer A writer to which the XML will be written * @return this model */ + @SuppressWarnings("deprecation") @Override public Model write( Writer writer ) ; diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java index 7d0a179eec..4018a56e33 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java @@ -161,6 +161,7 @@ public class ModelCom extends EnhGraph implements Model, PrefixMapping, Lock return this; } + @SuppressWarnings("deprecation") @Override public RDFReaderI getReader(String lang) { return readerFactory.getReader(lang); @@ -215,11 +216,13 @@ public class ModelCom extends EnhGraph implements Model, PrefixMapping, Lock /** * Get the model's writer after priming it with the model's namespace prefixes. */ + @SuppressWarnings("deprecation") @Override public RDFWriterI getWriter(String lang) { return writerFactory.getWriter(lang); } + @SuppressWarnings("deprecation") @Override public Model write(Writer writer) { getWriter(null).write(this, writer, ""); diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java index 1ae13621af..72084a18b4 100755 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java @@ -216,6 +216,7 @@ public class BasicForwardRuleReasoner implements Reasoner { * Return the Jena Graph Capabilities that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java index 566b169d21..64d02cc05a 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java @@ -408,6 +408,7 @@ public class FBRuleReasoner implements RuleReasoner { * Return the Jena Graph Capabilities that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java index b847be1f06..bdabeed3db 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java @@ -221,6 +221,7 @@ public class LPBackwardRuleReasoner implements Reasoner { * Return the Jena Graph Capabilties that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java index a31f37d03e..8a5720364e 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java @@ -69,6 +69,7 @@ public class OWLMicroReasoner extends GenericRuleReasoner implements Reasoner { * Return the Jena Graph Capabilities that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java index 46a270012a..0e7116efea 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java @@ -82,6 +82,7 @@ public class OWLMiniReasoner extends GenericRuleReasoner implements Reasoner { * Return the Jena Graph Capabilties that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSFBRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSFBRuleReasoner.java index c40cf5016f..1bddbda400 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSFBRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSFBRuleReasoner.java @@ -55,6 +55,7 @@ public class RDFSFBRuleReasoner extends FBRuleReasoner { * Return the Jena Graph Capabilities that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSForwardRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSForwardRuleReasoner.java index 6d43a74e67..3b8c334b90 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSForwardRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSForwardRuleReasoner.java @@ -62,6 +62,7 @@ public class RDFSForwardRuleReasoner extends GenericRuleReasoner { * Return the Jena Graph Capabilities that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSRuleReasoner.java index 7ddf0c695b..1c10672ddf 100755 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/RDFSRuleReasoner.java @@ -210,6 +210,7 @@ public class RDFSRuleReasoner extends GenericRuleReasoner { * Return the Jena Graph Capabilities that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java index b7ee9aa8de..9a8f6d3855 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java @@ -239,6 +239,7 @@ public class TransitiveReasoner implements Reasoner { * Return the Jena Graph Capabilties that the inference graphs generated * by this reasoner are expected to conform to. */ + @Deprecated @Override public Capabilities getGraphCapabilities() { return BaseInfGraph.reasonerInfCapabilities; diff --git a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java index f089418e23..0ea439ff6a 100644 --- a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java +++ b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java @@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory ; * @see LocationMapper * @see FileUtils */ - +@SuppressWarnings("deprecation") public class FileManagerImpl implements FileManager { // The case of the FileManager used first. @@ -124,7 +124,6 @@ public class FileManagerImpl implements FileManager public FileManager clone() { return clone(this) ; } // Isolate to help avoid copy errors. - @SuppressWarnings("deprecation") private static FileManager clone(FileManagerImpl filemanager) { FileManagerImpl newFm = new FileManagerImpl() ; newFm.fmHandlers.addAll(filemanager.fmHandlers) ; diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java b/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java index ade01af2f0..e00fe87406 100644 --- a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java +++ b/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java @@ -83,11 +83,13 @@ public class JCR_Graph implements Graph, JenaGraph { return graph.size(); } + @Deprecated @Override public Stream<? extends Triple> getTriples() { return getTriples(null, null, null); } + @Deprecated @Override public Stream<? extends Triple> getTriples(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) { Iterator<org.apache.jena.graph.Triple> iter = graph.find(toJenaAny(subject),toJenaAny(predicate),toJenaAny(object)); diff --git a/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/IOModel.java b/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/IOModel.java index cdf331c20c..2033601bf7 100644 --- a/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/IOModel.java +++ b/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/IOModel.java @@ -72,6 +72,7 @@ interface IOModel<R extends Model> extends Model { * @param writer the output writer * @return this model */ + @Deprecated @Override R write(Writer writer);
