From 853bea0d15f75e8b83c04e9cb71f8566d401d086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Thu, 31 Mar 2016 17:29:55 +0200
Subject: [PATCH] worked on dot export/cleanup
---
.../graph/export/dot/AbstractDotWriter.java | 9 +---
.../graph/export/dot/DotSubgraphWriter.java | 1 +
.../analysis/graph/export/dot/DotWriter2.java | 41 -------------------
3 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java b/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java
index b5f3f2c2..bf7f2894 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java
@@ -9,6 +9,7 @@ import kieker.analysis.graph.Vertex;
import kieker.analysis.graph.export.AbstractTransformer;
import kieker.analysis.graph.util.dot.DotWriter;
+//TODo rename, extends AbstractWriter
class AbstractDotWriter extends AbstractTransformer<Void> {
protected final DotWriter dotWriter;
@@ -35,7 +36,7 @@ class AbstractDotWriter extends AbstractTransformer<Void> {
dotWriter.addClusterStart(childGraph.getName());
// TODO more stuff
- DotSubgraphWriter dotWriter2 = new DotSubgraphWriter(childGraph, dotWriter);
+ AbstractDotWriter dotWriter2 = new AbstractDotWriter(childGraph, dotWriter);
dotWriter2.transform();
dotWriter.addClusterStop();
@@ -66,12 +67,6 @@ class AbstractDotWriter extends AbstractTransformer<Void> {
@Override
protected Void getTransformation() {
- // TODO own method
- try {
- dotWriter.finish();
- } catch (IOException e) {
- // TODO Handle IO Exception
- }
return null;
}
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java b/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java
index a7582a1a..514182bd 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java
@@ -9,6 +9,7 @@ import kieker.analysis.graph.Vertex;
import kieker.analysis.graph.export.AbstractTransformer;
import kieker.analysis.graph.util.dot.DotWriter;
+//TODO not used
class DotSubgraphWriter extends AbstractTransformer<Void> {
private final DotWriter dotWriter;
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java b/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java
index 73015cff..417f897b 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java
@@ -3,10 +3,7 @@ package kieker.analysis.graph.export.dot;
import java.io.IOException;
import java.io.Writer;
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
import kieker.analysis.graph.util.dot.DotWriter;
//TODO rename
@@ -24,44 +21,6 @@ public class DotWriter2 extends AbstractDotWriter {
}
}
- @Override
- protected void mapVertex(final Vertex vertex) {
- try {
- if (vertex.hasChildGraph()) {
- Graph childGraph = vertex.getChildGraph();
-
- dotWriter.addClusterStart(childGraph.getName());
- // TODO more stuff
-
- DotSubgraphWriter dotWriter2 = new DotSubgraphWriter(childGraph, dotWriter);
- dotWriter2.transform();
-
- dotWriter.addClusterStop();
- } else {
-
- dotWriter.addNode(vertex.getId().toString(), null); // TODO
-
- }
- } catch (IOException e) {
- // TODO Handle IO Exception
- }
- }
-
- @Override
- protected void mapEdge(final Edge edge) {
- // TODO Auto-generated method stub
-
- try {
-
- String sourceId = edge.getVertex(Direction.OUT).getId().toString();
- String targetId = edge.getVertex(Direction.IN).getId().toString();
- dotWriter.addEdge(sourceId, targetId); // TODO
- } catch (IOException e) {
- // TODO Handle IO Exception
- }
-
- }
-
@Override
protected Void getTransformation() {
// TODO own method
--
GitLab