Author: sagara
Date: Sat Aug 25 04:41:04 2012
New Revision: 1377209
URL: http://svn.apache.org/viewvc?rev=1377209&view=rev
Log:
Fixed build failure. Please make sure to build using Java5 before submit
patches. It's not hard to avoid these simple mistakes.
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamWriter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JSONMessageHandler.java
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java?rev=1377209&r1=1377208&r2=1377209&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
Sat Aug 25 04:41:04 2012
@@ -136,12 +136,12 @@ public class GsonXMLStreamReader impleme
isProcessed = true;
}
- @Override
+
public Object getProperty(String name) throws IllegalArgumentException {
return null;
}
- @Override
+
public int next() throws XMLStreamException {
if (hasNext()) {
try {
@@ -155,22 +155,22 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public void require(int type, String namespaceURI, String localName)
throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getElementText() throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public int nextTag() throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public boolean hasNext() throws XMLStreamException {
try {
tokenType = jsonReader.peek();
@@ -184,12 +184,12 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public void close() throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getNamespaceURI(String prefix) {
if (isStartElement() || isEndElement()) {
return namespace;
@@ -198,7 +198,7 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public boolean isStartElement() {
if (state == JsonState.NameName
|| state == JsonState.NameValue
@@ -210,7 +210,7 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public boolean isEndElement() {
if (state == JsonState.ValueValue_START
|| state == JsonState.EndArrayName
@@ -226,7 +226,7 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public boolean isCharacters() {
if (state == JsonState.ValueValue_END
|| state == JsonState.ValueEndArray
@@ -239,17 +239,17 @@ public class GsonXMLStreamReader impleme
}
- @Override
+
public boolean isWhiteSpace() {
return false;
}
- @Override
+
public String getAttributeValue(String namespaceURI, String localName) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public int getAttributeCount() {
if (isStartElement()) {
return 0; // don't support attributes on tags in JSON convention
@@ -258,42 +258,42 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public QName getAttributeName(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getAttributeNamespace(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getAttributeLocalName(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getAttributePrefix(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getAttributeType(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getAttributeValue(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public boolean isAttributeSpecified(int index) {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public int getNamespaceCount() {
if (isStartElement() || isEndElement()) {
return 1; // we have one default namesapce
@@ -302,7 +302,7 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public String getNamespacePrefix(int index) {
if (isStartElement() || isEndElement()) {
return null;
@@ -311,7 +311,7 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public String getNamespaceURI(int index) {
if (isStartElement() || isEndElement()) {
return namespace;
@@ -320,12 +320,12 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public NamespaceContext getNamespaceContext() {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public int getEventType() {
if (state == JsonState.StartState) {
return START_DOCUMENT;
@@ -343,7 +343,7 @@ public class GsonXMLStreamReader impleme
}
- @Override
+
public String getText() {
if (isCharacters()) {
return value;
@@ -352,7 +352,7 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public char[] getTextCharacters() {
if (isCharacters()) {
if (value == null) {
@@ -365,27 +365,27 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public int getTextCharacters(int sourceStart, char[] target, int
targetStart, int length) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public int getTextStart() {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public int getTextLength() {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getEncoding() {
return null;
}
- @Override
+
public boolean hasText() {
if (isCharacters()) {
return true;
@@ -394,37 +394,37 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public Location getLocation() {
return new Location() { // Location is unKnown
- @Override
+
public int getLineNumber() {
return -1;
}
- @Override
+
public int getColumnNumber() {
return -1;
}
- @Override
+
public int getCharacterOffset() {
return 0; //To change body of implemented methods use File |
Settings | File Templates.
}
- @Override
+
public String getPublicId() {
return null; //To change body of implemented methods use File
| Settings | File Templates.
}
- @Override
+
public String getSystemId() {
return null; //To change body of implemented methods use File
| Settings | File Templates.
}
};
}
- @Override
+
public QName getName() {
if (isStartElement() || isEndElement()) {
return new QName(namespace, localName);
@@ -434,7 +434,7 @@ public class GsonXMLStreamReader impleme
}
- @Override
+
public String getLocalName() {
int i = getEventType();
if (i == XMLStreamReader.START_ELEMENT || i ==
XMLStreamReader.END_ELEMENT) {
@@ -444,12 +444,12 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public boolean hasName() {
return (isStartElement() || isEndElement());
}
- @Override
+
public String getNamespaceURI() {
if (isStartElement() || isEndElement()) {
return namespace;
@@ -458,37 +458,37 @@ public class GsonXMLStreamReader impleme
}
}
- @Override
+
public String getPrefix() {
return null;
}
- @Override
+
public String getVersion() {
return null;
}
- @Override
+
public boolean isStandalone() {
return false;
}
- @Override
+
public boolean standaloneSet() {
return false;
}
- @Override
+
public String getCharacterEncodingScheme() {
return null;
}
- @Override
+
public String getPITarget() {
throw new UnsupportedOperationException("Method is not implemented");
}
- @Override
+
public String getPIData() {
throw new UnsupportedOperationException("Method is not implemented");
}
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamWriter.java?rev=1377209&r1=1377208&r2=1377209&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamWriter.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamWriter.java
Sat Aug 25 04:41:04 2012
@@ -194,7 +194,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeStartElement(String localName) throws XMLStreamException {
if (!isProcessed) {
try {
@@ -298,7 +298,7 @@ public class GsonXMLStreamWriter impleme
* if the namespace URI has not been bound to a prefix and
* javax.xml.stream.isRepairingNamespaces has not been set to true
*/
- @Override
+
public void writeStartElement(String namespaceURI, String localName)
throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -312,7 +312,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeStartElement(String prefix, String localName, String
namespaceURI) throws XMLStreamException {
writeStartElement(localName);
}
@@ -326,7 +326,7 @@ public class GsonXMLStreamWriter impleme
* if the namespace URI has not been bound to a prefix and
* javax.xml.stream.isRepairingNamespaces has not been set to true
*/
- @Override
+
public void writeEmptyElement(String namespaceURI, String localName)
throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -340,7 +340,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeEmptyElement(String prefix, String localName, String
namespaceURI) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -352,7 +352,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeEmptyElement(String localName) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -365,7 +365,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeEndElement() throws XMLStreamException {
if (!isProcessed) {
try {
@@ -408,7 +408,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeEndDocument() throws XMLStreamException {
if (!isProcessed) {
try {
@@ -440,7 +440,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void close() throws XMLStreamException {
try {
jsonWriter.close();
@@ -455,7 +455,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void flush() throws XMLStreamException {
}
@@ -469,7 +469,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeAttribute(String localName, String value) throws
XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -486,7 +486,7 @@ public class GsonXMLStreamWriter impleme
* if the namespace URI has not been bound
to a prefix and
* javax.xml.stream.isRepairingNamespaces
has not been set to true
*/
- @Override
+
public void writeAttribute(String prefix, String namespaceURI, String
localName, String value) throws XMLStreamException {
// GsonXMLStreamReader doesn't write Attributes
}
@@ -502,7 +502,7 @@ public class GsonXMLStreamWriter impleme
* if the namespace URI has not been bound
to a prefix and
* javax.xml.stream.isRepairingNamespaces
has not been set to true
*/
- @Override
+
public void writeAttribute(String namespaceURI, String localName, String
value) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -518,7 +518,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeNamespace(String prefix, String namespaceURI) throws
XMLStreamException {
}
@@ -530,7 +530,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeDefaultNamespace(String namespaceURI) throws
XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -542,7 +542,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeComment(String data) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -554,7 +554,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeProcessingInstruction(String target) throws
XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -567,7 +567,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeProcessingInstruction(String target, String data) throws
XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -579,7 +579,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeCData(String data) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -592,7 +592,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeDTD(String dtd) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -604,7 +604,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeEntityRef(String name) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -615,7 +615,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeStartDocument() throws XMLStreamException {
if (!isProcessed) {
try {
@@ -633,7 +633,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeStartDocument(String version) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -650,7 +650,7 @@ public class GsonXMLStreamWriter impleme
* If given encoding does not match encoding
* of the underlying stream
*/
- @Override
+
public void writeStartDocument(String encoding, String version) throws
XMLStreamException {
if (!isProcessed) {
xmlNodeGenerator.getMainXmlNode();
@@ -666,7 +666,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeCharacters(String text) throws XMLStreamException {
if (!isProcessed) {
try {
@@ -706,7 +706,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void writeCharacters(char[] text, int start, int len) throws
XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -718,7 +718,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public String getPrefix(String uri) throws XMLStreamException {
return uriPrefixMap.get(uri);
}
@@ -734,7 +734,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void setPrefix(String prefix, String uri) throws XMLStreamException
{
uriPrefixMap.put(uri, prefix);
}
@@ -750,7 +750,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void setDefaultNamespace(String uri) throws XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -771,7 +771,7 @@ public class GsonXMLStreamWriter impleme
* @throws javax.xml.stream.XMLStreamException
*
*/
- @Override
+
public void setNamespaceContext(NamespaceContext context) throws
XMLStreamException {
throw new UnsupportedOperationException("Method is not implemented");
}
@@ -781,7 +781,7 @@ public class GsonXMLStreamWriter impleme
*
* @return the current NamespaceContext
*/
- @Override
+
public NamespaceContext getNamespaceContext() {
return null;
}
@@ -794,7 +794,7 @@ public class GsonXMLStreamWriter impleme
* @throws IllegalArgumentException if the property is not supported
* @throws NullPointerException if the name is null
*/
- @Override
+
public Object getProperty(String name) throws IllegalArgumentException {
return null;
}
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JSONMessageHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JSONMessageHandler.java?rev=1377209&r1=1377208&r2=1377209&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JSONMessageHandler.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JSONMessageHandler.java
Sat Aug 25 04:41:04 2012
@@ -55,7 +55,7 @@ public class JSONMessageHandler extends
* the next step in the message processing should be.
* @throws org.apache.axis2.AxisFault if the handler encounters an error
*/
- @Override
+
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
MessageReceiver messageReceiver =
msgContext.getAxisOperation().getMessageReceiver();
if (messageReceiver instanceof JsonRpcMessageReceiver) {
