Commit 9ba8a6ef authored by Riegel's avatar Riegel
Browse files

Code cleaning. Ref #69

parent 1d8506eb
Pipeline #10053 passed with stage
in 1 minute and 13 seconds
...@@ -24,7 +24,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer; ...@@ -24,7 +24,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer;
public class ReliefNode extends Renderable { public class ReliefNode extends Renderable {
private ReliefObject relief; private final ReliefObject relief;
public ReliefNode(ReliefObject relief) { public ReliefNode(ReliefObject relief) {
this.relief = relief; this.relief = relief;
......
...@@ -7,7 +7,7 @@ import javafx.beans.property.SimpleObjectProperty; ...@@ -7,7 +7,7 @@ import javafx.beans.property.SimpleObjectProperty;
public abstract class Renderable { public abstract class Renderable {
private ObjectProperty<CheckStatus> statusProperty = new SimpleObjectProperty<>(); private final ObjectProperty<CheckStatus> statusProperty = new SimpleObjectProperty<>();
/** /**
* @return the status * @return the status
......
...@@ -16,12 +16,11 @@ public class RenderableTreeCell extends TreeCell<Renderable> { ...@@ -16,12 +16,11 @@ public class RenderableTreeCell extends TreeCell<Renderable> {
protected void updateItem(Renderable item, boolean empty) { protected void updateItem(Renderable item, boolean empty) {
super.updateItem(item, empty); super.updateItem(item, empty);
if (!empty && item != null) { if (!empty && item != null) {
if (item instanceof ButtonRenderable) { if (item instanceof ButtonRenderable renderable) {
Button b = new Button("More ..."); Button b = new Button("More ...");
b.setMaxWidth(Double.MAX_VALUE); b.setMaxWidth(Double.MAX_VALUE);
setText(null); setText(null);
setGraphic(b); setGraphic(b);
ButtonRenderable renderable = (ButtonRenderable) item;
b.setOnAction(ae -> renderable.run()); b.setOnAction(ae -> renderable.run());
return; return;
} }
......
...@@ -4,7 +4,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer; ...@@ -4,7 +4,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer;
public class TextNode extends Renderable { public class TextNode extends Renderable {
private String text; private final String text;
public TextNode(String text) { public TextNode(String text) {
this.text = text; this.text = text;
......
...@@ -24,7 +24,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer; ...@@ -24,7 +24,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer;
public class TinNode extends Renderable { public class TinNode extends Renderable {
private TinObject tin; private final TinObject tin;
public TinNode(TinObject tin) { public TinNode(TinObject tin) {
this.tin = tin; this.tin = tin;
......
...@@ -10,9 +10,9 @@ import javafx.beans.value.ObservableValue; ...@@ -10,9 +10,9 @@ import javafx.beans.value.ObservableValue;
public class TreeRequirement { public class TreeRequirement {
private BooleanProperty enabled; private BooleanProperty enabled;
private ObservableValue<String> name; private final ObservableValue<String> name;
private SimpleStringProperty value; private SimpleStringProperty value;
private ObservableValue<String> unit; private final ObservableValue<String> unit;
private Requirement r; private Requirement r;
......
...@@ -24,17 +24,12 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer; ...@@ -24,17 +24,12 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer;
public class VegetationNode extends Renderable { public class VegetationNode extends Renderable {
private Vegetation veg; private final Vegetation veg;
private String text; private final String text;
public VegetationNode(Vegetation veg) { public VegetationNode(Vegetation veg) {
this.veg = veg; this.veg = veg;
StringBuilder sb = new StringBuilder(); text = "[" + veg.getVegetationType() + "] " + veg.getGmlId().getGmlString();
sb.append("[");
sb.append(veg.getVegetationType());
sb.append("] ");
sb.append(veg.getGmlId().getGmlString());
text = sb.toString();
} }
@Override @Override
......
...@@ -8,7 +8,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer; ...@@ -8,7 +8,7 @@ import de.hft.stuttgart.citydoctor2.gui.Renderer;
public class VertexNode extends Renderable { public class VertexNode extends Renderable {
private static DecimalFormat nf; private static final DecimalFormat nf;
static { static {
DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(); DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance();
...@@ -17,7 +17,7 @@ public class VertexNode extends Renderable { ...@@ -17,7 +17,7 @@ public class VertexNode extends Renderable {
} }
private static final String SEPERATOR = ", "; private static final String SEPERATOR = ", ";
private Vertex v; private final Vertex v;
private String text; private String text;
public VertexNode(Vertex v) { public VertexNode(Vertex v) {
...@@ -32,15 +32,8 @@ public class VertexNode extends Renderable { ...@@ -32,15 +32,8 @@ public class VertexNode extends Renderable {
@Override @Override
public String getText() { public String getText() {
if (text == null) { if (text == null) {
StringBuilder sb = new StringBuilder(); text = "Vertex [" + nf.format(v.getX()) + SEPERATOR +
sb.append("Vertex ["); nf.format(v.getY()) + SEPERATOR + nf.format(v.getZ()) + "]";
sb.append(nf.format(v.getX()));
sb.append(SEPERATOR);
sb.append(nf.format(v.getY()));
sb.append(SEPERATOR);
sb.append(nf.format(v.getZ()));
sb.append("]");
text = sb.toString();
} }
return text; return text;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment