generator2 refactoring

remove some warnings from intellij inspector

Author: David Baum

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/SettingsConfiguration.java

@@ -14,8 +14,6 @@
 import org.getaviz.generator.SettingsConfiguration.Bricks.Layout;
 import org.getaviz.generator.SettingsConfiguration.Original.BuildingMetric;
 import org.getaviz.generator.SettingsConfiguration.Panels.SeparatorModes;
-import org.getaviz.generator.database.DatabaseConnector;
-import org.neo4j.driver.v1.StatementResult;
 
 public class SettingsConfiguration {
 	private static PropertiesConfiguration config;
@@ -100,12 +98,10 @@ public String getInputFiles() {
 
 	public Metaphor getMetaphor() {
 		String metaphor = config.getString("metaphor", "rd");
-		switch (metaphor) {
-			case "city":
-				return Metaphor.CITY;
-			default:
-				return Metaphor.RD;
+		if ("city".equals(metaphor)) {
+			return Metaphor.CITY;
 		}
+		return Metaphor.RD;
 	}
 
 	public String getName() {
@@ -117,12 +113,10 @@ public String getOutputPath() {
 	}
 
 	public OutputFormat getOutputFormat() {
-		switch (config.getString("output.format", "aframe")) {
-		case "x3d":
+		if ("x3d".equals(config.getString("output.format", "aframe"))) {
 			return OutputFormat.X3D;
-		default:
-			return OutputFormat.AFrame;
 		}
+		return OutputFormat.AFrame;
 	}
 
 	public String getBuildingTypeAsString() {
@@ -287,12 +281,10 @@ public double getPanelSeparatorHeight() {
 
 	public BuildingMetric getOriginalBuildingMetric() {
 		String value = config.getString("city.original_building_metric", "none");
-		switch (value) {
-		case "nos":
+		if ("nos".equals(value)) {
 			return BuildingMetric.NOS;
-		default:
-			return BuildingMetric.NONE;
 		}
+		return BuildingMetric.NONE;
 	}
 
 	public double getWidthMin() {
@@ -447,8 +439,8 @@ public enum OutputFormat {
 	 * it can either be in a static or dynamic way 
 	 */
 
-	public static enum BuildingType {
-		CITY_ORIGINAL, CITY_PANELS, CITY_BRICKS, CITY_FLOOR;
+	public enum BuildingType {
+		CITY_ORIGINAL, CITY_PANELS, CITY_BRICKS, CITY_FLOOR
 	}
 
 	/**
@@ -478,7 +470,7 @@ public enum Schemes {
 	 * Defines which elements of a class are to show.
 	 */
 	public enum ClassElementsModes {
-		METHODS_ONLY, ATTRIBUTES_ONLY, METHODS_AND_ATTRIBUTES;
+		METHODS_ONLY, ATTRIBUTES_ONLY, METHODS_AND_ATTRIBUTES
 	}
 
 	/**
@@ -538,7 +530,7 @@ public enum Methods {;
 		 * @see ClassElementsSortModesFine
 		 * @see SortPriorities_Visibility
 		 */
-		public static enum SortPriorities_Types {;
+		public enum SortPriorities_Types {;
 
 			/**
 			 * Method is a constructor.
@@ -582,7 +574,7 @@ public enum Attributes {;
 		 * top.
 		 * @see ClassElementsSortModesFine
 		 */
-		public static enum SortPriorities_Types {;
+		public enum SortPriorities_Types {;
 
 			/** Type is a primitive like {@code boolean}, {@code int}. */
 			public static int PRIMITVE = 1;
@@ -634,7 +626,7 @@ public enum Layout {
 			 * {@code METHODS_AND_ATTRIBUTES}, the {@link Layout#BALANCED
 			 * PROGRESSIVE} layout and {@code PROGRESSIVE} layout are identical.
 			 */
-			PROGRESSIVE;
+			PROGRESSIVE
 
 		}
 	}
@@ -647,7 +639,7 @@ public enum Panels {
 		 * The panels can either touch each other without a gap, leave a gap
 		 * between them, or fill the space with a separator of a defined color.
 		 */
-		public static enum SeparatorModes {
+		public enum SeparatorModes {
 
 			/**
 			 * No space between the panels and they are placed on top of each
@@ -665,7 +657,7 @@ public static enum SeparatorModes {
 			 * Between the panels separators are placed with a fix height and
 			 * color.
 			 */
-			SEPARATOR;
+			SEPARATOR
 
 		}
 	}
@@ -674,7 +666,7 @@ public enum Original {
 		;
 		public enum BuildingMetric {
 			NONE,
-			NOS;
+			NOS
 		}
 	}
 

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/CityMetaphor.java

@@ -2,9 +2,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.getaviz.generator.ProgrammingLanguage;
 import org.getaviz.generator.*;
-
 import java.util.ArrayList;
 import java.util.List;
 

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/CityUtils.java

@@ -93,7 +93,7 @@ private static String setMethodColor(Node relatedEntity) {
 	 */
 
 	public static void sortBuildingSegments(final List<Node> segments) {
-		final List<BuildingSegmentComparator> sortedList = new ArrayList<BuildingSegmentComparator>(segments.size());
+		final List<BuildingSegmentComparator> sortedList = new ArrayList<>(segments.size());
 		for (Node segment : segments)
 			sortedList.add(new BuildingSegmentComparator(segment));
 		Collections.sort(sortedList);
@@ -103,7 +103,7 @@ public static void sortBuildingSegments(final List<Node> segments) {
 	}
 
 	public static List<Node> getChildren(Long parent) {
-		ArrayList<Node> children = new ArrayList<Node>();
+		ArrayList<Node> children = new ArrayList<>();
 		StatementResult childs = connector.executeRead("MATCH (n)-[:CONTAINS]->(child) WHERE ID(n) = " + parent + " RETURN child");
 		while(childs.hasNext()) {
 			children.add(childs.next().get("child").asNode());
@@ -113,7 +113,7 @@ public static List<Node> getChildren(Long parent) {
 
 	public static List<Node> getMethods(Long building) {
 		StatementResult result = connector.executeRead("MATCH (n)-[:CONTAINS]->(bs:BuildingSegment)-[:VISUALIZES]->(m:Method) WHERE ID(n) = " + building + " RETURN bs");
-		ArrayList<Node> methods = new ArrayList<Node>();
+		ArrayList<Node> methods = new ArrayList<>();
 		while(result.hasNext()) {
 			methods.add(result.next().get("bs").asNode());
 		}
@@ -122,7 +122,7 @@ public static List<Node> getMethods(Long building) {
 
 	public static List<Node> getData(Long building) {
 		StatementResult result = connector.executeRead("MATCH (n)-[:CONTAINS]->(bs:BuildingSegment)-[:VISUALIZES]->(f:Field) WHERE ID(n) = " + building + " RETURN bs");
-		ArrayList<Node> data = new ArrayList<Node>();
+		ArrayList<Node> data = new ArrayList<>();
 		while(result.hasNext()) {
 			data.add(result.next().get("bs").asNode());
 		}

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2m/CityKDTree.java

@@ -13,7 +13,7 @@ class CityKDTree{
 	private CityKDTreeNode root;
 
 	List<CityKDTreeNode> getFittingNodes(Rectangle r){
-		List<CityKDTreeNode> fittingNodes = new ArrayList<CityKDTreeNode>();
+		List<CityKDTreeNode> fittingNodes = new ArrayList<>();
 		this.root.isEmptyLeaf(r, fittingNodes);
 		return fittingNodes;
 	}

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2m/Rectangle.java

@@ -130,12 +130,7 @@ private void update() {
 	public int compareTo(Rectangle second) {
 		int firstComparison = Double.compare(this.area, second.getArea());
 		if (firstComparison == 0) {
-			int secondComparison = Double.compare(this.width, second.getWidth());
-			if (secondComparison == 0) {
-				return 0;
-			} else {
-				return secondComparison;
-			}
+			return Double.compare(this.width, second.getWidth());
 		} else {
 			return firstComparison;
 		}

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/jqa/C2JSON.java

@@ -51,7 +51,7 @@ public void run() {
 				fw = new FileWriter(path);
 				fw.write(toJSON(elements));
 			} catch (IOException e) {
-				System.err.println(e);
+				log.error(e);
 			} finally {
 				if (fw != null)
 					try {

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/jqa/JQA2JSON.java

@@ -41,7 +41,7 @@ public void run() {
 			fw = new FileWriter(path);
 			fw.write(toJSON(elements));
 		} catch (IOException e) {
-			System.err.println(e);
+			log.error(e);
 		} finally {
 			if (fw != null)
 				try {

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/Model.java

@@ -3,10 +3,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.getaviz.generator.database.DatabaseConnector;
-
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
-import java.util.Iterator;
 
 public class Model {
 

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/RDMetaphor.java

@@ -2,7 +2,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.getaviz.generator.ProgrammingLanguage;
 import org.getaviz.generator.*;
 
 import java.util.ArrayList;

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/SubDisk.java

@@ -3,7 +3,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.getaviz.generator.database.DatabaseConnector;
-import org.getaviz.generator.database.Labels;
 import org.getaviz.generator.rd.m2m.Position;
 import java.util.ArrayList;