Skip to content

Commit d45f079

Browse files
cowtowncodercowtowncoder
committed
resolve last warnings wrt overrides
1 parent 1f46286 commit d45f079

25 files changed

+281
-75
lines changed

‎pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161

6262
<build>
6363
<plugins>
64-
</plugin>
6564
<plugin>
6665
<groupId>org.apache.maven.plugins</groupId>
6766
<artifactId>maven-release-plugin</artifactId>

‎src/main/java/org/codehaus/stax2/ri/EmptyIterator.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ private EmptyIterator() { }
1616
@SuppressWarnings("unchecked")
1717
public static <T> Iterator<T> getInstance() { return (Iterator<T>) sInstance; }
1818

19+
@Override
1920
public boolean hasNext() { return false; }
2021

22+
@Override
2123
public Object next() {
2224
throw new java.util.NoSuchElementException();
2325
}
2426

27+
@Override
2528
public void remove()
2629
{
27-
/* The reason we do this is that we know for a fact that
28-
* it can not have been moved
29-
*/
30+
// The reason we do this is that we know for a fact that
31+
// it can not have been moved
3032
throw new IllegalStateException();
3133
}
3234
}

‎src/main/java/org/codehaus/stax2/ri/EmptyNamespaceContext.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ private EmptyNamespaceContext() { }
2525
/**********************************************************************
2626
*/
2727

