Implemented multiple-choice launch actions (f88dd96e) · Commits · Elphel / vdt-plugin

src/com/elphel/vdt/VDT.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,5 +145,6 @@ public class VDT {
	public static final String GENERATOR_ID_CURRENT_FILE = "CurrentFile";		public static final String GENERATOR_ID_CURRENT_FILE = "CurrentFile";
	public static final String GENERATOR_ID_SELECTED_FILE = "SelectedFile";		public static final String GENERATOR_ID_SELECTED_FILE = "SelectedFile";
	public static final String GENERATOR_ID_CURRENT_BASE = "CurrentFileBase";		public static final String GENERATOR_ID_CURRENT_BASE = "CurrentFileBase";
			public static final String GENERATOR_ID_CHOSEN_ACTION = "ChosenActionIndex";
	public static final String GENERATOR_ID_OS_NAME = "OS";		public static final String GENERATOR_ID_OS_NAME = "OS";
	} // class VDT		} // class VDT

src/com/elphel/vdt/VerilogUtils.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -100,8 +100,8 @@ public class VerilogUtils {
	* Returns the top module(s) for given verilog file.		* Returns the top module(s) for given verilog file.
	*/		*/

	public static String[] getTopModuleNames(IFile file) {		public static String[] getTopModuleNames(IFile file) { //L/x353/data/vdt/workspace_11-runtime/x353/x353_1.tf
	OutlineElement[] outlineElements= getTopModulesVeditor(file);		OutlineElement[] outlineElements= getTopModulesVeditor(file); // empty inside
	if (outlineElements==null) return null;		if (outlineElements==null) return null;
	String [] list = new String[outlineElements.length];		String [] list = new String[outlineElements.length];
	for (int i=0;i<list.length;i++) {		for (int i=0;i<list.length;i++) {

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,13 @@ public class ParamBasedOption extends Option {
	}		}

	public String doLoadDefault() {		public String doLoadDefault() {
	String value = param.getDefaultValue().get(0);		String value = param.getDefaultValue(true).get(0); // Andrey: ignore faults in TopModuleName generator
			doClear();
			return value;
			}

			public String doLoadDefault(boolean menuMode) {
			String value = param.getDefaultValue(menuMode).get(0);
	doClear();		doClear();
	return value;		return value;
	}		}

src/com/elphel/vdt/core/tools/config/xml/XMLConfig.java

+18 −17

src/com/elphel/vdt/core/tools/generators/AbstractGenerator.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ public abstract class AbstractGenerator {
	protected final String prefix, suffix;		protected final String prefix, suffix;
	protected String separator;		protected String separator;
	private final boolean forcedMultiline;		private final boolean forcedMultiline;
	private boolean menuMode=false; // managing menu items, not running tool		private boolean menuMode=false; // managing menu items, not running tool. Ignore Generator errors

	public AbstractGenerator() {		public AbstractGenerator() {
	this(false);		this(false);
	@@ -119,8 +119,11 @@ public abstract class AbstractGenerator {
	return output;		return output;
	}		}

	protected void fault(String message) {		protected String fault(String message) {
			if (menuMode)
			return "";
	MessageUI.error("Generator '" + getName() + "' fault: " + message);		MessageUI.error("Generator '" + getName() + "' fault: " + message);
			return null;
	}		}

	protected abstract String[] getStringValues();		protected abstract String[] getStringValues();

Original line number	Original line	Diff line number	Diff line
	@@ -990,28 +990,29 @@ public class XMLConfig extends Config {

	for(Iterator<Node> n = runForNodes.iterator(); n.hasNext();) {		for(Iterator<Node> n = runForNodes.iterator(); n.hasNext();) {
	Node node = (Node)n.next();		Node node = (Node)n.next();
			boolean checkExtension=false; // for empty resource field - do not check file or extensions
			boolean checkExistence=false;
	String label = getAttributeValue(node, CONTEXT_TOOL_ACTION_LABEL);		String label = getAttributeValue(node, CONTEXT_TOOL_ACTION_LABEL);
	if (label == null)		if (label == null)
	label=CONTEXT_TOOL_DFLT_ACTION_LABEL;		label=CONTEXT_TOOL_DFLT_ACTION_LABEL;
	String resource = getAttributeValue(node, CONTEXT_TOOL_ACTION_RESOURCE);		String resource = getAttributeValue(node, CONTEXT_TOOL_ACTION_RESOURCE);
	if (resource == null)		if ((resource == null) \|\| (resource.length()==0)) {
	resource= CONTEXT_TOOL_DFLT_ACTION_RESOURCE;		// resource= CONTEXT_TOOL_DFLT_ACTION_RESOURCE;
			resource = "";
			} else {
	String checkExtensionAttr=getAttributeValue(node, CONTEXT_TOOL_ACTION_CHECK_EXTENSION);		String checkExtensionAttr=getAttributeValue(node, CONTEXT_TOOL_ACTION_CHECK_EXTENSION);
	if (checkExtensionAttr==null){		if (checkExtensionAttr==null){
	checkExtensionAttr=CONTEXT_TOOL_DFLT_ACTION_CHECK_EXTENSION;		checkExtensionAttr=CONTEXT_TOOL_DFLT_ACTION_CHECK_EXTENSION;
	}		}
	checkBoolAttr(checkExtensionAttr, CONTEXT_TOOL_ACTION_CHECK_EXTENSION);		checkBoolAttr(checkExtensionAttr, CONTEXT_TOOL_ACTION_CHECK_EXTENSION);
	boolean checkExtension=getBoolAttrValue(checkExtensionAttr);		checkExtension=getBoolAttrValue(checkExtensionAttr);


	String checkExistenceAttr=getAttributeValue(node, CONTEXT_TOOL_ACTION_CHECK_EXISTENCE);		String checkExistenceAttr=getAttributeValue(node, CONTEXT_TOOL_ACTION_CHECK_EXISTENCE);
	if (checkExistenceAttr==null){		if (checkExistenceAttr==null){
	checkExistenceAttr=CONTEXT_TOOL_DFLT_ACTION_CHECK_EXISTENCE;		checkExistenceAttr=CONTEXT_TOOL_DFLT_ACTION_CHECK_EXISTENCE;
	}		}
	checkBoolAttr(checkExistenceAttr, CONTEXT_TOOL_ACTION_CHECK_EXISTENCE);		checkBoolAttr(checkExistenceAttr, CONTEXT_TOOL_ACTION_CHECK_EXISTENCE);
	boolean checkExistence=getBoolAttrValue(checkExistenceAttr);		checkExistence=getBoolAttrValue(checkExistenceAttr);
			}
	runForList.add(new RunFor(label, resource, checkExtension, checkExistence));		runForList.add(new RunFor(label, resource, checkExtension, checkExistence));
	}		}
	}		}

Admin message