Cleaned folderpath - uses current folder only now

src/main/java/bgSubtraction/properties/PropertiesOperations.java

@@ -41,7 +41,7 @@ public PropertiesOperations(ROIManipulator roiManipulator) {
 		this.roiManipulator = roiManipulator;
 	}
 
-	public void saveRoiToPropFile(String folderPath, String currentPropFile) {
+	public void saveRoiToPropFile(String currentPropFile) {
 		try {
 			prop = new Properties();
 			File file = new File(currentPropFile);
@@ -153,11 +153,9 @@ private void addRoiToProperty(String key, int width, int height, int sizeWidth,
 	 * @param folderPath
 	 * @param filename
 	 */
-	public void loadPropertiesFileIntoInternalRoiManipulator(String folderPath, String filename) {
+	public void loadPropertiesFileIntoInternalRoiManipulator(String filename) {
 		try {
-//			input = new FileInputStream(folderPath + "\\" + filename);//TODO not curr dir
 			input = new FileInputStream(filename);
-			// input = new FileInputStream("REMOVEME.properties");//TODO for prop inside jar
 			if (input == null) {
 				System.err.println("Error - unable to find " + filename);// TODO throw for future displaying of err
 				return;

src/main/java/interfacePanel/panel/KeyTable.java

@@ -44,7 +44,6 @@ public class KeyTable extends JTable {
 	String[] columnNames;
 	ROIManipulator roi;
 	PropertiesOperations prop;
-	String folderPath;
 	String currentPropFile;
 	JTable table;
 	DefaultTableModel model;
@@ -69,15 +68,14 @@ public class KeyTable extends JTable {
 	 * @param currentPropFile
 	 * @param selectedPropFile 
 	 */
-	public KeyTable(Display display, ROIManipulator roi, PropertiesOperations prop, String folderPath, String selectedPropFile) {
+	public KeyTable(Display display, ROIManipulator roi, PropertiesOperations prop, String selectedPropFile) {
 
 		this.display = display;
 		allowedKeysObject = new AllowedKeys();
 		comboBoxKeyName = new JComboBox<String>(allowedKeysObject.getAllowedKeys());
 		columnNames = new String[] { "Keyboard Key", "Square Location", "Key Type" };
 		this.roi = roi;
 		this.prop = prop;
-		this.folderPath = folderPath;
 		this.currentPropFile = selectedPropFile;
 		comboBoxKeyType = new JComboBox<String>(new String[] { KeyPressType.CONSTANT.toString(),
 				KeyPressType.PRESS.toString(), KeyPressType.TOGGLE.toString() });
@@ -241,7 +239,7 @@ public void actionPerformed(ActionEvent e) {
 				if (i >= 0) {
 					// remove a row from jtable
 					model.removeRow(i);
-					roi.removeRoiFromList(i);// TODO test if indexes will not be the same
+					roi.removeRoiFromList(i);
 				} else {
 					System.out.println("Delete Error");
 				}
@@ -303,7 +301,7 @@ public void actionPerformed(ActionEvent e) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 
-				prop.saveRoiToPropFile(null,currentPropFile);//TODO changed to current dir
+				prop.saveRoiToPropFile(currentPropFile);
 
 			}
 		});

src/main/java/interfacePanel/panel/MainPanel.java

@@ -68,7 +68,6 @@ public class MainPanel extends JFrame{
 	JSlider sliderDilate2 = new JSlider(1, 15, 1);
 	JSlider sliderHistory = new JSlider(1, 50, 1);
 	JSlider sliderThresh = new JSlider(1, 100, 16);
-	private boolean started = false;
 	GridBagConstraints c;
 	JPanel panelMain;
 	JPanel panelForm;
@@ -250,14 +249,14 @@ private void startExecution() {
 		Display display = new Display();
 		roi = new ROIManipulator(camera);
 		prop = new PropertiesOperations(roi);//cpp way - give obj and populate it
-		prop.loadPropertiesFileIntoInternalRoiManipulator(null, selectedPropFile);// "config.properties"
+		prop.loadPropertiesFileIntoInternalRoiManipulator(selectedPropFile);// "config.properties"
 
 		if(useWS) {//TODO dropped to deprecated status
 		SpecialKey wsKey = new SpecialKey(KeyEvent.VK_DOLLAR, KeyPressType.SPECIAL);
 		roi.addRoiToList(0, 0.52, wsKey);
 		roi.addRoiToList(0.16, 0.96, 0.70, 0.04, KeyEvent.VK_W, KeyPressType.CONSTANT);// must be last
 		}
-		kt = new KeyTable(display,roi,prop,null, selectedPropFile);
+		kt = new KeyTable(display,roi,prop, selectedPropFile);
 
 		kt.createTable(c,panelForm);
 		this.pack();