diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 78ceab7..8bb5ea5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,7 @@
-
-
-
@@ -46,19 +43,19 @@
- {
+ "keyToString": {
+ "Application.OurApplication.executor": "Run",
+ "DefaultHtmlFileTemplate": "HTML File",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "git-widget-placeholder": "main",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "C:/Users/jonas/DHBW Dateien/Semester 2/Programmieren 2/Projekt/ProjektGraph/OurApplication",
+ "settings.editor.selected.configurable": "vcs.Git"
}
-}]]>
+}
diff --git a/OurApplication/OurDrawArea.java b/OurApplication/OurDrawArea.java
index 14c24c7..896949a 100644
--- a/OurApplication/OurDrawArea.java
+++ b/OurApplication/OurDrawArea.java
@@ -56,7 +56,7 @@ public class OurDrawArea extends DrawArea{
private void drawGraph(DirectedGraph ourGraph, Graphics g) {
String convertedMarking;
- /*Vector vertexes = new Vector();
+ Vector vertexes = new Vector();
for(MarkedVertex i : ourGraph.getAllVertexes()){
if(i.getMarking() != null){
@@ -64,7 +64,7 @@ public class OurDrawArea extends DrawArea{
}else{
convertedMarking = "";
}
- vertexes.add(new Vertex(i.getXCoordinate(), i.getYCoordinate(), convertedMarking, Color.GRAY));
+ vertexes.add(new Vertex(i.getXCoordinate(), i.getYCoordinate(), convertedMarking, i.getColor()));
}
Vector edges = new Vector();
@@ -75,9 +75,9 @@ public class OurDrawArea extends DrawArea{
Graph graph = new Graph(vertexes, edges, true, EdgeStyle.Direct);
- graph.draw(g);*/
+ graph.draw(g);
- Vector vertexes = new Vector();
+ /*Vector vertexes = new Vector();
for(MarkedVertex i : ourGraph.getAllVertexes()){
@@ -92,7 +92,7 @@ public class OurDrawArea extends DrawArea{
Graph graph = new Graph(vertexes, edges, true, EdgeStyle.Direct);
- graph.draw(g);
+ graph.draw(g);*/
}
}
diff --git a/graph/MarkedVertex.java b/graph/MarkedVertex.java
index 83af150..222a951 100644
--- a/graph/MarkedVertex.java
+++ b/graph/MarkedVertex.java
@@ -24,7 +24,7 @@ public class MarkedVertex extends Vertex{
// GET-ER
- /*public T getMarking() {
+ public T getMarking() {
return this.marking;
}
@@ -33,7 +33,7 @@ public class MarkedVertex extends Vertex{
public void setMarking(T t) {
this.marking = t;
- }*/
+ }
// Ausgabe
diff --git a/graph/Vertex.java b/graph/Vertex.java
index cd051da..473558b 100644
--- a/graph/Vertex.java
+++ b/graph/Vertex.java
@@ -2,7 +2,7 @@ package graph;
import java.awt.Color;
-public abstract class Vertex extends visualizationElements.Vertex {
+public abstract class Vertex{
// ATTRIBUTE
@@ -17,12 +17,15 @@ public abstract class Vertex extends visualizationElements.Vertex {
// KONSTRUKTOREN
public Vertex() {
- super(0, 0);
+
}
public Vertex(int xCoordinate, int yCoordinate, String name, Color color) {
- super(xCoordinate, yCoordinate, name, color);
+ this.xCoordinate = xCoordinate;
+ this.yCoordinate = yCoordinate;
+ this.name = name;
+ this.color = color;
}