Attachment 82112 Details for Bug 187522 – SetConfig Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] SetConfig Patch

patch.txt (text/plain), 3.98 KB, created by Jonathan West

on 2007-11-05 12:49:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan West

Created: 2007-11-05 12:49:39 EST

Size: 3.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.agentcontroller
>Index: src-config/org/eclipse/tptp/platform/agentcontroller/config/ApplicationAliases.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-config/org/eclipse/tptp/platform/agentcontroller/config/ApplicationAliases.java,v
>retrieving revision 1.1
>diff -u -r1.1 ApplicationAliases.java
>--- src-config/org/eclipse/tptp/platform/agentcontroller/config/ApplicationAliases.java	11 Feb 2006 02:42:57 -0000	1.1
>+++ src-config/org/eclipse/tptp/platform/agentcontroller/config/ApplicationAliases.java	5 Nov 2007 17:25:15 -0000
>@@ -12,7 +12,6 @@
> **********************************************************************/
> package org.eclipse.tptp.platform.agentcontroller.config;
> 
>-import org.w3c.dom.Element;
> 
> public class ApplicationAliases extends ConfigElement {
> 	public final static String TAG = ConfigUtility.getString("Config.ApplicationAliases.Tag");
>Index: src-config/org/eclipse/tptp/platform/agentcontroller/config/SetConfig.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-config/org/eclipse/tptp/platform/agentcontroller/config/SetConfig.java,v
>retrieving revision 1.59
>diff -u -r1.59 SetConfig.java
>--- src-config/org/eclipse/tptp/platform/agentcontroller/config/SetConfig.java	29 Aug 2007 19:53:15 -0000	1.59
>+++ src-config/org/eclipse/tptp/platform/agentcontroller/config/SetConfig.java	5 Nov 2007 17:25:15 -0000
>@@ -74,13 +74,20 @@
> 				sc.validatePlugins(_show_all, arguments);
> 				return;
> 			}
>-			sc.run(arguments, silent, overwrite);
> 			
>-			/* NM - bugzilla 173330: Call the appropriate function depending on whehter or not list of 'plugins' is null */
>-			if (plugins == null)
>-				sc.generatePluginConfigurations(arguments);
>-			else
>-				sc.generatePluginConfigurations(arguments, plugins);
>+			try {
>+			
>+				sc.run(arguments, silent, overwrite);
>+				
>+				
>+				
>+				/* NM - bugzilla 173330: Call the appropriate function depending on whehter or not list of 'plugins' is null */
>+				if (plugins == null)
>+					sc.generatePluginConfigurations(arguments);
>+				else
>+					sc.generatePluginConfigurations(arguments, plugins);
>+			
>+			} catch(ConfigFileException cfe) { /* Error msg already printed in module, so return. */ }
> 			
> 		} else {
> 			System.out.println(ConfigUtility.getString("Config.Prompt.JAVA_Version.Err") + ": " + ConfigUtility.getString("Config.Java.Version"));
>Index: src-config/org/eclipse/tptp/platform/agentcontroller/config/ConfigFile.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-config/org/eclipse/tptp/platform/agentcontroller/config/ConfigFile.java,v
>retrieving revision 1.13
>diff -u -r1.13 ConfigFile.java
>--- src-config/org/eclipse/tptp/platform/agentcontroller/config/ConfigFile.java	18 Jul 2006 22:50:40 -0000	1.13
>+++ src-config/org/eclipse/tptp/platform/agentcontroller/config/ConfigFile.java	5 Nov 2007 17:25:15 -0000
>@@ -111,8 +111,17 @@
> 		try {
> 			fout = new FileOutputStream(fileName);
> 		} catch (Exception e) {
>-			Logger.err(ConfigUtility.getString("Config.Writer.Error.CannotWriteFile") + " " + fileName);
>+			String errMsg = ConfigUtility.getString("Config.Writer.Error.CannotWriteFile") + " " + fileName;
>+			
>+			System.out.println();			
>+			System.out.println(errMsg);
>+			
>+			Logger.err(errMsg);
> 			Logger.err(e.getMessage());
>+			
>+			// This is caught by SetConfig.generateConfig(....) ;
>+			throw(new ConfigFileException(errMsg));
>+			
> 		}
> 
> 		if (fout != null) {
>@@ -553,3 +562,16 @@
> 	}
> 
> }
>+
>+class ConfigFileException extends RuntimeException {
>+
>+	public ConfigFileException() {
>+		super();
>+	}
>+	public ConfigFileException(String msg) {
>+		super(msg);
>+	}
>+
>+	private static final long serialVersionUID = 1L;
>+	
>+}

Actions: View | Diff

Attachments on bug 187522: 82112