Got rid of static variables and methods in FormatProcessor, continue (cf2d0868) · Commits · Elphel / vdt-plugin

src/com/elphel/vdt/core/launching/LaunchCore.java

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -129,9 +129,9 @@ public class LaunchCore {
	String valueAttrName = LaunchCore.getValueAttributeName(param);		String valueAttrName = LaunchCore.getValueAttributeName(param);

	if(param.getType().isList())		if(param.getType().isList())
	workingCopy.setAttribute(valueAttrName, param.getValue());		workingCopy.setAttribute(valueAttrName, param.getValue(null)); // null for topFormatProcessor
	else		else
	workingCopy.setAttribute(valueAttrName, param.getValue().get(0));		workingCopy.setAttribute(valueAttrName, param.getValue(null).get(0)); // null for topFormatProcessor
	}		}

	setToolToLaunch(workingCopy, tool);		setToolToLaunch(workingCopy, tool);
	@@ -227,6 +227,8 @@ public class LaunchCore {
	IProject project,		IProject project,
	String resource,		String resource,
	String logBuildStamp) throws CoreException {		String logBuildStamp) throws CoreException {
			// System.out.println("1.DebugUITools.launch() tool="+tool+" project="+project+" resource="+resource+" logBuildStamp="+logBuildStamp);
			// System.out.println("2.DebugUITools.launch() tool="+tool.getName()+" project="+project.getName()+" resource="+resource.toString()+" logBuildStamp="+logBuildStamp); //Unhandled event loop exception
	if (!saveAllEditors(true)) return; // Andrey: added it here		if (!saveAllEditors(true)) return; // Andrey: added it here

	try {		try {
	@@ -236,13 +238,18 @@ public class LaunchCore {
	resource,		resource,
	logBuildStamp);		logBuildStamp);
	if (VDTLaunchUtil.getRunner().getRunningBuilds().isAlreadyOpen(tool.getName())){		if (VDTLaunchUtil.getRunner().getRunningBuilds().isAlreadyOpen(tool.getName())){
	return;		// System.out.println("LaunchCore:launch() tool="+tool.getName()+" was already open! Ignoring... ");
			// return;
	}		}
			// System.out.println("DebugUITools.launch() tool="+tool.getName()+" project="+project.getName()+" resource="+resource.toString()+" logBuildStamp="+logBuildStamp);
	DebugUITools.launch(launchConfig, ILaunchManager.RUN_MODE);		DebugUITools.launch(launchConfig, ILaunchManager.RUN_MODE);
	} catch (CoreException e) {		} catch (CoreException e) {
	IStatus status = e.getStatus();		IStatus status = e.getStatus();
	if (status.getSeverity() != IStatus.CANCEL)		if (status.getSeverity() != IStatus.CANCEL)
	throw e;		throw e;
			} finally {
			// System.out.println("3.DebugUITools.launch() tool="+tool.getName()+" project="+project.getName()+" resource="+resource.toString()+" logBuildStamp="+logBuildStamp);

	}		}
	} // launch()		} // launch()

	@@ -378,7 +385,8 @@ public class LaunchCore {
	*/		*/
	protected static boolean saveAllEditors(boolean confirm) {		protected static boolean saveAllEditors(boolean confirm) {
	if (VerilogPlugin.getActiveWorkbenchWindow() == null) {		if (VerilogPlugin.getActiveWorkbenchWindow() == null) {
	return false;		System.out.println("VerilogPlugin.getActiveWorkbenchWindow() == null");
			return true; // false;
	}		}
	return PlatformUI.getWorkbench().saveAllEditors(confirm);		return PlatformUI.getWorkbench().saveAllEditors(confirm);
	}		}

src/com/elphel/vdt/core/launching/RunningBuilds.java

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -186,18 +186,20 @@ public class RunningBuilds {
	}		}

	public void removeConfiguration(String consoleName){		public void removeConfiguration(String consoleName){
	System.out.println("VDTRunnerConfiguration#removeConfiguration("+consoleName+")");
	unfinishedBuilds.remove(consoleName);		unfinishedBuilds.remove(consoleName);
	System.out.println("Running consoles:");		if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.DEBUG_LAUNCHING)) {
			System.out.println("VDTRunnerConfiguration#removeConfiguration("+consoleName+"), running consoles:");
	listConfigurations();		listConfigurations();
	}		}
			}

	public void saveUnfinished(String consoleName, VDTRunnerConfiguration configuration ){		public void saveUnfinished(String consoleName, VDTRunnerConfiguration configuration ){
	System.out.println("VDTRunnerConfiguration#saveUnfinished("+consoleName+", configuration)");
	unfinishedBuilds.put(consoleName, configuration);		unfinishedBuilds.put(consoleName, configuration);
	System.out.println("Running consoles:");		if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.DEBUG_LAUNCHING)) {
			System.out.println("VDTRunnerConfiguration#saveUnfinished("+consoleName+", configuration), running consoles:");
	listConfigurations();		listConfigurations();
	}		}
			}

	public void listConfigurations(){		public void listConfigurations(){
	Iterator<String> iter=unfinishedBuilds.keySet().iterator();		Iterator<String> iter=unfinishedBuilds.keySet().iterator();

src/com/elphel/vdt/core/launching/VDTConsoleRunner.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -279,7 +279,7 @@ public class VDTConsoleRunner{
	for (int i=0;i<fArguments.length;i++){		for (int i=0;i<fArguments.length;i++){
	if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.LOCAL_ECHO)) {		if (VerilogPlugin.getPreferenceBoolean(PreferenceStrings.LOCAL_ECHO)) {
	fOutStream.write(fArguments[i]+"\n"); // writes to console itself		fOutStream.write(fArguments[i]+"\n"); // writes to console itself
	System.out.println("--->"+fArguments[i]+"\n");		// System.out.println("--->"+fArguments[i]+"\n");
	}		}
	consoleInStreamProxy.write(fArguments[i]+"\n");		consoleInStreamProxy.write(fArguments[i]+"\n");
	}		}

src/com/elphel/vdt/core/launching/VDTLaunchUtil.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -144,10 +144,10 @@ public class VDTLaunchUtil {
	try {		try {
	if(param.getType().isList()) {		if(param.getType().isList()) {
	List<String> value =		List<String> value =
	configuration.getAttribute(valueAttrName, param.getDefaultValue());		configuration.getAttribute(valueAttrName, param.getDefaultValue(null)); // null for topFormatProcessor
	param.setCurrentValue(value);		param.setCurrentValue(value);
	} else {		} else {
	String value = configuration.getAttribute(valueAttrName, param.getDefaultValue().get(0));		String value = configuration.getAttribute(valueAttrName, param.getDefaultValue(null).get(0)); // null for topFormatProcessor
	param.setCurrentValue(value);		param.setCurrentValue(value);
	}		}
	} catch(ToolException e) {		} catch(ToolException e) {

src/com/elphel/vdt/core/options/ParamBasedListOption.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ public class ParamBasedListOption extends ParamBasedOption {
	}		}

	public List<String> getValueList() {		public List<String> getValueList() {
	return param.getValue();		return param.getValue(null); // null for topFormatProcessor
	}		}

	public List<String> doLoadList() {		public List<String> doLoadList() {
	@@ -83,7 +83,7 @@ public class ParamBasedListOption extends ParamBasedOption {
	}		}

	public List<String> doLoadDefaultList() {		public List<String> doLoadDefaultList() {
	List<String> list = param.getDefaultValue();		List<String> list = param.getDefaultValue(null); // null for topFormatProcessor
	doClear();		doClear();
	return list;		return list;
	}		}
	@@ -109,7 +109,7 @@ public class ParamBasedListOption extends ParamBasedOption {
	super.doClear();		super.doClear();
	return true;		return true;
	} else		} else
	return super.doStore(OptionsUtils.convertListToString(param.getValue()));		return super.doStore(OptionsUtils.convertListToString(param.getValue(null))); // null for topFormatProcessor
	}		}

	} // class ParamBasedOption		} // class ParamBasedOption

Admin message