package fi.csc.chipster.toolbox;

import fi.csc.microarray.description.SADLDescription;

public class ToolboxTool {

	private String id;
	private SADLDescription sadlDescription;
	private String sadlString;
	private String source;
	private String code;

	private String module;
	private String runtime;

	public ToolboxTool() {
	}
	
	public ToolboxTool(String id, SADLDescription sadlDescription, String sadlString, String code, String source, String module, String runtime) {
		this.id = id;
		this.sadlDescription = sadlDescription;
		this.sadlString = sadlString;
		this.source = source;
		this.code = code;
		this.runtime = runtime;
		this.module = module;
	}

	public String getId() {
		return id;
	}
	
	public SADLDescription getSadlDescription() {
		return sadlDescription;
	}
	
	public String getRuntime() {
		return runtime;
	}

	public String getSadlString() {
		return sadlString;
	}

	public String getSource() {
		return source;
	}

	public String getCode() {
		return code;
	}

	public String getModule() {
		return module;
	}
	
}

package fi.csc.chipster.toolbox;

import fi.csc.microarray.description.SADLDescription;

public class ToolboxTool {

	private String toolId;
	private SADLDescription sadlDescription;
	private String sadlString;
	private String source;
	private String code;

	private String module;
	private String runtime;

	public ToolboxTool() {
	}
	
	public ToolboxTool(String toolId, SADLDescription sadlDescription, String sadlString, String code, String source, String module, String runtime) {
		this.toolId = toolId;
		this.sadlDescription = sadlDescription;
		this.sadlString = sadlString;
		this.source = source;
		this.code = code;
		this.runtime = runtime;
		this.module = module;
	}

	public String getId() {
		return toolId;
	}
	
	public SADLDescription getSadlDescription() {
		return sadlDescription;
	}
	
	public String getRuntime() {
		return runtime;
	}

	public String getSadlString() {
		return sadlString;
	}

	public String getSource() {
		return source;
	}

	public String getCode() {
		return code;
	}

	public String getModule() {
		return module;
	}
	
}

--- 
+++ 
@@ -4,7 +4,7 @@
 
 public class ToolboxTool {
 
-	private String toolId;
+	private String id;
 	private SADLDescription sadlDescription;
 	private String sadlString;
 	private String source;
@@ -16,8 +16,8 @@
 	public ToolboxTool() {
 	}
 	
-	public ToolboxTool(String toolId, SADLDescription sadlDescription, String sadlString, String code, String source, String module, String runtime) {
-		this.toolId = toolId;
+	public ToolboxTool(String id, SADLDescription sadlDescription, String sadlString, String code, String source, String module, String runtime) {
+		this.id = id;
 		this.sadlDescription = sadlDescription;
 		this.sadlString = sadlString;
 		this.source = source;
@@ -27,7 +27,7 @@
 	}
 
 	public String getId() {
-		return toolId;
+		return id;
 	}
 	
 	public SADLDescription getSadlDescription() {
Rename toolId to id to fix json conversion