remove warnings in city m2m package

Author: David Baum

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

@@ -8,11 +8,11 @@
 import org.getaviz.generator.city.CityUtils;
 import org.getaviz.generator.database.DatabaseConnector;
 
-public class BrickLayout {
+class BrickLayout {
 	private static SettingsConfiguration config = SettingsConfiguration.getInstance();
 	private static DatabaseConnector connector = DatabaseConnector.getInstance();
 
-	public static void brickLayout(Long model) {
+	static void brickLayout(Long model) {
 		StatementResult buildings = connector
 				.executeRead("MATCH (n:City:Model)-[:CONTAINS*]->(b:Building) WHERE ID(n) = " + model + " RETURN b");
 		while (buildings.hasNext()) {
@@ -35,7 +35,7 @@ private static void separateBuilding(Node building) {
 				bsPosIndex_X, bsPosIndex_Y, bsPosIndex_Z;
 		double b_lowerLeftX, b_upperY, b_lowerLeftZ;
 		sideCapacity = building.get("sideCapacity").asInt();
-		List<Node> classElements = null;
+		List<Node> classElements;
 		switch (config.getClassElementsMode()) {
 		case ATTRIBUTES_ONLY:
 			classElements = CityUtils.getData(building.id());

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

@@ -12,7 +12,6 @@
 public class BuildingSegmentComparator implements Comparable<BuildingSegmentComparator> {
 	private Node segment;
 	private Node relatedEntity;
-	// Temporary attribute to use db and famix in same transformation
 	private int coarseValue; // compares class elements (methods <-> attributes)
 	private int fineValue; // compared after coarseValue
 	private int finerValue; // compared after finevalue, if it was equal
@@ -39,40 +38,27 @@ public BuildingSegmentComparator(final Node segment) {
 		case NOS: // numberOfStatements compared directly in compareTo-method
 			finerValue = getCompValue_Type(relatedEntity); // If NOS are equal, sort for types
 			break;
-		case UNSORTED:
-			break;
-		default:
+			case UNSORTED:
+			default:
 			break;
 		}
 	}
 
-	static int getCompValue_Visibility(final String modifier) {
-		if (modifier.indexOf("private") >= 0) {
-			return SortPriorities_Visibility.PRIVATE;
-		} else if (modifier.indexOf("protected") >= 0) {
-			return SortPriorities_Visibility.PROTECTED;
-		} else if (modifier.indexOf("public") >= 0) {
-			return SortPriorities_Visibility.PUBLIC;
-		} else {
-			return SortPriorities_Visibility.PACKAGE;
-		}
-
-	}
-
-	static int getCompValue_Visibility(final Node relatedEntity) {
+	private static int getCompValue_Visibility(final Node relatedEntity) {
 		String visbility = relatedEntity.get("visibility").asString();
-		if (visbility.equals("private")) {
-			return SortPriorities_Visibility.PRIVATE;
-		} else if (visbility.equals("protected")) {
-			return SortPriorities_Visibility.PROTECTED;
-		} else if (visbility.equals("public")) {
-			return SortPriorities_Visibility.PUBLIC;
-		} else {
-			return SortPriorities_Visibility.PACKAGE;
+		switch (visbility) {
+			case "private":
+				return SortPriorities_Visibility.PRIVATE;
+			case "protected":
+				return SortPriorities_Visibility.PROTECTED;
+			case "public":
+				return SortPriorities_Visibility.PUBLIC;
+			default:
+				return SortPriorities_Visibility.PACKAGE;
 		}
 	}
 
-	static int getCompValue_Type(final Node relatedEntity) {
+	private static int getCompValue_Type(final Node relatedEntity) {
 		if (relatedEntity.hasLabel(Labels.Field.name())) {
 			boolean isPrimitive = false;
 			StatementResult result = connector.executeRead("MATCH (n)-[OF_TYPE]->(t:Primitive) WHERE ID(n) = " + relatedEntity.id() + " RETURN t");
@@ -105,25 +91,17 @@ static int getCompValue_Type(final Node relatedEntity) {
 
 	@Override
 	public int compareTo(final BuildingSegmentComparator comp) {
-		int result;
 		// Coarse sorting after attributes and methods if elements aren't the same type
 		// of class element
-		if (coarseValue < comp.coarseValue)
-			result = -1;
-		else if (coarseValue > comp.coarseValue)
-			result = 1;
-		else
-			result = 0;
+		int result = Integer.compare(coarseValue, comp.coarseValue);
 
 		if (result != 0)
 			return result;
 
 		// Sorting after fine sort mode between equal class elements types (e.g. method
 		// compared to method)
 		switch (config.getClassElementsSortModeFine()) {
-		case UNSORTED:
-			return 0;
-		case ALPHABETICALLY:
+			case ALPHABETICALLY:
 			String name = relatedEntity.get("name").asString();
 			result = name.compareTo(comp.relatedEntity.get("name").asString());
 			break;
@@ -145,7 +123,8 @@ else if (finerValue > comp.finerValue)
 				else
 					return 0;
 			break;
-		default:
+			case UNSORTED:
+			default:
 			return 0;
 		}
 
@@ -160,12 +139,7 @@ else if (finerValue > comp.finerValue)
 	private int compareNOS(final BuildingSegmentComparator comp) {
 		long numberOfStatements = relatedEntity.get("effectiveLineCount").asLong(0);
 		long numberOfStatementsComp = comp.relatedEntity.get("effectiveLineCount").asLong(0);
-		if (numberOfStatements < numberOfStatementsComp)
-			return 1;
-		else if (numberOfStatements > numberOfStatementsComp)
-			return -1;
-		else
-			return 0;
+		return Long.compare(numberOfStatementsComp, numberOfStatements);
 	}
 
 	public Node getSegment() {

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

@@ -28,7 +28,7 @@ public class City2City implements Step {
 	private Log log = LogFactory.getLog(this.getClass());
 	private List<OutputColor> PCKG_colors;
 	private List<OutputColor> NOS_colors;
-	private HashMap<Long, double[]> properties = new HashMap<Long, double[]>();
+	private HashMap<Long, double[]> properties = new HashMap<>();
 	private DatabaseConnector connector = DatabaseConnector.getInstance();
 	private OutputFormat outputFormat;
 
@@ -95,9 +95,7 @@ public void run() {
 		Node model = connector.executeRead("MATCH (n:Model {building_type: \'" + buildingTypeAsString +
 				"\'}) RETURN n").next().get("n").asNode();
 		if (buildingType == BuildingType.CITY_BRICKS || buildingType == BuildingType.CITY_PANELS) {
-			connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(m:BuildingSegment) RETURN m").forEachRemaining((result) -> {
-				setBuildingSegmentAttributes(result.get("m").asNode().id());
-			});
+			connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(m:BuildingSegment) RETURN m").forEachRemaining((result) -> setBuildingSegmentAttributes(result.get("m").asNode().id()));
 		}
 		int packageMaxLevel = connector.executeRead("MATCH p=(n:District)-[:CONTAINS*]->(m:District) WHERE NOT (m)-[:CONTAINS]->(:District) RETURN length(p) AS length ORDER BY length(p) DESC LIMIT 1").
 				single().get("length").asInt() + 1;
@@ -109,12 +107,8 @@ public void run() {
 			NOS_colors = OutputColor.createColorGradient(classColorStart, classColorEnd, NOS_max + 1);
 		}
 
-		connector.executeRead("MATCH p=(n:Model:City)-[:CONTAINS*]->(m:District) RETURN p").forEachRemaining((result) -> {
-			setDistrictAttributes(result.get("p").asPath());
-		});
-		connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(b:Building) RETURN b").forEachRemaining((result) -> {
-			setBuildingAttributes(result.get("b").asNode());
-		});
+		connector.executeRead("MATCH p=(n:Model:City)-[:CONTAINS*]->(m:District) RETURN p").forEachRemaining((result) -> setDistrictAttributes(result.get("p").asPath()));
+		connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(b:Building) RETURN b").forEachRemaining((result) -> setBuildingAttributes(result.get("b").asNode()));
 		connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(d:District)-[:VISUALIZES]->(element)  RETURN d, element.hash as hash ORDER BY element.hash").forEachRemaining((result) -> {
 			Node node = result.get("d").asNode();
 			double width = node.get("width").asDouble(0.0);
@@ -139,14 +133,10 @@ public void run() {
 			case CITY_BRICKS:
 				BrickLayout.brickLayout(model.id()); break; // Layout for buildingSegments
 			case CITY_PANELS:
-				connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(b:Building) RETURN b").forEachRemaining((result) -> {
-					setBuildingSegmentPositions(result.get("b").asNode());
-				});
+				connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(b:Building) RETURN b").forEachRemaining((result) -> setBuildingSegmentPositions(result.get("b").asNode()));
 				break;
 			case CITY_FLOOR:
-				connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(b:Building) RETURN b").forEachRemaining((result) -> {
-					calculateSegments(result.get("b").asNode());
-				});
+				connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(b:Building) RETURN b").forEachRemaining((result) -> calculateSegments(result.get("b").asNode()));
 				break;
 			default: {
 			} // CityDebugUtils.infoEntities(cityRoot.document.entities, 0, true, true)
@@ -177,10 +167,10 @@ private void setBuildingAttributes(Node building) {
 	}
 
 	private void setBuildingAttributesOriginal(Node building, int methodCounter, int dataCounter) {
-		double width = 0.0;
-		double length = 0.0;
-		double height = 0.0;
-		String color = "";
+		double width;
+		double length;
+		double height;
+		String color;
 		if (dataCounter == 0) {
 			width = widthMin;
 			length = widthMin;
@@ -202,16 +192,15 @@ private void setBuildingAttributesOriginal(Node building, int methodCounter, int
 	}
 
 	private void setBuildingAttributesPanels(Node building, int methodCounter, int dataCounter) {
-		double height = 0.0;
-		double width = 0.0;
-		double length = 0.0;
-		String color = "";
+		double height;
+		double width;
+		double length;
 		if (showBuildingBase) {
 			height = heightMin;
 		} else {
 			height = 0;
 		}
-		int areaUnit = 1;
+		int areaUnit;
 		if (classElementsMode == ClassElementsModes.ATTRIBUTES_ONLY) {
 			areaUnit = methodCounter;
 		} else {
@@ -235,17 +224,11 @@ private String asPercentage(Color color) {
 		return r + " " + g + " " + b;
 	}
 
-	private String asPercentage(String color) {
-		Color c = Color.decode(color);
-		return asPercentage(c);
-	}
-
 	private void setBuildingAttributesBricks(Node building, int methodCounter, int dataCounter) {
-		double height = 0.0;
-		double width = 0.0;
-		double length = 0.0;
-		int sideCapacity = 0;
-		String color = "";
+		double height;
+		double width;
+		int sideCapacity;
+		String color;
 		if (showBuildingBase) {
 			height = heightMin;
 		} else {
@@ -280,18 +263,17 @@ private void setBuildingAttributesBricks(Node building, int methodCounter, int d
 		}
 		width = brickSize * sideCapacity + brickHorizontalMargin * 2 +
 			brickHorizontalGap * (sideCapacity - 1);
-		length = brickSize * sideCapacity + brickHorizontalMargin * 2 +
-			brickHorizontalGap * (sideCapacity - 1);
+		double length = brickSize * sideCapacity + brickHorizontalMargin * 2 +
+				brickHorizontalGap * (sideCapacity - 1);
 		connector.executeWrite(
 			cypherSetBuildingSegmentAttributes(building.id(), width, length, height, color) + ", n.sideCapacity = " +
 				sideCapacity);
 	}
 
 	private void setBuildingAttributesFloors(Node building, int methodCounter, int dataCounter) {
-		double width = 0.0;
-		double length = 0.0;
-		double height = 0.0;
-		String color = "";
+		double width;
+		double length;
+		double height;
 		if (dataCounter < 2) { // pko 2016
 			width = 2; // TODO in settings datei aufnehmen
 			length = 2;
@@ -330,14 +312,14 @@ private void setBuildingSegmentAttributesPanels(Long segment) {
 		List<Node> childsA = connector.executeRead(
 				"MATCH (s)-[:CONTAINS]->(child)-[r:VISUALIZES]->(e:Field) WHERE ID(s) = " + parent +
 					" AND NOT (e)<-[:DECLARES]-(:Enum) RETURN e").stream().map(s -> s.get("e").asNode()).collect(Collectors.toList());
-		int areaUnit = 1;
+		int areaUnit;
 		if (classElementsMode == ClassElementsModes.ATTRIBUTES_ONLY) {
 			areaUnit = childsM.size();
 		} else {
 			areaUnit = childsA.size();
 		}
-		double width = 0.0;
-		double length = 0.0;
+		double width;
+		double length;
 		if (areaUnit <= 1) {
 			width = widthMin;
 			length = widthMin;
@@ -567,10 +549,10 @@ private void calculateChimneys(Node building) {
 	// Calculates side capacity for progressive/balanced bricks layout
 	private int calculateSideCapacity(double value) {
 		int sc = 0; // side capacity
-		int lc = 0; // layer capacity
-		int nolMin = 0; // number of layers
-		int bcMin = 0; // building capacity min
-		int bcMax = 0; // building capacity max
+		int lc; // layer capacity
+		int nolMin; // number of layers
+		int bcMin; // building capacity min
+		int bcMax; // building capacity max
 		do {
 			sc++;
 			lc = sc * 4;

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

@@ -2,35 +2,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.getaviz.generator.city.m2m.Rectangle;
 
-public class CityKDTree{
-	public CityKDTree() {
-		super();
-		this.root = new CityKDTreeNode();
-	}
-
-	public CityKDTree(CityKDTreeNode root) {
-		super();
-		this.root = root;
-	}
+class CityKDTree{
 
-	public CityKDTree(Rectangle rectangle) {
+	CityKDTree(Rectangle rectangle) {
 		super();
 		this.root = new CityKDTreeNode(rectangle);
 	}
 
 	private CityKDTreeNode root;
 
-	public List<CityKDTreeNode> getFittingNodes(Rectangle r){
+	List<CityKDTreeNode> getFittingNodes(Rectangle r){
 		List<CityKDTreeNode> fittingNodes = new ArrayList<CityKDTreeNode>();
 		this.root.isEmptyLeaf(r, fittingNodes);
 		return fittingNodes;
 	}
-	public CityKDTreeNode getRoot() {
-		return root;
-	}
-	public void setRoot(CityKDTreeNode root) {
-		this.root = root;
-	}
+
 }