Attachment 38524 Details for Bug 136666 – Patch

[patch] Patch

update.txt (text/plain), 2.55 KB, created by John Arthorne

on 2006-04-13 12:34:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2006-04-13 12:34:34 EDT

Size: 2.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.configurator
>Index: src/org/eclipse/update/internal/configurator/branding/IniFileReader.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IniFileReader.java,v
>retrieving revision 1.14
>diff -u -r1.14 IniFileReader.java
>--- src/org/eclipse/update/internal/configurator/branding/IniFileReader.java	11 Apr 2006 15:47:56 -0000	1.14
>+++ src/org/eclipse/update/internal/configurator/branding/IniFileReader.java	13 Apr 2006 16:25:02 -0000
>@@ -96,13 +96,7 @@
> 		// Determine the ini file location
> 		URL iniURL = null;
> 		IOException ioe = null;
>-		try {
>-			iniURL = FileLocator.find(bundle, new Path(NLS_TAG).append(iniFilename), null);
>-			if (iniURL != null)
>-				iniURL = FileLocator.resolve(iniURL);
>-		} catch (IOException e) {
>-			ioe = e;
>-		}
>+		iniURL = FileLocator.find(bundle, new Path(NLS_TAG).append(iniFilename), null);
> 		if (iniURL == null) {
> 			String message = NLS.bind(Messages.IniFileReader_OpenINIError, (new String[] { iniFilename }));
> 			return new Status(IStatus.ERROR, PID, 0, message, ioe);
>@@ -111,27 +105,13 @@
> 		// Determine the properties file location
> 		URL propertiesURL = null;
> 		if (propertiesFilename != null & propertiesFilename.length() > 0) {
>-			try {
>-				propertiesURL = FileLocator.find(bundle, new Path(NLS_TAG).append(propertiesFilename), null);
>-				if (propertiesURL != null)
>-					propertiesURL = FileLocator.resolve(propertiesURL);
>-			} catch (IOException e) {
>-				String message = NLS.bind(Messages.IniFileReader_OpenPropError, (new String[] { propertiesFilename }));
>-				return new Status(IStatus.ERROR, PID, 0, message, e);
>-			}
>+			propertiesURL = FileLocator.find(bundle, new Path(NLS_TAG).append(propertiesFilename), null);
> 		}
> 
> 		// Determine the mappings file location
> 		URL mappingsURL = null;
> 		if (mappingsFilename != null && mappingsFilename.length() > 0) {
>-			try {
>-				mappingsURL = FileLocator.find(bundle, new Path(NLS_TAG).append(mappingsFilename), null);
>-				if (mappingsURL != null)
>-					mappingsURL = FileLocator.resolve(mappingsURL);
>-			} catch (IOException e) {
>-				String message = NLS.bind(Messages.IniFileReader_OpenMapError, (new String[] { mappingsFilename }));
>-				return new Status(IStatus.ERROR, PID, 0, message, e);
>-			}
>+			mappingsURL = FileLocator.find(bundle, new Path(NLS_TAG).append(mappingsFilename), null);
> 		}
> 
> 		// OK to pass null properties and/or mapping file

Actions: View | Diff

Attachments on bug 136666: 38524