svn commit: r979879 - /openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java

[dwoods]

Author: dwoods
Date: Tue Jul 27 21:46:40 2010
New Revision: 979879

URL: http://svn.apache.org/viewvc?rev=979879&view=rev
Log:
OPENJPA-1747 remove Java 1.6 specific code, but tests still fail under 1.5 due 
to a JAXP error

Modified:
    
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java

Modified: 
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java
URL: 
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java?rev=979879&r1=979878&r2=979879&view=diff
==============================================================================
--- 
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java
 (original)
+++ 
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java
 Tue Jul 27 21:46:40 2010
@@ -171,7 +171,7 @@ public interface Actions {//extends Comp
          */
         protected String getAttribute(String attrName, String defValue) {
             if (!original.hasAttribute(attrName)) {
-                if (defValue == null || defValue.isEmpty()) {
+                if (defValue == null || defValue.trim().length() == 0) {
                     throw new IllegalArgumentException(this + " requires the 
input element must " +
                         " have an attribute [" + attrName + "] or defaulted by 
the value of [" +
                         defValue + "]");
@@ -348,7 +348,7 @@ public interface Actions {//extends Comp
             consumedAttrs.add(sourceName);
             Element newElement = targetDoc.createElement(targetName);
             String sourceAttrValue = source.getAttribute(sourceName);
-            if (targetAttrName.isEmpty()) {
+            if (targetAttrName.trim().length() == 0) {
                 String targetAttrValue = _valueMap.containsKey(sourceAttrValue)
                     ? _valueMap.get(sourceAttrValue) : sourceAttrValue;
                 newElement.setTextContent(targetAttrValue);