package gov.nih.nci.calab.dto.characterization;

/**
 * This class represents an instrument used for characterization
 * 
 * @author pansu
 * 
 */
public class InstrumentBean {
	private String id;

	private String type;

	private String description;

	private String manufacturer;

	private String abbreviation;

	public InstrumentBean() {

	}

	public InstrumentBean(String type, String description, String manufacturer,
			String abbreviation) {
		super();
		this.type = type;
		this.description = description;
		this.manufacturer = manufacturer;
		this.abbreviation = abbreviation;
	}

	public String getAbbreviation() {
		return abbreviation;
	}

	public void setAbbreviation(String abbreviation) {
		this.abbreviation = abbreviation;
	}

	public String getDescription() {
		return description;
	}

	public void setDescription(String description) {
		this.description = description;
	}

	public String getManufacturer() {
		return manufacturer;
	}

	public void setManufacturer(String manufacturer) {
		this.manufacturer = manufacturer;
	}

	public String getType() {
		return type;
	}

	public void setType(String type) {
		this.type = type;
	}

	public String getId() {
		return id;
	}
}
@@ -111,20 +111,16 @@
 ization%0A
- * %0A
  * @auth
@@ -130,17 +130,16 @@
 pansu%0A *
- 
 %0A */%0Apub
@@ -185,17 +185,16 @@
 ing id;%0A
-%0A
 %09private
@@ -207,17 +207,16 @@
 g type;%0A
-%0A
 %09private
@@ -236,17 +236,16 @@
 iption;%0A
-%0A
 %09private
@@ -266,17 +266,16 @@
 cturer;%0A
-%0A
 %09private
@@ -296,16 +296,89 @@
 iation;%0A
+%09private String otherInstrumentType;%0A%09private String otherManufacturer;%0A%09
 %0A%09public
@@ -397,20 +397,23 @@
 ean() %7B%0A
+%09%09
 %0A%09%7D%0A
+%09
 %0A%09public
@@ -485,12 +485,9 @@
 rer,
-%0A%09%09%09
+ 
 Stri
@@ -515,16 +515,17 @@
 super();
+%09
 %0A%09%09this.
@@ -1249,10 +1249,390 @@
 n id;%0A%09%7D
+%0A%0A%09public String getOtherInstrumentType() %7B%0A%09%09return otherInstrumentType;%0A%09%7D%0A%0A%09public void setOtherInstrumentType(String otherInstrumentType) %7B%0A%09%09this.otherInstrumentType = otherInstrumentType;%0A%09%7D%0A%0A%09public String getOtherManufacturer() %7B%0A%09%09return otherManufacturer;%0A%09%7D%0A%0A%09public void setOtherManufacturer(String otherManufacturer) %7B%0A%09%09this.otherManufacturer = otherManufacturer;%0A%09%7D
 %0A%7D

revert to 1.4