Attachment 38704 Details for Bug 137053 – Proposed fix

[patch] Proposed fix

patch_137053.txt (text/plain), 6.32 KB, created by Olivier Thomann

on 2006-04-17 14:45:13 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-04-17 14:45:13 EDT

Size: 6.32 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
>retrieving revision 1.524
>diff -u -r1.524 messages.properties
>--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	14 Apr 2006 08:42:26 -0000	1.524
>+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	17 Apr 2006 18:34:54 -0000
>@@ -87,7 +87,7 @@
> unit.missing = File {0} is missing
> 
> ### output
>-output.noClassFileCreated = No .class file created for file named {0} because of an IOException.
>+output.noClassFileCreated = No .class file created for file {1} in {0} because of an IOException.
> 
> ### miscellaneous
> misc.version = {0} {1}, {2}
>Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
>retrieving revision 1.246
>diff -u -r1.246 Main.java
>--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	12 Apr 2006 15:31:24 -0000	1.246
>+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	17 Apr 2006 18:34:54 -0000
>@@ -356,7 +356,7 @@
> 					this.parameters.put(Logger.PATH, f.getCanonicalPath());
> 					this.printTag(Logger.CLASS_FILE, this.parameters, true, true);
> 				} catch (IOException e) {
>-					this.logNoClassFileCreated(fileName);
>+					this.logNoClassFileCreated(outputPath, relativeFileName);
> 				}
> 			}	
> 		}
>@@ -455,13 +455,13 @@
> 		/**
> 		 * 
> 		 */
>-		public void logNoClassFileCreated(String fileName) {
>+		public void logNoClassFileCreated(String outputDir, String relativeFileName) {
> 			if ((this.tagBits & Logger.XML) != 0) {
> 				this.parameters.clear();
>-				this.parameters.put(Logger.MESSAGE, Main.bind("output.noClassFileCreated", fileName)); //$NON-NLS-1$
>+				this.parameters.put(Logger.MESSAGE, Main.bind("output.noClassFileCreated", outputDir, relativeFileName)); //$NON-NLS-1$
> 				this.printTag(Logger.ERROR_TAG, this.parameters, true, true);
> 			}
>-			this.printlnErr(Main.bind("output.noClassFileCreated", fileName)); //$NON-NLS-1$
>+			this.printlnErr(Main.bind("output.noClassFileCreated", outputDir, relativeFileName)); //$NON-NLS-1$
> 		}
> 
> 		public void logNoClasspath() {
>@@ -2788,9 +2788,7 @@
> 						this.destinationPath,
> 						relativeStringName);
> 				} catch (IOException e) {
>-					String fileName = this.destinationPath + relativeStringName;
>-					e.printStackTrace();
>-					this.logger.logNoClassFileCreated(fileName);
>+					this.logger.logNoClassFileCreated(this.destinationPath, relativeStringName);
> 				}
> 				this.exportedClassFilesCounter++;
> 			}
>Index: compiler/org/eclipse/jdt/internal/compiler/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/messages.properties,v
>retrieving revision 1.4
>diff -u -r1.4 messages.properties
>--- compiler/org/eclipse/jdt/internal/compiler/messages.properties	28 Mar 2006 20:30:01 -0000	1.4
>+++ compiler/org/eclipse/jdt/internal/compiler/messages.properties	17 Apr 2006 18:34:54 -0000
>@@ -23,12 +23,10 @@
> compilation_internalError = Internal compiler error
> 
> ### output
>-output_isFile =  The outDir is a file : {0}
>-output_isFileNotDirectory = The outDir is a file not a directory.
>-output_dirName =  The output dir name is : {0}
>-output_notValidAll =  The outDir is not a valid directory name. All the directories cannot be created.
>+output_isFile =  The output directory is a file : {0}
>+output_notValidAll =  The output directory {0} is not a valid directory name. All the directories cannot be created
> output_fileName =  file name : {0}
>-output_notValid = The outDir is not a valid directory name. The directory cannot be created.
>+output_notValid = The output directoryr is not a valid directory name. The directory cannot be created
> 
> ### problem
> problem_noSourceInformation =
>Index: compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java,v
>retrieving revision 1.135
>diff -u -r1.135 ClassFile.java
>--- compiler/org/eclipse/jdt/internal/compiler/ClassFile.java	28 Mar 2006 20:30:01 -0000	1.135
>+++ compiler/org/eclipse/jdt/internal/compiler/ClassFile.java	17 Apr 2006 18:34:54 -0000
>@@ -119,14 +119,16 @@
> 		f = new File(outputPath);
> 		if (f.exists()) {
> 			if (!f.isDirectory()) {
>-				System.out.println(Messages.bind(Messages.output_isFile, f.getAbsolutePath()));
>-				throw new IOException(Messages.output_isFileNotDirectory);
>+				final String message = Messages.bind(Messages.output_isFile, f.getAbsolutePath());
>+				System.out.println(message);
>+				throw new IOException(message);
> 			}
> 		} else {
> 			// we have to create that directory
> 			if (!f.mkdirs()) {
>-				System.out.println(Messages.bind(Messages.output_dirName, f.getAbsolutePath()));
>-				throw new IOException(Messages.output_notValidAll);
>+				final String message = Messages.bind(Messages.output_notValidAll, f.getAbsolutePath());
>+				System.out.println(message);
>+				throw new IOException(message);
> 			}
> 		}
> 		StringBuffer outDir = new StringBuffer(outputPath);
>Index: compiler/org/eclipse/jdt/internal/compiler/util/Messages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/Messages.java,v
>retrieving revision 1.7
>diff -u -r1.7 Messages.java
>--- compiler/org/eclipse/jdt/internal/compiler/util/Messages.java	29 Mar 2006 02:50:01 -0000	1.7
>+++ compiler/org/eclipse/jdt/internal/compiler/util/Messages.java	17 Apr 2006 18:34:54 -0000
>@@ -88,8 +88,6 @@
> 	public static String compilation_unit;
> 	public static String compilation_internalError;
> 	public static String output_isFile;
>-	public static String output_isFileNotDirectory;
>-	public static String output_dirName;
> 	public static String output_notValidAll;
> 	public static String output_fileName;
> 	public static String output_notValid;

Actions: View | Diff

Attachments on bug 137053: 38704