Attachment #82112 for bug #187522

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 187522
Collapse All | Expand All

Lines 12-18 Link Here

(-)src-config/org/eclipse/tptp/platform/agentcontroller/config/ApplicationAliases.java (-1 lines)
12	**********************************************************************/	12	**********************************************************************/
13	package org.eclipse.tptp.platform.agentcontroller.config;	13	package org.eclipse.tptp.platform.agentcontroller.config;
14		14
15	import org.w3c.dom.Element;
16		15
17	public class ApplicationAliases extends ConfigElement {	16	public class ApplicationAliases extends ConfigElement {
18	public final static String TAG = ConfigUtility.getString("Config.ApplicationAliases.Tag");	17	public final static String TAG = ConfigUtility.getString("Config.ApplicationAliases.Tag");




				sc.validatePlugins(_show_all, arguments);
				return;
			}
			sc.run(arguments, silent, overwrite);
			
			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"));

Lines 111-118 Link Here

(-)src-config/org/eclipse/tptp/platform/agentcontroller/config/ConfigFile.java (-1 / +23 lines)
111	try {	111	try {
112	fout = new FileOutputStream(fileName);	112	fout = new FileOutputStream(fileName);
113	} catch (Exception e) {	113	} catch (Exception e) {
114	Logger.err(ConfigUtility.getString("Config.Writer.Error.CannotWriteFile") + " " + fileName);	114	String errMsg = ConfigUtility.getString("Config.Writer.Error.CannotWriteFile") + " " + fileName;
		115
		116	System.out.println();
		117	System.out.println(errMsg);
		118
		119	Logger.err(errMsg);
115	Logger.err(e.getMessage());	120	Logger.err(e.getMessage());
		121
		122	// This is caught by SetConfig.generateConfig(....) ;
		123	throw(new ConfigFileException(errMsg));
		124
116	}	125	}
117		126
118	if (fout != null) {	127	if (fout != null) {
Lines 553-555 Link Here
553	}	562	}
554		563
555	}	564	}
		565
		566	class ConfigFileException extends RuntimeException {
		567
		568	public ConfigFileException() {
		569	super();
		570	}
		571	public ConfigFileException(String msg) {
		572	super(msg);
		573	}
		574
		575	private static final long serialVersionUID = 1L;
		576
		577	}

Return to bug 187522

Lines 74-86 Link Here

(-)src-config/org/eclipse/tptp/platform/agentcontroller/config/SetConfig.java (-6 / +13 lines)
74	sc.validatePlugins(_show_all, arguments);	74	sc.validatePlugins(_show_all, arguments);
75	return;	75	return;
76	}	76	}
77	sc.run(arguments, silent, overwrite);
78		77
79	/* NM - bugzilla 173330: Call the appropriate function depending on whehter or not list of 'plugins' is null */	78	try {
80	if (plugins == null)	79
81	sc.generatePluginConfigurations(arguments);	80	sc.run(arguments, silent, overwrite);
82	else	81
83	sc.generatePluginConfigurations(arguments, plugins);	82
		83
		84	/* NM - bugzilla 173330: Call the appropriate function depending on whehter or not list of 'plugins' is null */
		85	if (plugins == null)
		86	sc.generatePluginConfigurations(arguments);
		87	else
		88	sc.generatePluginConfigurations(arguments, plugins);
		89
		90	} catch(ConfigFileException cfe) { /* Error msg already printed in module, so return. */ }
84		91
85	} else {	92	} else {
86	System.out.println(ConfigUtility.getString("Config.Prompt.JAVA_Version.Err") + ": " + ConfigUtility.getString("Config.Java.Version"));	93	System.out.println(ConfigUtility.getString("Config.Prompt.JAVA_Version.Err") + ": " + ConfigUtility.getString("Config.Java.Version"));