Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 225625
Collapse All | Expand All

(-)src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java (-5 / +11 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2003, 2007 IBM Corporation and others.
2
 * Copyright (c) 2003, 2008 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 15-20 Link Here
15
 * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
15
 * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
16
 * 20070813   188999 pmoogk@ca.ibm.com - Peter Moogk
16
 * 20070813   188999 pmoogk@ca.ibm.com - Peter Moogk
17
 * 20070927   204649 kelvinhc@ca.ibm.com - Kelvin Cheung
17
 * 20070927   204649 kelvinhc@ca.ibm.com - Kelvin Cheung
18
 * 20080505   225625 pmoogk@ca.ibm.com - Peter Moogk, Fixed null pointer problem, if user cancells out of overwrite resource.
18
 *******************************************************************************/
19
 *******************************************************************************/
19
package org.eclipse.jst.ws.internal.axis.consumption.core.command;
20
package org.eclipse.jst.ws.internal.axis.consumption.core.command;
20
21
Lines 25-30 Link Here
25
import java.util.HashMap;
26
import java.util.HashMap;
26
import java.util.Iterator;
27
import java.util.Iterator;
27
import java.util.List;
28
import java.util.List;
29
import java.util.Vector;
28
30
29
import org.apache.axis.constants.Scope;
31
import org.apache.axis.constants.Scope;
30
import org.apache.axis.wsdl.toJava.Emitter;
32
import org.apache.axis.wsdl.toJava.Emitter;
Lines 282-288 Link Here
282
			
284
			
283
			String javaFile;
285
			String javaFile;
284
			String fullClassName = null;
286
			String fullClassName = null;
285
			String [] movedJavaFiles =  new String [javaFiles.size()];
287
			Vector movedJavaFiles =  new Vector();;
286
			iterator = javaFiles.iterator();
288
			iterator = javaFiles.iterator();
287
			i = 0;
289
			i = 0;
288
			while (iterator.hasNext()) {
290
			while (iterator.hasNext()) {
Lines 301-315 Link Here
301
									finStream,
303
									finStream,
302
									monitor,
304
									monitor,
303
									statusHandler);
305
									statusHandler);
304
							file.setCharset("UTF-8", monitor);
306
							
305
							movedJavaFiles[i++]= ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString();
307
							if( file != null )
308
							{
309
							  file.setCharset("UTF-8", monitor);
310
							  movedJavaFiles.add( ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString() );
311
							}
306
						}
312
						}
307
					}
313
					}
308
					
314
					
309
					finStream.close();
315
					finStream.close();
310
				}
316
				}
311
			}
317
			}
312
			javaWSDLParam.setJavaFiles(movedJavaFiles);
318
			javaWSDLParam.setJavaFiles( (String[])movedJavaFiles.toArray( new String[0] ) );
313
			
319
			
314
		} catch (Exception e) {
320
		} catch (Exception e) {
315
			status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);
321
			status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);

Return to bug 225625