You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2006/09/27 06:27:13 UTC
svn commit: r450309 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding:
impl/DataBindingJavaInterfaceProcessor.java impl/DirectedGraph.java
xml/DOMXMLStreamReader.java
Author: rfeng
Date: Tue Sep 26 21:27:12 2006
New Revision: 450309
URL: http://svn.apache.org/viewvc?view=rev&rev=450309
Log:
Fix PMD violations
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DirectedGraph.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java?view=diff&rev=450309&r1=450308&r2=450309
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java Tue Sep 26 21:27:12 2006
@@ -45,10 +45,12 @@
private static final String SIMPLE_JAVA_OBJECTS = "java.lang.Object";
- /**
- * @see org.apache.tuscany.spi.idl.java.JavaInterfaceProcessor#visitInterface(java.lang.Class,
- * org.apache.tuscany.spi.idl.java.JavaServiceContract)
- */
+ private final static Class[] simpleTypes =
+ { Byte.class, Character.class, Short.class, Integer.class, Long.class, Float.class, Double.class,
+ Date.class, Calendar.class, GregorianCalendar.class, Duration.class, XMLGregorianCalendar.class };
+
+ private final static Set<Class> simpleTypeSet = new HashSet<Class>(Arrays.asList(simpleTypes));
+
public void visitInterface(Class<?> clazz, JavaServiceContract contract) throws InvalidServiceContractException {
DataType interfaceDataType = clazz.getAnnotation(DataType.class);
if (interfaceDataType != null) {
@@ -72,6 +74,7 @@
String dataBinding = operation.getDataBinding();
+ // FIXME: We need a better way to identify simple java types
for (org.apache.tuscany.spi.model.DataType<?> d : operation.getInputType().getLogical()) {
adjustSimpleType(d, dataBinding);
}
@@ -84,11 +87,6 @@
}
}
- private final static Class[] simpleTypes =
- { Byte.class, Character.class, Short.class, Integer.class, Long.class, Float.class, Double.class,
- Date.class, Calendar.class, GregorianCalendar.class, Duration.class, XMLGregorianCalendar.class };
-
- private final static Set<Class> simpleTypeSet = new HashSet<Class>(Arrays.asList(simpleTypes));
private void adjustSimpleType(org.apache.tuscany.spi.model.DataType<?> dataType, String dataBinding) {
Type type = dataType.getPhysical();
@@ -98,10 +96,9 @@
Class cls = (Class) dataType.getPhysical();
if (cls.isPrimitive() || simpleTypeSet.contains(cls)) {
dataType.setDataBinding(SIMPLE_JAVA_OBJECTS);
- } else if (cls == String.class) {
- if (dataBinding == null || !dataBinding.equals(String.class.getName())) {
- dataType.setDataBinding(SIMPLE_JAVA_OBJECTS);
- }
+ } else if (cls == String.class && (dataBinding == null || !dataBinding.equals(String.class.getName()))) {
+ // Identify the String as a simple type
+ dataType.setDataBinding(SIMPLE_JAVA_OBJECTS);
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DirectedGraph.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DirectedGraph.java?view=diff&rev=450309&r1=450308&r2=450309
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DirectedGraph.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DirectedGraph.java Tue Sep 26 21:27:12 2006
@@ -152,9 +152,9 @@
private long distance = Integer.MAX_VALUE;
- private Node previous = null;
+ private Node previous = null; // NOPMD by rfeng on 9/26/06 9:17 PM
- private Vertex vertex;
+ private Vertex vertex; // NOPMD by rfeng on 9/26/06 9:17 PM
private Node(Vertex vertex) {
this.vertex = vertex;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java?view=diff&rev=450309&r1=450308&r2=450309
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java Tue Sep 26 21:27:12 2006
@@ -139,8 +139,8 @@
break;
}
}
- properties = elementList.toArray(new Map.Entry[0]);
- attributes = attributeList.toArray(new Map.Entry[0]);
+ properties = elementList.toArray(new Map.Entry[elementList.size()]);
+ attributes = attributeList.toArray(new Map.Entry[attributeList.size()]);
}
/**
@@ -583,12 +583,9 @@
public boolean hasText() {
if (state == DELEGATED_STATE) {
return childReader.hasText();
- } else if (state == TEXT_STATE) {
- return true;
- } else {
- return false;
+ } else {
+ return (state == TEXT_STATE);
}
-
}
/**
@@ -646,10 +643,8 @@
// if not we should ask the child reader for it.
if (state == DELEGATED_STATE) {
return childReader.hasName();
- } else if (state != TEXT_STATE) {
- return true;
} else {
- return false;
+ return (state != TEXT_STATE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org