code partially refactored

Author: tsuyoikaze

src/Main.java

@@ -3,12 +3,8 @@
 import java.util.List;
 
 import org.ohdsi.rabbitInAHat.dataModel.Field;
-import org.ohdsi.rabbitInAHat.dataModel.ItemToItemMap;
 import org.ohdsi.rabbitInAHat.dataModel.Table;
-import org.ohdsi.whiteRabbit.ObjectExchange;
 
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
@@ -195,11 +191,9 @@ public void toggle(List<? extends Expandable> list) {
 
 	@Override
 	public void expand() {
-		System.out.println("Expanding itself...");
 		expandingTable = this;
 		double currY = y + height;
 		for (Field fd : table.getFields()) {
-			System.out.println("Processing " + fd.getName());
 			currY += FIELD_INTERVAL;
 			FieldRectangle newNode = new FieldRectangle(currY, fd);
 			fieldRectList.add(newNode);

src/SourceTableRectangle.java

@@ -5,8 +5,7 @@
 import org.ohdsi.rabbitInAHat.dataModel.Field;
 import org.ohdsi.rabbitInAHat.dataModel.Table;
 import org.ohdsi.whiteRabbit.ObjectExchange;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
+
 import javafx.event.EventHandler;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
@@ -89,11 +88,8 @@ public void handle(MouseEvent arg0) {
 							ObjectExchange.etl.getTableToTableMapping().addSourceToTargetMap(SourceTableRectangle.selectingField.field.getTable(), TargetTableRectangle.selectingField.field.getTable());
 						}
 						ObjectExchange.etl.getFieldToFieldMapping(SourceTableRectangle.selectingField.field.getTable(), TargetTableRectangle.selectingField.field.getTable()).addSourceToTargetMap(SourceTableRectangle.selectingField.field, TargetTableRectangle.selectingField.field);
-						System.out.println("Clicked");
 						TargetTableRectangle.selectingField.field.setDisplayName(TargetTableRectangle.selectingField.field.getName() + " <" + SourceTableRectangle.selectingField.field.getTable().getName() + "." + SourceTableRectangle.selectingField.field.getName() + ">");
 
-						System.out.println("Starting point: (" + SourceTableRectangle.selectingField.getBoundsInParent().getMaxX() + "," + (SourceTableRectangle.selectingField.getBoundsInParent().getMinY() + 0.5 * SourceTableRectangle.selectingField.getHeight()) + ")");
-						System.out.println("Ending   point: (" + TargetTableRectangle.selectingField.getBoundsInParent().getMinX() + "," + (TargetTableRectangle.selectingField.getBoundsInParent().getMinY() + 0.5 * TargetTableRectangle.selectingField.getHeight()) + ")");
 						if (Arrow.displayPane == null) {
 							Arrow.displayPane = displayPane;
 						}
@@ -212,11 +208,9 @@ public void toggle(List<? extends Expandable> list) {
 
 	@Override
 	public void expand() {
-		System.out.println("Expanding itself...");
 		expandingTable = this;
 		double currY = y + height;
 		for (Field fd : table.getFields()) {
-			System.out.println("Processing " + fd.getName());
 			currY += FIELD_INTERVAL;
 			FieldRectangle newNode = new FieldRectangle(currY, fd);
 			fieldRectList.add(newNode);

src/TargetTableRectangle.java

@@ -1,16 +1,10 @@
 package org.ohdsi.rabbitInAHat;
 
-import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import org.ohdsi.databases.DbType;
 import org.ohdsi.rabbitInAHat.dataModel.DataType;
@@ -25,8 +19,6 @@
 import org.ohdsi.utilities.exception.UnsupportedDataTypeException;
 import org.ohdsi.whiteRabbit.ObjectExchange;
 
-import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils.Collections;
-
 public class ETLSQLGenerator {
 
 	public static final String HEADER_COMMENT = "# AUTOMATICALLY GENERATED BY RabbitInAHat\n# MUST USE WITH THE SAME DATABASE AS THE SOURCE TABLES\n\n";
@@ -205,7 +197,6 @@ public static Field getUniqueSourceField (Table sourceTable, Table targetTable)
 		if (uniqueField == null) {
 			return null;
 		}
-		Field sourceField = null;
 		List<Mapping<Field>> allMaps = ObjectExchange.etl.getAllMaps();
 		List<MappableItem> sourceFields = new ArrayList<>();
 		for (Mapping<Field> map_ : allMaps) {