table fix

src/ui/view/GUI.java

@@ -476,12 +476,12 @@ public class GUI<E> implements CategoryListener {
 				try {
 					int yMouse = yTHIS;
 					int yBMouse = yBTHIS;
-					int selectedValueX = (int) Math.floor(xTHIS / (tableHolonElement.getWidth() / 4));
+					int selectedValueX = (int) Math.floor(xTHIS / (tableHolonElement.getWidth() / 5));
 					int selectedValueY = (int) Math.floor(yMouse / 16);
-					int selectedValueBX = (int) Math.floor(xBTHIS / (tableHolonElement.getWidth() / 4));
+					int selectedValueBX = (int) Math.floor(xBTHIS / (tableHolonElement.getWidth() / 5));
 					int selectedValueBY = (int) Math.floor(yBMouse / 16);
 					if (getActualCps() != null && getActualCps().getClass() == HolonObject.class) {
-						if (selectedValueBX == 3) {
+						if (selectedValueBX == 4) {
 							HolonElement eleBTemp = getActualHolonElement((HolonObject) getActualCps(), yBMouse);
 							String newBStuff = tableModelHolonElement.getValueAt(selectedValueBY, selectedValueBX)
 									.toString();
@@ -491,12 +491,12 @@ public class GUI<E> implements CategoryListener {
 							HolonElement eleTemp = getActualHolonElement((HolonObject) getActualCps(), yMouse);
 							String newStuff = tableModelHolonElement.getValueAt(selectedValueY, selectedValueX)
 									.toString();
-							if (selectedValueX == 0) {
+							if (selectedValueX == 1) {
 								eleTemp.setEleName(newStuff);
-							} else if (selectedValueX == 1) {
+							} else if (selectedValueX == 2) {
 								Float ftemp = Float.parseFloat(newStuff);
 								eleTemp.setEnergy(ftemp);
-							} else if (selectedValueX == 2) {
+							} else if (selectedValueX == 3) {
 								Integer iTemp = Integer.parseInt(newStuff);
 								eleTemp.setAmount(iTemp);
 							}

src/ui/view/MyCanvas.java

@@ -245,6 +245,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		if (!e.isControlDown() && dragging == false) {
 			model.getSelectedCpsObjects().clear();
 			TempSelected.clear();
+			if (tempCps != null) {
+				controller.addSelectedObject(tempCps);
+			}
 		}
 	}
 
@@ -344,6 +347,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		if (!model.getSelectedCpsObjects().contains(tempCps)) {
 			model.getSelectedCpsObjects().clear();
 			TempSelected.clear();
+			if (tempCps != null) {
+				controller.addSelectedObject(tempCps);
+			}
 		}
 
 		if (dragging) {