summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-09-29 10:33:41 +0200
committerAndrew Branson <andrew.branson@cern.ch>2014-09-29 10:33:41 +0200
commitb305b9ae7e44ce00d947b44f9cc516cac74f6d70 (patch)
tree63591c13aaa262b927b93840ce1d66bb34bb3986
parent202041b7fb62b1075d23b2e6ab8a5366d71f1766 (diff)
Merge vertex gui classes into main collection package to simplify
-rw-r--r--src/main/java/com/c2kernel/collection/Aggregation.java2
-rw-r--r--src/main/java/com/c2kernel/collection/AggregationVertexFactory.java (renamed from src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java)3
-rw-r--r--src/main/java/com/c2kernel/collection/AggregationVertexOutlineCreator.java (renamed from src/main/java/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java)2
3 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/com/c2kernel/collection/Aggregation.java
index 12b24be..4b2b429 100644
--- a/src/main/java/com/c2kernel/collection/Aggregation.java
+++ b/src/main/java/com/c2kernel/collection/Aggregation.java
@@ -1,7 +1,5 @@
package com.c2kernel.collection;
-
-import com.c2kernel.collection.gui.model.AggregationVertexOutlineCreator;
import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.graph.model.GraphModel;
import com.c2kernel.graph.model.GraphPoint;
diff --git a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java b/src/main/java/com/c2kernel/collection/AggregationVertexFactory.java
index 1a20c5e..2c27a06 100644
--- a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexFactory.java
+++ b/src/main/java/com/c2kernel/collection/AggregationVertexFactory.java
@@ -1,6 +1,5 @@
-package com.c2kernel.collection.gui.model;
+package com.c2kernel.collection;
-import com.c2kernel.collection.Aggregation;
import com.c2kernel.graph.model.GraphModelManager;
import com.c2kernel.graph.model.GraphPoint;
import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
diff --git a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java b/src/main/java/com/c2kernel/collection/AggregationVertexOutlineCreator.java
index b28af2e..536566e 100644
--- a/src/main/java/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java
+++ b/src/main/java/com/c2kernel/collection/AggregationVertexOutlineCreator.java
@@ -1,4 +1,4 @@
-package com.c2kernel.collection.gui.model;
+package com.c2kernel.collection;
import com.c2kernel.graph.model.GraphPoint;
import com.c2kernel.graph.model.Vertex;