diff options
author | Jonas Smedegaard <dr@jones.dk> | 2025-04-29 07:19:10 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2025-04-29 07:19:10 +0200 |
commit | 705b7a5a32793f7ed8a24b8b35afe3f9d49348be (patch) | |
tree | 7cffeb0de03a4638b87f04e01e7193eacbeaeede /src/dk.biks.bachelorizer | |
parent | a5c3599d7bc7a9ef5583ad2d50a55975f030fbea (diff) |
tidy whitespace
Diffstat (limited to 'src/dk.biks.bachelorizer')
4 files changed, 24 insertions, 24 deletions
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java index 1b0e4e5..d004c6a 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java @@ -6,7 +6,7 @@ package dk.biks.bachelorizer; import java.util.List; /// Bachelorizer - Controller -public class Control{ +public class Control { /// Application model // (declared explicitly only to silence javadoc) @@ -22,7 +22,7 @@ public class Control{ /// /// @param model Application model /// @param view Application view - public Control(final GUI model, final Window view){ + public Control(final GUI model, final Window view) { this.model = model; this.view = view; } @@ -39,7 +39,7 @@ public class Control{ public void setParameters(final List<String> parameters) { boolean optionsDone = false; boolean studentAssigned = false; - for (String item : parameters) { + for (String item: parameters) { if (!optionsDone && item.matches("--")) { optionsDone = true; } else if (!item.startsWith("-")) { @@ -58,7 +58,7 @@ public class Control{ /// Enter activity /// /// @param s String entered - public void enterActivity(final String s){ + public void enterActivity(final String s) { model.addActivity(s); view.clearActivityEntry(); showActivities(); @@ -72,19 +72,19 @@ public class Control{ /// Display list of activity entries public void showActivities() { String toarea = ""; - for (String t : model.getActivities()) + for (String t: model.getActivities()) toarea += t + "\n"; view.setArea(toarea); } /// drop last activity entry - public void delOne(){ + public void delOne() { model.delOneActivity(); showActivities(); } /// drop all activity entries - public void delAll(){ + public void delAll() { model.delAllActivities(); showActivities(); } diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java index 1591f07..50c0a61 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java @@ -6,12 +6,11 @@ package dk.biks.bachelorizer; import java.util.ArrayList; /// Bachelorizer - GUI model -public class GUI{ +public class GUI { /// Default constructor // (declared explicitly only to silence javadoc) - public GUI(){ - } + public GUI() { } /// Activity list private Person student; @@ -22,39 +21,39 @@ public class GUI{ /// Add student /// /// @param name Name of student - public void addStudent(final String name){ + public void addStudent(final String name) { student = new Person(name); } /// Get student name /// /// @return name of student - public String getStudentName(){ + public String getStudentName() { return student.name; } /// Add activity to list /// /// @param s Activity to add - public void addActivity(final String s){ + public void addActivity(final String s) { list.add(s); } /// Get list of activities /// /// @return activity list - public ArrayList<String> getActivities(){ + public ArrayList<String> getActivities() { return list; } /// Delete last activity from list - public void delOneActivity(){ - if(list.size()>0) - list.remove(list.size()-1); + public void delOneActivity() { + if (list.size() > 0) + list.remove(list.size() - 1); } /// Delete all activities from list - public void delAllActivities(){ + public void delAllActivities() { list.clear(); } } diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java index 1382a4a..29b4759 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java @@ -62,17 +62,17 @@ public final class Graph { assertConnected(g); System.out.println( "\n\nGraph is connected" - +" (otherwise an exception was thrown)"); + + " (otherwise an exception was thrown)"); // collect disjoint choice sets ArrayList<Set<Vertex>> s = disjoint(g); System.out.printf( "\n\n%d disjoint choice sets collected:\n", s.size()); - for(Set<Vertex> verticeSet: s) { - System.out.print("set("+verticeSet.size()+"):"); + for (Set<Vertex> verticeSet: s) { + System.out.print("set(" + verticeSet.size() + "):"); for (Vertex v: GraphAlgorithms.sortVertex(verticeSet)) { - System.out.print(" "+v.toString()); + System.out.print(" " + v.toString()); } System.out.println(); } @@ -118,7 +118,7 @@ public final class Graph { /// since visitDepthFirst() recurses out-edges of all vertices. /// /// @param g Graph to inspect - /// @throws IllegalArgumentException + /// @throws IllegalArgumentException /// https://docs.oracle.com/javase/tutorial/essential/exceptions/runtime.html public static void assertConnected(final AbstractGraph g) { @@ -223,6 +223,7 @@ public final class Graph { h.insertEdge(s.toString(), t.toString(), sum); } } + return h; } diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java index 475de52..df29ced 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java @@ -109,7 +109,7 @@ public final class Window extends Application { /// @param f Text field /// @return HBox containing styled label and text field public HBox ourHBox(final String s, final TextField f) { - Label label = new Label(s+":"); + Label label = new Label(s + ":"); label.setStyle(LABEL_STYLE); return new HBox(10, label, f); |