You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by cz...@apache.org on 2005/08/11 14:17:14 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/util MessageElementHelper.java ParameterChecker.java
cziegeler 2005/08/11 05:17:14
Modified: src/org/apache/wsrp4j/util MessageElementHelper.java
ParameterChecker.java
Log:
Apply patch from Michel Alessandrini: don't use deprecated method
Code cleanup
Revision Changes Path
1.6 +12 -20 ws-wsrp4j/src/org/apache/wsrp4j/util/MessageElementHelper.java
Index: MessageElementHelper.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/MessageElementHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MessageElementHelper.java 10 Aug 2005 15:10:23 -0000 1.5
+++ MessageElementHelper.java 11 Aug 2005 12:17:14 -0000 1.6
@@ -40,10 +40,11 @@
*
* @version $Id$
*/
-public class MessageElementHelper implements javax.xml.rpc.encoding.SerializationContext
-{
- StringWriter writer = null;
- SerializationContext serializer = null;
+public class MessageElementHelper
+implements javax.xml.rpc.encoding.SerializationContext {
+
+ StringWriter writer;
+ SerializationContext serializer;
public static MessageElement create(Node value)
{
@@ -54,10 +55,8 @@
{
result = new MessageElement((Element)value);
return result;
- } else
- {
- throw new Exception("Trying to create a MessageElement with something other than Element");
}
+ throw new Exception("Trying to create a MessageElement with something other than Element");
} catch (Exception ex)
{
ex.printStackTrace();
@@ -115,14 +114,14 @@
}
/**
- * @see org.apache.axis.encoding.SerializationContext#serialize(QName, Attributes, Object, QName, boolean, Boolean)
+ * @see org.apache.axis.encoding.SerializationContext#serialize(QName, Attributes, Object, QName, Boolean, Boolean)
*/
public void serialize(
QName elemQName,
Attributes attributes,
Object value,
QName xmlType,
- boolean sendNull,
+ Boolean sendNull,
Boolean sendType)
throws IOException
{
@@ -143,10 +142,8 @@
if (serializer != null)
{
return serializer.setTypeAttribute(attributes, type);
- } else
- {
- return null;
}
+ return null;
}
/**
@@ -157,10 +154,8 @@
if (serializer != null)
{
return serializer.getSerializerForJavaType(javaType);
- } else
- {
- return null;
}
+ return null;
}
/**
@@ -171,11 +166,8 @@
if (serializer != null)
{
return serializer.getPretty();
- } else
- {
-
- return false;
}
+ return false;
}
/**
1.9 +3 -10 ws-wsrp4j/src/org/apache/wsrp4j/util/ParameterChecker.java
Index: ParameterChecker.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/ParameterChecker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParameterChecker.java 10 Aug 2005 15:10:23 -0000 1.8
+++ ParameterChecker.java 11 Aug 2005 12:17:14 -0000 1.9
@@ -113,16 +113,9 @@
if (isCheckEnabled())
{
// check ClonePortlet request object pointer
- if (request instanceof GetServiceDescription)
- {
-
- // check for registration context
- check(request.getRegistrationContext(), Constants.NILLABLE_TRUE);
+ // check for registration context
+ check(request.getRegistrationContext(), Constants.NILLABLE_TRUE);
- } else
- {
- throwMissingParametersFault("Input object is not from type GetServiceDescription or is null");
- }
}
}