aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/com.example.portfolio2/com/example/portfolio2/MyDB.java8
-rw-r--r--src/com.example.portfolio3/com/example/portfolio3/AbstractGraph.java6
-rw-r--r--src/com.example.portfolio3/com/example/portfolio3/AdjListGraph.java8
-rw-r--r--src/com.example.portfolio3/com/example/portfolio3/Edge.java8
-rw-r--r--src/com.example.portfolio3/com/example/portfolio3/MatrixGraph.java8
-rw-r--r--src/com.example.portfolio3/com/example/portfolio3/Vertex.java4
-rw-r--r--src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java12
-rw-r--r--src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java12
8 files changed, 33 insertions, 33 deletions
diff --git a/src/com.example.portfolio2/com/example/portfolio2/MyDB.java b/src/com.example.portfolio2/com/example/portfolio2/MyDB.java
index ea0f6d6..942f0b9 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/MyDB.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/MyDB.java
@@ -21,7 +21,7 @@ public class MyDB {
}
/// foo
- public void open() {
+ public final void open() {
try {
String url = "jdbc:sqlite:identifier.sqlite";
conn = DriverManager.getConnection(url);
@@ -36,7 +36,7 @@ public class MyDB {
}
/// foo
- public void close() {
+ public final void close() {
try {
if (conn != null) {
conn.close();
@@ -49,7 +49,7 @@ public class MyDB {
/// foo
/// @param sql foo
- public void cmd(final String sql) {
+ public final void cmd(final String sql) {
if (conn == null) {
open();
}
@@ -79,7 +79,7 @@ public class MyDB {
/// @param query foo
/// @param fld foo
/// @return foo
- public ArrayList<String> query(final String query, final String fld) {
+ public final ArrayList<String> query(final String query, final String fld) {
ArrayList<String> res = new ArrayList<>();
if (conn == null) {
open();
diff --git a/src/com.example.portfolio3/com/example/portfolio3/AbstractGraph.java b/src/com.example.portfolio3/com/example/portfolio3/AbstractGraph.java
index dbd4aa8..054fa65 100644
--- a/src/com.example.portfolio3/com/example/portfolio3/AbstractGraph.java
+++ b/src/com.example.portfolio3/com/example/portfolio3/AbstractGraph.java
@@ -21,7 +21,7 @@ public abstract class AbstractGraph implements Graph {
/// foo
/// @param s foo
/// @return Vertex
- public Vertex vertex(final String s) {
+ public final Vertex vertex(final String s) {
if (vertexMap.containsKey(s)) {
return vertexMap.get(s);
}
@@ -33,12 +33,12 @@ public abstract class AbstractGraph implements Graph {
}
/// foo
- public void insertEdge(final String v, final String u, final int w) {
+ public final void insertEdge(final String v, final String u, final int w) {
insertEdge(vertex(v), vertex(u), w);
}
/// foo
- public Collection<Vertex> vertices() {
+ public final Collection<Vertex> vertices() {
return vertexSet;
}
diff --git a/src/com.example.portfolio3/com/example/portfolio3/AdjListGraph.java b/src/com.example.portfolio3/com/example/portfolio3/AdjListGraph.java
index f90172e..f6e1130 100644
--- a/src/com.example.portfolio3/com/example/portfolio3/AdjListGraph.java
+++ b/src/com.example.portfolio3/com/example/portfolio3/AdjListGraph.java
@@ -18,7 +18,7 @@ public class AdjListGraph extends AbstractGraph {
private Map<Vertex,Set<Edge>> outEdge = new HashMap<>();
/// foo
- public void insertEdge(final Vertex v1, final Vertex v2, final int w) {
+ public final void insertEdge(final Vertex v1, final Vertex v2, final int w) {
Edge e = new Edge(v1, v2, w);
if (!outEdge.containsKey(e.from())) {
outEdge.put(e.from(), new HashSet<Edge>());
@@ -27,7 +27,7 @@ public class AdjListGraph extends AbstractGraph {
}
/// foo
- public Collection<Edge> edges() {
+ public final Collection<Edge> edges() {
Set<Edge> edges = new HashSet<>();
for (Vertex v: outEdge.keySet()) {
edges.addAll(outEdge.get(v));
@@ -37,7 +37,7 @@ public class AdjListGraph extends AbstractGraph {
}
/// foo
- public Collection<Edge> outEdge(final Vertex v) {
+ public final Collection<Edge> outEdge(final Vertex v) {
if (!outEdge.containsKey(v)) {
return new HashSet<Edge>();
}
@@ -46,7 +46,7 @@ public class AdjListGraph extends AbstractGraph {
}
/// foo
- public Integer getWeight(final Vertex v1, final Vertex v2) {
+ public final Integer getWeight(final Vertex v1, final Vertex v2) {
// linear in number of outedges from vertices
if (!outEdge.containsKey(v1)) {
diff --git a/src/com.example.portfolio3/com/example/portfolio3/Edge.java b/src/com.example.portfolio3/com/example/portfolio3/Edge.java
index 065b6ae..c4fa227 100644
--- a/src/com.example.portfolio3/com/example/portfolio3/Edge.java
+++ b/src/com.example.portfolio3/com/example/portfolio3/Edge.java
@@ -13,19 +13,19 @@ public class Edge {
/// foo
/// @return Vertex
- public Vertex from() {
+ public final Vertex from() {
return from;
}
/// foo
/// @return Vertex
- public Vertex to() {
+ public final Vertex to() {
return to;
}
/// foo
/// @return int
- public int weight() {
+ public final int weight() {
return weight;
}
@@ -41,7 +41,7 @@ public class Edge {
/// foo
/// @return String
- public String toString() {
+ public final String toString() {
return from.name() + " - " + weight + " -> " + to.name();
}
}
diff --git a/src/com.example.portfolio3/com/example/portfolio3/MatrixGraph.java b/src/com.example.portfolio3/com/example/portfolio3/MatrixGraph.java
index 67c095e..463bf8d 100644
--- a/src/com.example.portfolio3/com/example/portfolio3/MatrixGraph.java
+++ b/src/com.example.portfolio3/com/example/portfolio3/MatrixGraph.java
@@ -51,12 +51,12 @@ public class MatrixGraph extends AbstractGraph {
}
/// foo
- public void insertEdge(final Vertex v1, final Vertex v2, final int w) {
+ public final void insertEdge(final Vertex v1, final Vertex v2, final int w) {
matrix[getIndex(v1)][getIndex(v2)] = w;
}
/// foo
- public Collection<Edge> edges() {
+ public final Collection<Edge> edges() {
HashSet<Edge> edges = new HashSet<>();
for (int i = 0; i < numVertex; i++) {
for (int j = 0; j < numVertex; j++) {
@@ -72,7 +72,7 @@ public class MatrixGraph extends AbstractGraph {
}
/// foo
- public Collection<Edge> outEdge(final Vertex v1) {
+ public final Collection<Edge> outEdge(final Vertex v1) {
HashSet<Edge> edges = new HashSet<>();
int i = vertex2index.get(v1);
for (int j = 0; j < numVertex; j++) {
@@ -87,7 +87,7 @@ public class MatrixGraph extends AbstractGraph {
}
/// foo
- public Integer getWeight(final Vertex v1, final Vertex v2) {
+ public final Integer getWeight(final Vertex v1, final Vertex v2) {
// constant time operation
return matrix[vertex2index.get(v1)][vertex2index.get(v2)];
diff --git a/src/com.example.portfolio3/com/example/portfolio3/Vertex.java b/src/com.example.portfolio3/com/example/portfolio3/Vertex.java
index 420263a..979728c 100644
--- a/src/com.example.portfolio3/com/example/portfolio3/Vertex.java
+++ b/src/com.example.portfolio3/com/example/portfolio3/Vertex.java
@@ -11,7 +11,7 @@ public class Vertex {
/// foo
///
/// @return String
- public String name() {
+ public final String name() {
return name;
}
@@ -25,7 +25,7 @@ public class Vertex {
/// foo
///
/// @return String
- public String toString() {
+ public final String toString() {
return name;
}
}
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java
index a90aca1..93c0324 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java
@@ -36,7 +36,7 @@ public class Control {
/// and remaining ones as activity selections
///
/// @param parameters Application parameters
- public void setParameters(final List<String> parameters) {
+ public final void setParameters(final List<String> parameters) {
boolean optionsDone = false;
boolean studentAssigned = false;
for (String item: parameters) {
@@ -58,19 +58,19 @@ public class Control {
/// Enter activity
///
/// @param s String entered
- public void enterActivity(final String s) {
+ public final void enterActivity(final String s) {
model.addActivity(s);
view.clearActivityEntry();
showActivities();
}
/// Display student
- public void showStudent() {
+ public final void showStudent() {
view.setStudentName(model.getStudentName());
}
/// Display list of activity entries
- public void showActivities() {
+ public final void showActivities() {
String toarea = "";
for (String t: model.getActivities()) {
toarea += t + "\n";
@@ -79,13 +79,13 @@ public class Control {
}
/// drop last activity entry
- public void delOne() {
+ public final void delOne() {
model.delOneActivity();
showActivities();
}
/// drop all activity entries
- public void delAll() {
+ public final 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 cd52b3c..f3a399c 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
@@ -21,40 +21,40 @@ public class GUI {
/// Add student
///
/// @param name Name of student
- public void addStudent(final String name) {
+ public final void addStudent(final String name) {
student = new Person(name);
}
/// Get student name
///
/// @return name of student
- public String getStudentName() {
+ public final String getStudentName() {
return student.name;
}
/// Add activity to list
///
/// @param s Activity to add
- public void addActivity(final String s) {
+ public final void addActivity(final String s) {
list.add(s);
}
/// Get list of activities
///
/// @return activity list
- public ArrayList<String> getActivities() {
+ public final ArrayList<String> getActivities() {
return list;
}
/// Delete last activity from list
- public void delOneActivity() {
+ public final void delOneActivity() {
if (list.size() > 0) {
list.remove(list.size() - 1);
}
}
/// Delete all activities from list
- public void delAllActivities() {
+ public final void delAllActivities() {
list.clear();
}
}