svn commit: r1396549 - in /cxf/trunk: api/src/main/java/org/apache/cxf/attachment/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ tools/corba/src/main/java/org/apache/cx...

[coheigea]

Author: coheigea
Date: Wed Oct 10 11:35:12 2012
New Revision: 1396549

URL: http://svn.apache.org/viewvc?rev=1396549&view=rev
Log:
More minor code improvements

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
    
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
    
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
    
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
    
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java?rev=1396549&r1=1396548&r2=1396549&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java 
Wed Oct 10 11:35:12 2012
@@ -226,7 +226,7 @@ public final class AttachmentUtil {
                 }
             }
             if (!StringUtils.isEmpty(fileName)) {
-                if (fileName.indexOf("\"") > 0) {
+                if (fileName.contains("\"")) {
                     fileName = fileName.substring(fileName.indexOf("\"") + 1, 
fileName.lastIndexOf("\""));
                 } else {
                     fileName = fileName.substring(fileName.indexOf("=") + 1);

Modified: 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=1396549&r1=1396548&r2=1396549&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 (original)
+++ 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 Wed Oct 10 11:35:12 2012
@@ -147,10 +147,6 @@ public class CorbaConduit implements Con
         }
     }
 
-    protected void finalize() throws Throwable {
-        super.finalize();
-    }
-
     public EndpointReferenceType getTarget() {
         return target;
     }

Modified: 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java?rev=1396549&r1=1396548&r2=1396549&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
 (original)
+++ 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
 Wed Oct 10 11:35:12 2012
@@ -148,7 +148,7 @@ public final class CorbaObjectReferenceH
     }
 
     public static String extractTypeIdFromIOR(String url) {        
-        String ret = new String();
+        String ret = "";
         byte data[] = DatatypeConverter.parseHexBinary(url.substring(4));
         if (data.length > 0) {
             // parse out type_id from IOR CDR encapsulation

Modified: 
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java?rev=1396549&r1=1396548&r2=1396549&view=diff
==============================================================================
--- 
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
 (original)
+++ 
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
 Wed Oct 10 11:35:12 2012
@@ -527,8 +527,7 @@ public class WSDLToIDLAction {
             result = checkAnon(corbaTypeImpl, scope, local);
         } 
         
-        if (result == null
-            && corbaTypeImpl instanceof Object) {
+        if (result == null && corbaTypeImpl != null) {
             result = createInterface(corbaTypeImpl, scope, local);            
         }
         

Modified: 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java?rev=1396549&r1=1396548&r2=1396549&view=diff
==============================================================================
--- 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
 (original)
+++ 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
 Wed Oct 10 11:35:12 2012
@@ -252,7 +252,7 @@ public class SchemaValidator extends Abs
                 try {
                     String s = file.toURI().toURL().toString();
                     xsdUrls.add(s);
-                    if (s.indexOf("http-conf") > 0) {
+                    if (s.contains("http-conf")) {
                         xsdUrls.add(0, s);
                     }
                 } catch (MalformedURLException e) {