cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r731682 - in /cxf/branches/2.1.x-fixes: ./ tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
Date Mon, 05 Jan 2009 20:11:04 GMT
Author: dkulp
Date: Mon Jan  5 12:11:03 2009
New Revision: 731682

URL: http://svn.apache.org/viewvc?rev=731682&view=rev
Log:
Merged revisions 730891 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r730891 | bimargulies | 2009-01-02 21:19:01 -0500 (Fri, 02 Jan 2009) | 2 lines
  
  CXF-1962 - checkstyle.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  5 12:11:03 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=731682&r1=731681&r2=731682&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
Mon Jan  5 12:11:03 2009
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +32,7 @@
 import java.util.logging.Level;
 
 import javax.wsdl.Definition;
+
 import org.w3c.dom.Element;
 
 import org.apache.cxf.Bus;
@@ -83,7 +83,7 @@
     public void execute() throws ToolException {
         buildToolContext();
         validate(context);
-        
+
         WSDLConstants.WSDLVersion version = getWSDLVersion();
 
         String wsdlURL = (String)context.get(ToolConstants.CFG_WSDLURL);
@@ -97,8 +97,7 @@
 
             // Build the ServiceModel from the WSDLModel
             if (version == WSDLConstants.WSDLVersion.WSDL11) {
-                AbstractWSDLBuilder<Definition> builder = (AbstractWSDLBuilder<Definition>)frontend
-                    .getWSDLBuilder();
+                AbstractWSDLBuilder<Definition> builder = frontend.getWSDLBuilder();
                 builder.setContext(context);
                 builder.setBus(getBus());
                 context.put(Bus.class, getBus());
@@ -191,16 +190,15 @@
             try {
                 pns = (String[])env.get(ToolConstants.CFG_JSPACKAGEPREFIX);
             } catch (ClassCastException e) {
-                Message msg = new Message("INVALID_PREFIX_MAPPING", LOG, 
-                                          env.get(ToolConstants.CFG_JSPACKAGEPREFIX));
+                Message msg = new Message("INVALID_PREFIX_MAPPING", LOG, env
+                    .get(ToolConstants.CFG_JSPACKAGEPREFIX));
                 throw new ToolException(msg);
             }
-            for (int j = 0; j < pns.length; j++) {
-                int pos = pns[j].indexOf("=");
-                String jsprefix = pns[j];
+            for (String jsprefix : pns) {
+                int pos = jsprefix.indexOf("=");
                 if (pos != -1) {
-                    String ns = pns[j].substring(0, pos);
-                    jsprefix = pns[j].substring(pos + 1);
+                    String ns = jsprefix.substring(0, pos);
+                    jsprefix = jsprefix.substring(pos + 1);
                     nsPrefixMap.put(ns, jsprefix);
                 }
             }
@@ -212,11 +210,9 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-            	if ( !dir.mkdirs() ) {
-                	Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
-                	throw new ToolException(msg);
-				}
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+                throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {
                 Message msg = new Message("NOT_A_DIRECTORY", LOG, outdir);
@@ -228,11 +224,9 @@
             String clsdir = (String)env.get(ToolConstants.CFG_CLASSDIR);
             if (clsdir != null) {
                 File dir = new File(clsdir);
-                if (!dir.exists()) {
-                	if ( !dir.mkdirs() ) {
-                    	Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, clsdir);
-                    	throw new ToolException(msg);
-                    }
+                if (!dir.exists() && !dir.mkdirs()) {
+                    Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, clsdir);
+                    throw new ToolException(msg);
                 }
             }
         }
@@ -312,8 +306,8 @@
             throw new RuntimeException(ex);
         }
 
-        for (Iterator it = initialExtensions.values().iterator(); it.hasNext();) {
-            String validatorClass = (String)it.next();
+        for (Object element : initialExtensions.values()) {
+            String validatorClass = (String)element;
             try {
                 if (LOG.isLoggable(Level.FINE)) {
                     LOG.fine("Found service validator : " + validatorClass);



Mime
View raw message