Browse Source

minor fixes

Teh-Hai Julian Zheng 8 years ago
parent
commit
bfc49efea2
2 changed files with 18 additions and 11 deletions
  1. 17 10
      src/classes/HolonElement.java
  2. 1 1
      src/ui/view/GUI.java

+ 17 - 10
src/classes/HolonElement.java

@@ -15,18 +15,14 @@ public class HolonElement {
 	/* Path of the image for the Obj. */
 	String image;
 	/* +: for Consumers and -: Producers */
-	String sign;
+	char sign;
 
 	public HolonElement(String eleName, float energy, int amount) {
 		setEleName(eleName);
 		setAmount(amount);
 		setEnergy(energy);
 		setActive(true);
-		if (energy < 0) {
-			setSign("-");
-		} else {
-			setSign("+");
-		}
+		setSign(energy);
 	}
 
 	/**
@@ -116,11 +112,22 @@ public class HolonElement {
 		return totalEnergy;
 	}
 
-	public void setSign(String s) {
-		this.sign = s;
+	/**
+	 * @return the sign
+	 */
+	public char getSign() {
+		return sign;
 	}
 
-	public String getSign() {
-		return sign;
+	/**
+	 * @param energy
+	 *            the sign to set
+	 */
+	public void setSign(float energy) {
+		if (energy < 0)
+			this.sign = '-';
+		else
+			this.sign = '+';
 	}
+
 }

+ 1 - 1
src/ui/view/GUI.java

@@ -164,7 +164,7 @@ public class GUI implements CategoryListener {
 
 		JScrollPane scrollPane = new JScrollPane();
 		// Table Set up
-		Object[] columnNames = { "Gadget", "Typ", "Energy", "Quantity" };
+		Object[] columnNames = { "Device", "Type", "Energy", "Quantity" };
 		tableModel.setColumnIdentifiers(columnNames);
 		table.setModel(tableModel);
 		scrollPane.setViewportView(table);