28+
@Override
2829
public final String getNamespaceURI(String prefix)
2930
{
3031
/* First the known offenders; invalid args, 2 predefined xml namespace
@@ -44,6 +45,7 @@ public final String getNamespaceURI(String prefix)
4445
return null;
4546
}
4647

48+
@Override
4749
public String getPrefix(String nsURI)
4850
{
4951
/* First the known offenders; invalid args, 2 predefined xml namespace
@@ -61,6 +63,7 @@ public String getPrefix(String nsURI)
6163
return null;
6264
}
6365

66+
@Override
6467
public Iterator<String> getPrefixes(String nsURI)
6568
{
6669
/* First the known offenders; invalid args, 2 predefined xml namespace

‎src/main/java/org/codehaus/stax2/ri/SingletonIterator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ public static <T> SingletonIterator<T> create(T value) {
2121
return new SingletonIterator<T>(value);
2222
}
2323

24+
@Override
2425
public boolean hasNext() {
2526
return !_done;
2627
}
2728

29+
@Override
2830
public T next() {
2931
if (_done) {
3032
throw new java.util.NoSuchElementException();
@@ -33,6 +35,7 @@ public T next() {
3335
return _value;
3436
}
3537

38+
@Override
3639
public void remove()
3740
{
3841
throw new UnsupportedOperationException("Can not remove item from SingletonIterator.");

‎src/main/java/org/codehaus/stax2/ri/Stax2LocationAdapter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,39 @@ public Stax2LocationAdapter(Location loc, Location parent)
2929

3030
// // // Basic Stax 1.0 implementation
3131

32+
@Override
3233
public int getCharacterOffset()
3334
{
3435
return mWrappedLocation.getCharacterOffset();
3536
}
3637

38+
@Override
3739
public int getColumnNumber()
3840
{
3941
return mWrappedLocation.getColumnNumber();
4042
}
4143

44+
@Override
4245
public int getLineNumber()
4346
{
4447
return mWrappedLocation.getLineNumber();
4548
}
4649

50+
@Override
4751
public String getPublicId()
4852
{
4953
return mWrappedLocation.getPublicId();
5054
}
5155

56+
@Override
5257
public String getSystemId()
5358
{
5459
return mWrappedLocation.getSystemId();
5560
}
5661

5762
// // // And stax2 additions
5863

64+
@Override
5965
public XMLStreamLocation2 getContext()
6066
{
6167
if (mParentLocation == null) {

‎src/main/java/org/codehaus/stax2/ri/Stax2WriterImpl.java

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ protected Stax2WriterImpl() { }
4141
///////////////////////////////////////////////////////////
4242
*/
4343

44+
@Override
4445
public boolean isPropertySupported(String name)
4546
{
4647
/* No base properties (or should we have something for impl
@@ -49,23 +50,28 @@ public boolean isPropertySupported(String name)
4950
return false;
5051
}
5152

53+
@Override
5254
public boolean setProperty(String name, Object value)
5355
{
5456
throw new IllegalArgumentException("No settable property '"+name+"'");
5557
}
5658

59+
@Override
5760
public abstract XMLStreamLocation2 getLocation();
5861

62+
@Override
5963
public abstract String getEncoding();
6064

65+
@Override
6166
public void writeCData(char[] text, int start, int len)
6267
throws XMLStreamException
6368
{
6469
writeCData(new String(text, start, len));
6570
}
6671

72+
@Override
6773
public void writeDTD(String rootName, String systemId, String publicId,
68-
String internalSubset)
74+
String internalSubset)
6975
throws XMLStreamException
7076
{
7177
/* This may or may not work... depending on how well underlying
@@ -95,8 +101,8 @@ public void writeDTD(String rootName, String systemId, String publicId,
95101
writeDTD(sb.toString());
96102
}
97103

98-
public void writeFullEndElement()
99-
throws XMLStreamException
104+
@Override
105+
public void writeFullEndElement() throws XMLStreamException
100106
{
101107
/* This should work with base Stax 1.0 implementations.
102108
* Sub-classes are, however, encouraged to implement it
@@ -106,8 +112,8 @@ public void writeFullEndElement()
106112
writeEndElement();
107113
}
108114

109-
public void writeSpace(String text)
110-
throws XMLStreamException
115+
@Override
116+
public void writeSpace(String text) throws XMLStreamException
111117
{
112118
/* Hmmh. Two choices: either try to write as regular characters,
113119
* or output as is via raw calls. Latter would be safer, if we
@@ -117,15 +123,17 @@ public void writeSpace(String text)
117123
writeRaw(text);
118124
}
119125

126+
@Override
120127
public void writeSpace(char[] text, int offset, int length)
121128
throws XMLStreamException
122129
{
123130
// See comments above...
124131
writeRaw(text, offset, length);
125132
}
126133

134+
@Override
127135
public abstract void writeStartDocument(String version, String encoding,
128-
boolean standAlone)
136+
boolean standAlone)
129137
throws XMLStreamException;
130138

131139
/*
@@ -134,18 +142,19 @@ public abstract void writeStartDocument(String version, String encoding,
134142
///////////////////////////////////////////////////////////
135143
*/
136144

137-
public void writeRaw(String text)
138-
throws XMLStreamException
145+
@Override
146+
public void writeRaw(String text) throws XMLStreamException
139147
{
140148
writeRaw(text, 0, text.length());
141149
}
142150

143-
public abstract void writeRaw(String text, int offset, int len)
144-
throws XMLStreamException;
151+
@Override
152+
public abstract void writeRaw(String text, int offset, int len) throws XMLStreamException;
145153

146-
public abstract void writeRaw(char[] text, int offset, int length)
147-
throws XMLStreamException;
154+
@Override
155+
public abstract void writeRaw(char[] text, int offset, int length) throws XMLStreamException;
148156

157+
@Override
149158
public void copyEventFromReader(XMLStreamReader2 sr, boolean preserveEventData)
150159
throws XMLStreamException
151160
{
@@ -243,24 +252,28 @@ public void copyEventFromReader(XMLStreamReader2 sr, boolean preserveEventData)
243252
///////////////////////////////////////////////////////////
244253
*/
245254

255+
@Override
246256
public XMLValidator validateAgainst(XMLValidationSchema schema)
247257
throws XMLStreamException
248258
{
249259
throw new UnsupportedOperationException("Not yet implemented");
250260
}
251261

262+
@Override
252263
public XMLValidator stopValidatingAgainst(XMLValidationSchema schema)
253264
throws XMLStreamException
254265
{
255266
return null;
256267
}
257268

269+
@Override
258270
public XMLValidator stopValidatingAgainst(XMLValidator validator)
259271
throws XMLStreamException
260272
{
261273
return null;
262274
}
263275

276+
@Override
264277
public ValidationProblemHandler setValidationProblemHandler(ValidationProblemHandler h)
265278
{
266279
/* Not a real problem: although we can't do anything with it

‎src/main/java/org/codehaus/stax2/ri/dom/DOMWrappingReader.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,23 +2133,25 @@ public XMLValidator stopValidatingAgainst(XMLValidationSchema schema)
21332133
return null;
21342134
}
21352135

2136+
@Override
21362137
public XMLValidator stopValidatingAgainst(XMLValidator validator)
21372138
throws XMLStreamException
21382139
{
21392140
// Not implemented by the basic reader:
21402141
return null;
21412142
}
21422143

2144+
@Override
21432145
public ValidationProblemHandler setValidationProblemHandler(ValidationProblemHandler h)
21442146
{
21452147
// Not implemented by the basic reader
21462148
return null;
21472149
}
21482150

21492151
/*
2150-
////////////////////////////////////////////
2151-
// Internal methods, text gathering
2152-
////////////////////////////////////////////
2152+
/**********************************************************************
2153+
/* Internal methods, text gathering
2154+
/**********************************************************************
21532155
*/
21542156

21552157
protected void coalesceText(int initialType)
@@ -2285,9 +2287,9 @@ private String _safeGetLocalName(Node n)
22852287
}
22862288

22872289
/*
2288-
///////////////////////////////////////////////
2289-
// Overridable error reporting methods
2290-
///////////////////////////////////////////////
2290+
/**********************************************************************
2291+
/* Overridable error reporting methods
2292+
/**********************************************************************
22912293
*/
22922294

22932295
protected void reportWrongState(int errorType)
@@ -2347,9 +2349,9 @@ protected TypedXMLStreamException _constructTypeException(String msg, String lex
23472349
}
23482350

23492351
/*
2350-
///////////////////////////////////////////////
2351-
// Other internal methods
2352-
///////////////////////////////////////////////
2352+
/**********************************************************************
2353+
/* Other internal methods
2354+
/**********************************************************************
23532355
*/
23542356

23552357
protected ValueDecoderFactory _decoderFactory()

‎src/main/java/org/codehaus/stax2/ri/evt/AttributeEventImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,27 @@ public void writeUsing(XMLStreamWriter2 w) throws XMLStreamException
9696
///////////////////////////////////////////
9797
*/
9898

99+
@Override
99100
public String getDTDType() {
100101
/* !!! TBI: 07-Sep-2004, TSa: Need to figure out an efficient way
101102
* to pass this info...
102103
*/
103104
return "CDATA";
104105
}
105106

107+
@Override
106108
public QName getName()
107109
{
108110
return mName;
109111
}
110112

113+
@Override
111114
public String getValue()
112115
{
113116
return mValue;
114117
}
115118

119+
@Override
116120
public boolean isSpecified()
117121
{
118122
return mWasSpecified;

‎src/main/java/org/codehaus/stax2/ri/evt/CharactersEventImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,22 @@ public void writeUsing(XMLStreamWriter2 w) throws XMLStreamException
111111
///////////////////////////////////////////
112112
*/
113113

114+
@Override
114115
public String getData() {
115116
return mContent;
116117
}
117118

119+
@Override
118120
public boolean isCData() {
119121
return mIsCData;
120122
}
121123

124+
@Override
122125
public boolean isIgnorableWhiteSpace() {
123126
return mIgnorableWS;
124127
}
125128

129+
@Override
126130
public boolean isWhiteSpace() {
127131
// Better only do white space check, if it's done already...
128132
if (!mWhitespaceChecked) {

‎src/main/java/org/codehaus/stax2/ri/evt/CommentEventImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public CommentEventImpl(Location loc, String content)
2020
mContent = content;
2121
}
2222

23+
@Override
2324
public String getText()
2425
{
2526
return mContent;

0 commit comments

Comments
 (0)