cvs commit: xml-axis/java/src/org/apache/axis/providers/java JavaProvider.java

[tomj]

tomj        2002/06/11 07:33:25

  Modified:    java/src/org/apache/axis/providers/java JavaProvider.java
  Log:
  Reformat code to match other Axis code and for 80 columns.
  (since I complained about it).
  
  Revision  Changes    Path
  1.60      +23 -18    
xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java
  
  Index: JavaProvider.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- JavaProvider.java 11 Jun 2002 13:26:15 -0000      1.59
  +++ JavaProvider.java 11 Jun 2002 14:33:25 -0000      1.60
  @@ -339,24 +339,29 @@
   
           try {
               String url = msgContext.getStrProp(MessageContext.TRANS_URL);
  -            String interfaceNamespace= 
msgContext.getStrProp(MessageContext.WSDLGEN_INTFNAMESPACE);
  -            if(interfaceNamespace == null) interfaceNamespace= url;
  -            String locationUrl= 
msgContext.getStrProp(MessageContext.WSDLGEN_SERV_LOC_URL);
  -            if(locationUrl== null) locationUrl= url;
  -            else{
  -               try{
  -                 URL urlURL= new URL(url);
  -                 URL locationURL= new URL(locationUrl);
  -                 URL urlTemp= new URL( urlURL.getProtocol(),
  -                     locationURL.getHost(),
  -                     locationURL.getPort(),
  -                     urlURL.getFile());
  -                     interfaceNamespace += urlURL.getFile();
  -                locationUrl= urlTemp.toString();     
  -               }catch(Exception e){
  -                 locationUrl= url; 
  -                 interfaceNamespace= url;
  -               }
  +            String interfaceNamespace = 
  +                    msgContext.getStrProp(MessageContext.WSDLGEN_INTFNAMESPACE);
  +            if (interfaceNamespace == null) 
  +                interfaceNamespace = url;
  +            String locationUrl = 
  +                    msgContext.getStrProp(MessageContext.WSDLGEN_SERV_LOC_URL);
  +            
  +            if (locationUrl == null) {
  +                locationUrl = url;
  +            } else {
  +                try {
  +                    URL urlURL = new URL(url);
  +                    URL locationURL = new URL(locationUrl);
  +                    URL urlTemp = new URL(urlURL.getProtocol(),
  +                            locationURL.getHost(),
  +                            locationURL.getPort(),
  +                            urlURL.getFile());
  +                    interfaceNamespace += urlURL.getFile();
  +                    locationUrl = urlTemp.toString();
  +                } catch (Exception e) {
  +                    locationUrl = url;
  +                    interfaceNamespace = url;
  +                }
               }