You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/02/25 21:14:45 UTC
svn commit: r511588 [6/8] - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: ./
addressing/ addressing/wsdl/ builder/ client/ context/ dataretrieval/
dataretrieval/client/ deployment/ deployment/resolver/ deployment/util/
descripti...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java Sun Feb 25 12:14:38 2007
@@ -16,8 +16,6 @@
package org.apache.axis2.util;
-import java.util.HashMap;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axis2.AxisFault;
@@ -27,6 +25,8 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.MessageReceiver;
+import java.util.HashMap;
+
/**
* This is a MessageReceiver which is used on the client side to accept the
* messages (response) that come to the client. This correlates the incoming message to
@@ -44,8 +44,7 @@
callbackStore.put(MsgID, callback);
}
- public Callback lookupCallback(String msgID)
- {
+ public Callback lookupCallback(String msgID) {
return (Callback)callbackStore.get(msgID);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOption.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOption.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOption.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOption.java Sun Feb 25 12:14:38 2007
@@ -34,8 +34,12 @@
private void setOptionType(String type) {
//cater for the long options first
- if (type.startsWith("--")) type = type.replaceFirst("--", "");
- if (type.startsWith("-")) type = type.replaceFirst("-", "");
+ if (type.startsWith("--")) {
+ type = type.replaceFirst("--", "");
+ }
+ if (type.startsWith("-")) {
+ type = type.replaceFirst("-", "");
+ }
//we do not change the case of the option!
@@ -67,12 +71,12 @@
* @return Returns the optionValues.
*/
public String getOptionValue() {
- if (optionValues != null)
+ if (optionValues != null) {
return (String) optionValues.get(0);
- else
+ } else {
return null;
}
-
+ }
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionParser.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionParser.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionParser.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionParser.java Sun Feb 25 12:14:38 2007
@@ -49,8 +49,9 @@
private Map parse(String[] args) {
Map commandLineOptions = new HashMap();
- if (0 == args.length)
+ if (0 == args.length) {
return commandLineOptions;
+ }
//State 0 means started
//State 1 means earlier one was a new -option
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ExternalPolicySerializer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ExternalPolicySerializer.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ExternalPolicySerializer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ExternalPolicySerializer.java Sun Feb 25 12:14:38 2007
@@ -15,18 +15,17 @@
*/
package org.apache.axis2.util;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Constants;
+import org.apache.neethi.Policy;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.Assertion;
-import org.apache.neethi.Constants;
-import org.apache.neethi.Policy;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
public class ExternalPolicySerializer {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java Sun Feb 25 12:14:38 2007
@@ -16,10 +16,11 @@
package org.apache.axis2.util;
import java.text.Collator;
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Locale;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Locale;
+
/**
* JavaUtils
*/
@@ -46,17 +47,20 @@
"while"
};
- /** Collator for comparing the strings */
+ /**
+ * Collator for comparing the strings
+ */
static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
- /** Use this character as suffix */
+ /**
+ * Use this character as suffix
+ */
static final char keywordPrefix = '_';
/**
* Is this an XML punctuation character?
*/
- private static boolean isPunctuation(char c)
- {
+ private static boolean isPunctuation(char c) {
return '-' == c
|| '.' == c
|| ':' == c
@@ -68,6 +72,7 @@
/**
* Checks if the input string is a valid java keyword.
+ *
* @return Returns boolean.
*/
public static boolean isJavaKeyword(String keyword) {
@@ -85,8 +90,9 @@
* @return
*/
public static boolean hasUpperCase(String word) {
- if (word == null)
+ if (word == null) {
return false;
+ }
int len = word.length();
for (int i = 0; i < len; i++) {
if (Character.isUpperCase(word.charAt(i))) {
@@ -106,8 +112,9 @@
public static String xmlNameToJava(String name) {
// protect ourselves from garbage
- if (name == null || name.length() == 0)
+ if (name == null || name.length() == 0) {
return name;
+ }
char[] nameArray = name.toCharArray();
int nameLen = name.length();
@@ -128,14 +135,12 @@
result.append(nameArray[i]);
//wordStart = !Character.isLetter(nameArray[i]);
wordStart = !Character.isLetter(nameArray[i]) && nameArray[i] != "_".charAt(0);
- }
- else {
+ } else {
// The identifier cannot be mapped strictly according to
// JSR 101
if (Character.isJavaIdentifierPart(nameArray[0])) {
result.append("_").append(nameArray[0]);
- }
- else {
+ } else {
// The XML identifier does not contain any characters
// we can map to Java. Using the length of the string
// will make it somewhat unique.
@@ -159,8 +164,7 @@
}
if (wordStart && Character.isLowerCase(c)) {
result.append(Character.toUpperCase(c));
- }
- else {
+ } else {
result.append(c);
}
// If c is not a character, but is a legal Java
@@ -174,8 +178,9 @@
String newName = result.toString();
// check for Java keywords
- if (isJavaKeyword(newName))
+ if (isJavaKeyword(newName)) {
newName = makeNonJavaKeyword(newName);
+ }
return newName;
} // xmlNameToJava
@@ -205,6 +210,7 @@
/**
* converts an xml name to a java identifier
+ *
* @param name
* @return java identifier
*/
@@ -222,7 +228,7 @@
/**
* Tests the String 'value':
* return 'false' if its 'false', '0', or 'no' - else 'true'
- *
+ * <p/>
* Follow in 'C' tradition of boolean values:
* false is specific (0), everything else is true;
*/
@@ -250,7 +256,9 @@
* All other types return 'true'
*/
public static final boolean isTrueExplicitly(Object value, boolean defaultVal) {
- if ( value == null ) return defaultVal;
+ if (value == null) {
+ return defaultVal;
+ }
if ( value instanceof Boolean ) {
return ((Boolean)value).booleanValue();
}
@@ -286,7 +294,7 @@
/**
* Tests the String 'value':
* return 'true' if its 'false', '0', or 'no' - else 'false'
- *
+ * <p/>
* Follow in 'C' tradition of boolean values:
* false is specific (0), everything else is true;
*/
@@ -314,7 +322,9 @@
* All other types return 'false'
*/
public static final boolean isFalseExplicitly(Object value, boolean defaultVal) {
- if ( value == null ) return defaultVal;
+ if (value == null) {
+ return defaultVal;
+ }
if ( value instanceof Boolean ) {
return !((Boolean)value).booleanValue();
}
@@ -348,13 +358,17 @@
}
public static boolean isJavaId(String id) {
- if (id == null || id.length() == 0 || isJavaKeyword(id))
+ if (id == null || id.length() == 0 || isJavaKeyword(id)) {
return false;
- if (!Character.isJavaIdentifierStart(id.charAt(0)))
+ }
+ if (!Character.isJavaIdentifierStart(id.charAt(0))) {
return false;
- for (int i=1; i<id.length(); i++)
- if (!Character.isJavaIdentifierPart(id.charAt(i)))
+ }
+ for (int i = 1; i < id.length(); i++) {
+ if (!Character.isJavaIdentifierPart(id.charAt(i))) {
return false;
+ }
+ }
return true;
}
@@ -416,24 +430,24 @@
return (String[]) list.toArray(new String[list.size()]);
}
- public static Class getWrapperClass(Class primitive)
- {
- if (primitive == int.class)
+ public static Class getWrapperClass(Class primitive) {
+ if (primitive == int.class) {
return java.lang.Integer.class;
- else if (primitive == short.class)
+ } else if (primitive == short.class) {
return java.lang.Short.class;
- else if (primitive == boolean.class)
+ } else if (primitive == boolean.class) {
return java.lang.Boolean.class;
- else if (primitive == byte.class)
+ } else if (primitive == byte.class) {
return java.lang.Byte.class;
- else if (primitive == long.class)
+ } else if (primitive == long.class) {
return java.lang.Long.class;
- else if (primitive == double.class)
+ } else if (primitive == double.class) {
return java.lang.Double.class;
- else if (primitive == float.class)
+ } else if (primitive == float.class) {
return java.lang.Float.class;
- else if (primitive == char.class)
+ } else if (primitive == char.class) {
return java.lang.Character.class;
+ }
return null;
}
@@ -443,8 +457,7 @@
* comparing characters.
*
* @param string
- * @param search
- * If test is empty -1 is always returned.
+ * @param search If test is empty -1 is always returned.
* @return -1 if the string was not found or the index of the first matching
* character
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java Sun Feb 25 12:14:38 2007
@@ -17,13 +17,13 @@
package org.apache.axis2.util;
+import org.apache.axis2.java.security.AccessController;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.java.security.AccessController;
-import java.security.PrivilegedAction;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
+import java.security.PrivilegedAction;
/**
* Loads resources (or images) from various sources.
@@ -127,9 +127,10 @@
try {
if(loader != null) {
Class c = loader.loadClass(clazz);
- if (c != null)
+ if (c != null) {
return c;
}
+ }
} catch (Throwable e) {
log.debug(e);
}
@@ -152,8 +153,9 @@
if(tcl != null) {
Class c = tcl.loadClass(clazz);
- if (c != null)
+ if (c != null) {
return c;
+ }
}
} catch (Throwable e) {
log.debug(e);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Sun Feb 25 12:14:38 2007
@@ -40,7 +40,11 @@
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
@@ -130,10 +134,11 @@
if (axisService != null && Constants.SCOPE_SOAP_SESSION.equals(axisService.getScope())) {
//If the wsa 2004/08 (submission) spec is in effect use the wsa anonymous URI as the default replyTo value.
//This is necessary because the wsa none URI is not available in that spec.
- if (AddressingConstants.Submission.WSA_NAMESPACE.equals(inMessageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION)))
+ if (AddressingConstants.Submission.WSA_NAMESPACE.equals(inMessageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION))) {
newmsgCtx.setReplyTo(new EndpointReference(AddressingConstants.Submission.WSA_ANONYMOUS_URL));
- else
+ } else {
newmsgCtx.setReplyTo(new EndpointReference(AddressingConstants.Final.WSA_NONE_URI));
+ }
newmsgCtx.setMessageID(UUIDGenerator.getUUID());
@@ -187,11 +192,9 @@
// See if the throwable is an AxisFault and if it already contains the
// fault MessageContext
- if (e instanceof AxisFault)
- {
+ if (e instanceof AxisFault) {
MessageContext faultMessageContext = ((AxisFault)e).getFaultMessageContext();
- if (faultMessageContext != null)
- {
+ if (faultMessageContext != null) {
// These may not have been set correctly when the original context
// was created -- an example of this is with the SimpleHTTPServer.
// I'm not sure if this is the correct thing to do, or if the
@@ -217,8 +220,7 @@
}
// Register the fault message context
- if (processingContext.getAxisOperation() != null && processingContext.getOperationContext() != null)
- {
+ if (processingContext.getAxisOperation() != null && processingContext.getOperationContext() != null) {
processingContext.getAxisOperation().addFaultMessageContext(faultContext, processingContext.getOperationContext());
}
@@ -410,8 +412,7 @@
} else if (axisFault != null) {
Map faultElementsMap = axisFault.getFaultElements();
- if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME) != null)
- {
+ if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME) != null) {
fault.setCode((SOAPFaultCode) faultElementsMap.get(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME));
} else {
QName faultCodeQName = axisFault.getFaultCode();
@@ -448,8 +449,7 @@
message = soapException.getMessage();
} else if (axisFault != null) {
Map faultElementsMap = axisFault.getFaultElements();
- if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME) != null)
- {
+ if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME) != null) {
fault.setReason((SOAPFaultReason) faultElementsMap.get(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME));
} else {
message = axisFault.getReason();
@@ -474,8 +474,7 @@
fault.getRole().setText((String) faultRole);
} else if (axisFault != null) {
Map faultElementsMap = axisFault.getFaultElements();
- if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME) != null)
- {
+ if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME) != null) {
fault.setRole((SOAPFaultRole) faultElementsMap.get(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME));
}
}
@@ -485,8 +484,7 @@
fault.getNode().setText((String) faultNode);
} else if (axisFault != null) {
Map faultElementsMap = axisFault.getFaultElements();
- if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME) != null)
- {
+ if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME) != null) {
fault.setNode((SOAPFaultNode) faultElementsMap.get(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME));
}
}
@@ -513,8 +511,7 @@
fault.setDetail((SOAPFaultDetail) faultDetail);
} else if (axisFault != null) {
Map faultElementsMap = axisFault.getFaultElements();
- if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME) != null)
- {
+ if (faultElementsMap != null && faultElementsMap.get(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME) != null) {
fault.setDetail((SOAPFaultDetail) faultElementsMap.get(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME));
} else {
OMElement detail = axisFault.getDetail();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java Sun Feb 25 12:14:38 2007
@@ -16,35 +16,19 @@
package org.apache.axis2.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.xml.namespace.QName;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.ObjectInputStream;
import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
/**
* An internal class for holding a set of information
* about an object.
*/
-public class MetaDataEntry implements Externalizable
-{
+public class MetaDataEntry implements Externalizable {
// serialization identifier
private static final long serialVersionUID = 8978361069526299875L;
@@ -69,15 +53,13 @@
/**
* Simple constructor
*/
- public MetaDataEntry()
- {
+ public MetaDataEntry() {
}
/**
* Constructor
*/
- public MetaDataEntry(String c, String n)
- {
+ public MetaDataEntry(String c, String n) {
className = c;
qnameAsString = n;
}
@@ -85,8 +67,7 @@
/**
* Constructor
*/
- public MetaDataEntry(String c, String n, String e)
- {
+ public MetaDataEntry(String c, String n, String e) {
className = c;
qnameAsString = n;
extraName = e;
@@ -95,8 +76,7 @@
/**
* Constructor
*/
- public MetaDataEntry(String c, String n, ArrayList l)
- {
+ public MetaDataEntry(String c, String n, ArrayList l) {
className = c;
qnameAsString = n;
list = l;
@@ -108,8 +88,7 @@
*
* @return the class name string
*/
- public String getClassName()
- {
+ public String getClassName() {
return className;
}
@@ -119,8 +98,7 @@
*
* @param c the class name string
*/
- public void setClassName(String c)
- {
+ public void setClassName(String c) {
className = c;
}
@@ -130,14 +108,10 @@
*
* @return the QName based on the qnameAsString value
*/
- public QName getQName()
- {
- if (qnameAsString != null)
- {
+ public QName getQName() {
+ if (qnameAsString != null) {
return QName.valueOf(qnameAsString);
- }
- else
- {
+ } else {
return null;
}
}
@@ -148,14 +122,10 @@
*
* @param q the QName
*/
- public void setQName(QName q)
- {
- if (q != null)
- {
+ public void setQName(QName q) {
+ if (q != null) {
qnameAsString = q.toString();
- }
- else
- {
+ } else {
qnameAsString = null;
}
}
@@ -165,8 +135,7 @@
*
* @param n the QName as a string
*/
- public void setQName(String n)
- {
+ public void setQName(String n) {
qnameAsString = n;
}
@@ -176,8 +145,7 @@
*
* @return the QName as a string
*/
- public String getQNameAsString()
- {
+ public String getQNameAsString() {
return qnameAsString;
}
@@ -188,8 +156,7 @@
*
* @return the name
*/
- public String getName()
- {
+ public String getName() {
return qnameAsString;
}
@@ -199,8 +166,7 @@
*
* @return the additional name string
*/
- public String getExtraName()
- {
+ public String getExtraName() {
return extraName;
}
@@ -210,8 +176,7 @@
*
* @param c the extra name string
*/
- public void setExtraName(String e)
- {
+ public void setExtraName(String e) {
extraName = e;
}
@@ -221,10 +186,8 @@
*
* @return false for a non-empty list, true for an empty list
*/
- public boolean isListEmpty()
- {
- if (list == null)
- {
+ public boolean isListEmpty() {
+ if (list == null) {
return true;
}
@@ -237,8 +200,7 @@
*
* @return the array list
*/
- public ArrayList getList()
- {
+ public ArrayList getList() {
return list;
}
@@ -248,8 +210,7 @@
*
* @param L the ArrayList of MetaDataEntry objects
*/
- public void setList(ArrayList L)
- {
+ public void setList(ArrayList L) {
list = L;
}
@@ -258,10 +219,8 @@
*
* @param e the MetaDataEntry object to add to the list
*/
- public void addToList(MetaDataEntry e)
- {
- if (list == null)
- {
+ public void addToList(MetaDataEntry e) {
+ if (list == null) {
list = new ArrayList();
}
list.add(e);
@@ -269,10 +228,8 @@
/**
* Remove the list
- *
*/
- public void removeList()
- {
+ public void removeList() {
list = null;
}
@@ -288,11 +245,9 @@
* Save the contents of this object
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
//---------------------------------------------------------
@@ -320,17 +275,15 @@
/**
* Restore the contents of the object that was
* previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// serialization version ID
long suid = in.readLong();
@@ -339,14 +292,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(UNSUPPORTED_REVID);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultiParentClassLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultiParentClassLoader.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultiParentClassLoader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultiParentClassLoader.java Sun Feb 25 12:14:38 2007
@@ -16,12 +16,10 @@
*/
package org.apache.axis2.util;
+import org.apache.commons.logging.LogFactory;
+
import java.beans.Introspector;
import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.lang.reflect.Field;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLStreamHandlerFactory;
@@ -30,9 +28,6 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.LogFactory;
/**
* A MultiParentClassLoader is a simple extension of the URLClassLoader that simply changes the single parent class
@@ -359,7 +354,9 @@
public void destroy() {
synchronized(this) {
- if (destroyed) return;
+ if (destroyed) {
+ return;
+ }
destroyed = true;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java Sun Feb 25 12:14:38 2007
@@ -1,8 +1,8 @@
package org.apache.axis2.util;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org