Skip to content

Commit 72768d8

Browse files
author
David Baum
committed
remove warnings
1 parent 07a4806 commit 72768d8

17 files changed

Lines changed: 251 additions & 276 deletions

File tree

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

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
11
package org.getaviz.generator.city;
22

3-
import java.util.ArrayList;
4-
import java.util.Collections;
5-
import java.util.List;
6-
import org.neo4j.driver.v1.StatementResult;
7-
import org.neo4j.driver.v1.types.Node;
83
import org.getaviz.generator.SettingsConfiguration;
94
import org.getaviz.generator.city.m2m.BuildingSegmentComparator;
105
import org.getaviz.generator.database.DatabaseConnector;
116
import org.getaviz.generator.database.Labels;
7+
import org.neo4j.driver.v1.StatementResult;
8+
import org.neo4j.driver.v1.types.Node;
9+
10+
import java.util.ArrayList;
11+
import java.util.Collections;
12+
import java.util.List;
1213

1314
public class CityUtils {
1415

1516
private static SettingsConfiguration config = SettingsConfiguration.getInstance();
1617
private static DatabaseConnector connector = DatabaseConnector.getInstance();
1718

1819
public static String setBuildingSegmentColor(Node relatedEntity) {
19-
String color = "";
20+
String color;
2021
String visibility = relatedEntity.get("visibility").asString("");
2122
switch (config.getScheme()) {
2223
case VISIBILITY:
23-
if (visibility.equals("public")) {
24-
color = config.getCityColor("dark_green");
25-
} else if (visibility.equals("protected")) {
26-
color = config.getCityColor("yellow");
27-
} else if (visibility.equals("private")) {
28-
color = config.getCityColor("red");
29-
} else {
30-
// Package visibility or default
31-
color = config.getCityColor("blue");
24+
switch (visibility) {
25+
case "public":
26+
color = config.getCityColor("dark_green");
27+
break;
28+
case "protected":
29+
color = config.getCityColor("yellow");
30+
break;
31+
case "private":
32+
color = config.getCityColor("red");
33+
break;
34+
default:
35+
// Package visibility or default
36+
color = config.getCityColor("blue");
37+
break;
3238
}
3339
break;
3440
case TYPES:
@@ -48,7 +54,7 @@ public static String setBuildingSegmentColor(Node relatedEntity) {
4854
}
4955

5056
private static String setAttributeColor(Long relatedEntity) {
51-
String color = "";
57+
String color;
5258
boolean isPrimitive = false;
5359
StatementResult result = connector.executeRead("MATCH (n)-[OF_TYPE]->(t:Primitive) WHERE ID(n) = " + relatedEntity + " RETURN t");
5460
if(result.hasNext()) {
@@ -63,7 +69,7 @@ private static String setAttributeColor(Long relatedEntity) {
6369
}
6470

6571
private static String setMethodColor(Node relatedEntity) {
66-
String color = "";
72+
String color;
6773
boolean isStatic = relatedEntity.get("static").asBoolean(false);
6874
boolean isAbstract = relatedEntity.get("abstract").asBoolean(false);
6975

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
package org.getaviz.generator.city.m2m;
22

3+
import org.apache.commons.logging.Log;
4+
import org.apache.commons.logging.LogFactory;
35
import org.getaviz.generator.ColorGradient;
46
import org.getaviz.generator.SettingsConfiguration;
5-
import org.getaviz.generator.Step;
6-
import org.getaviz.generator.database.Labels;
77
import org.getaviz.generator.SettingsConfiguration.BuildingType;
8-
import org.getaviz.generator.city.CityUtils;
98
import org.getaviz.generator.SettingsConfiguration.ClassElementsModes;
109
import org.getaviz.generator.SettingsConfiguration.Original.BuildingMetric;
11-
import java.util.HashMap;
12-
import java.util.List;
13-
import java.util.stream.Collectors;
14-
import java.util.ArrayList;
1510
import org.getaviz.generator.SettingsConfiguration.Panels.SeparatorModes;
16-
import org.apache.commons.logging.Log;
17-
import org.apache.commons.logging.LogFactory;
11+
import org.getaviz.generator.Step;
12+
import org.getaviz.generator.city.CityUtils;
1813
import org.getaviz.generator.database.DatabaseConnector;
14+
import org.getaviz.generator.database.Labels;
1915
import org.neo4j.driver.v1.Record;
2016
import org.neo4j.driver.v1.StatementResult;
2117
import org.neo4j.driver.v1.types.Node;
2218
import org.neo4j.driver.v1.types.Path;
2319

20+
import java.util.ArrayList;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.stream.Collectors;
24+
2425
public class City2City implements Step {
2526
private Log log = LogFactory.getLog(this.getClass());
2627
private List<String> PCKG_colors;
@@ -96,7 +97,7 @@ public boolean checkRequirements() {
9697

9798
public void run() {
9899
log.info("City2City started");
99-
Node model = connector.executeRead("MATCH (n:Model {building_type: \'" + buildingTypeAsString +
100+
Node model = connector.executeRead("MATCH (n:Model {building_type: '" + buildingTypeAsString +
100101
"\'}) RETURN n").next().get("n").asNode();
101102
if (buildingType == BuildingType.CITY_BRICKS || buildingType == BuildingType.CITY_PANELS) {
102103
connector.executeRead("MATCH (n:Model:City)-[:CONTAINS*]->(m:BuildingSegment) RETURN m").forEachRemaining((result) -> setBuildingSegmentAttributes(result.get("m").asNode().id()));
@@ -151,7 +152,7 @@ public void run() {
151152
private void setDistrictAttributes(Path districtPath) {
152153
String color = PCKG_colors.get(districtPath.length() - 1);
153154
connector.executeWrite(
154-
String.format("MATCH (n) WHERE ID(n) = %d SET n.height = %f, n.color = \'%s\'", districtPath.end().id(),
155+
String.format("MATCH (n) WHERE ID(n) = %d SET n.height = %f, n.color = '%s'", districtPath.end().id(),
155156
heightMin, color));
156157
}
157158

@@ -556,7 +557,7 @@ private int calculateSideCapacity(double value) {
556557
private String cypherSetBuildingSegmentAttributes(Long segment, double width, double length, double height,
557558
String color) {
558559
return String.format(
559-
"MATCH (n) WHERE ID(n) = %d SET n.width = %f, n.length = %f, n.height = %f, n.color = \'%s\'", segment,
560+
"MATCH (n) WHERE ID(n) = %d SET n.width = %f, n.length = %f, n.height = %f, n.color = '%s'", segment,
560561
width, length, height, color);
561562
}
562563

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2m/CityLayout.java‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
package org.getaviz.generator.city.m2m;
22

3-
import java.util.ArrayList;
4-
import java.util.Collections;
5-
import java.util.LinkedHashMap;
6-
import java.util.List;
7-
import java.util.Map;
8-
import java.util.Map.Entry;
9-
import java.util.Set;
10-
3+
import org.getaviz.generator.SettingsConfiguration;
4+
import org.getaviz.generator.database.DatabaseConnector;
5+
import org.getaviz.generator.database.Labels;
116
import org.neo4j.driver.v1.Record;
127
import org.neo4j.driver.v1.StatementResult;
138
import org.neo4j.driver.v1.types.Node;
14-
import org.getaviz.generator.SettingsConfiguration;
15-
import org.getaviz.generator.database.Labels;
16-
import org.getaviz.generator.database.DatabaseConnector;
9+
10+
import java.util.*;
11+
import java.util.Map.Entry;
1712

1813
public class CityLayout {
1914
private static boolean DEBUG = false;
@@ -51,8 +46,8 @@ private static void arrangeChildrenRoot(Long model) {
5146
// ordered by
5247
// inserting-order
5348
Map<CityKDTreeNode, Double> expanders = new LinkedHashMap<>();
54-
CityKDTreeNode targetNode = new CityKDTreeNode();
55-
CityKDTreeNode fitNode = new CityKDTreeNode();
49+
CityKDTreeNode targetNode;
50+
CityKDTreeNode fitNode;
5651

5752
// check all empty leaves: either they extend COVREC (->expanders) or it doesn't
5853
// change (->preservers)
@@ -126,8 +121,8 @@ private static void arrangeChildren(Long entity) {
126121
// ordered by
127122
// inserting-order
128123
Map<CityKDTreeNode, Double> expanders = new LinkedHashMap<>();
129-
CityKDTreeNode targetNode = new CityKDTreeNode();
130-
CityKDTreeNode fitNode = new CityKDTreeNode();
124+
CityKDTreeNode targetNode;
125+
CityKDTreeNode fitNode;
131126

132127
// check all empty leaves: either they extend COVREC (->expanders) or it doesn't
133128
// change (->preservers)
@@ -223,10 +218,8 @@ private static void sortEmptyLeaf(CityKDTreeNode pnode, Rectangle el, Rectangle
223218
System.out.println("\t\t" + info + "Node is preserver. waste=" + waste);
224219
}
225220
} else {
226-
double ratio = ((nodeNewBottomRightX > covrec.getBottomRightX() ? nodeNewBottomRightX
227-
: covrec.getBottomRightX())
228-
/ (nodeNewBottomRightY > covrec.getBottomRightY() ? nodeNewBottomRightY
229-
: covrec.getBottomRightY()));
221+
double ratio = ((Math.max(nodeNewBottomRightX, covrec.getBottomRightX()))
222+
/ (Math.max(nodeNewBottomRightY, covrec.getBottomRightY())));
230223
expanders.put(pnode, ratio);
231224
if (DEBUG_Part2) {
232225
System.out.println(
@@ -360,17 +353,13 @@ private static void setNewPositionFromNode(Rectangle el, CityKDTreeNode fitNode)
360353
double y = node.get("height").asDouble() / 2;
361354
double z = fitNode.getRectangle().getCenterY() - config.getBuildingHorizontalGap() / 2;
362355
connector.executeWrite(String.format(
363-
"MATCH (n) WHERE ID(n) = %d CREATE (n)-[:HAS]->(p:Position:City {name: \'position\', x: %f, y: %f, z: %f})",
356+
"MATCH (n) WHERE ID(n) = %d CREATE (n)-[:HAS]->(p:Position:City {name: 'position', x: %f, y: %f, z: %f})",
364357
node.id(), x, y, z));
365358
}
366359

367360
private static void updateCovrec(CityKDTreeNode fitNode, Rectangle covrec) {
368-
double newX = (fitNode.getRectangle().getBottomRightX() > covrec.getBottomRightX()
369-
? fitNode.getRectangle().getBottomRightX()
370-
: covrec.getBottomRightX());
371-
double newY = (fitNode.getRectangle().getBottomRightY() > covrec.getBottomRightY()
372-
? fitNode.getRectangle().getBottomRightY()
373-
: covrec.getBottomRightY());
361+
double newX = (Math.max(fitNode.getRectangle().getBottomRightX(), covrec.getBottomRightX()));
362+
double newY = (Math.max(fitNode.getRectangle().getBottomRightY(), covrec.getBottomRightY()));
374363
covrec.changeRectangle(0, 0, newX, newY);
375364
if (DEBUG) {
376365
System.out.println(

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2t/City2AFrame.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5-
import org.getaviz.generator.Step;
65
import org.getaviz.generator.SettingsConfiguration;
6+
import org.getaviz.generator.SettingsConfiguration.BuildingType;
7+
import org.getaviz.generator.Step;
78
import org.getaviz.generator.database.DatabaseConnector;
89
import org.getaviz.generator.database.Labels;
9-
import org.getaviz.generator.SettingsConfiguration.BuildingType;
10-
import java.io.IOException;
11-
import java.io.FileWriter;
1210
import org.getaviz.generator.output.AFrame;
1311
import org.neo4j.driver.v1.types.Node;
12+
13+
import java.io.FileWriter;
14+
import java.io.IOException;
1415
import java.util.ArrayList;
1516
import java.util.List;
1617

@@ -119,7 +120,7 @@ private String toDistrict(Node district, Node position) {
119120

120121
private String toBuilding(Node building, Node position) {
121122
Node entity = connector.getVisualizedEntity(building.id());
122-
String builder = "<a-box id=\"" + entity.get("hash").asString() + "\"" +
123+
return "<a-box id=\"" + entity.get("hash").asString() + "\"" +
123124
"\t\t position=\"" + position.get("x") + " " + position.get("y") + " " + position.get("z") + "\"" +
124125
"\n" +
125126
"\t\t width=\"" + building.get("width") + "\"" +
@@ -132,7 +133,6 @@ private String toBuilding(Node building, Node position) {
132133
"\n" +
133134
"</a-box>" +
134135
"\n";
135-
return builder;
136136
}
137137

138138
private String buildPosition(Node position) {
@@ -227,7 +227,7 @@ private String toBuildingSegment(Node segment, Node position) {
227227

228228
private String toFloor(Node floor, Node position) {
229229
Node entity = connector.getVisualizedEntity(floor.id());
230-
String builder = "<a-box id=\"" + entity.get("hash").asString() + "\"" +
230+
return "<a-box id=\"" + entity.get("hash").asString() + "\"" +
231231
"\n" +
232232
buildPosition(position) +
233233
"\n" +
@@ -241,12 +241,11 @@ private String toFloor(Node floor, Node position) {
241241
"\n" +
242242
"</a-box>" +
243243
"\n";
244-
return builder;
245244
}
246245

247246
private String toChimney(Node chimney, Node position) {
248247
Node entity = connector.getVisualizedEntity(chimney.id());
249-
String builder = "<a-box id=\"" + entity.get("hash").asString() + "\"" +
248+
return "<a-box id=\"" + entity.get("hash").asString() + "\"" +
250249
"\n" +
251250
buildPosition(position) +
252251
"\n" +
@@ -260,6 +259,5 @@ private String toChimney(Node chimney, Node position) {
260259
"\n" +
261260
"</a-box>" +
262261
"\n";
263-
return builder;
264262
}
265263
}

0 commit comments

Comments
 (0)