Revize 2563518e

Changed vertex.title to vertex.name and removed archetype.name from title

sources/src/main/java/cz/zcu/kiv/offscreen/api/BaseVertex.java

@@ -10 +10 @@
     private int id;
     /** Identification number which is in input file. */
     private int originalId;
-    /** Title of vertex. */
-    private String title;
+    /** Name of vertex. */
+    private String name;
     /** Index of vertex archetype. */
     private int archetypeIndex;
     /** Additional info. */
     private String text;
 
-    public BaseVertex(int id, int originalId, String title, int archetypeIndex, String text) {
+    public BaseVertex(int id, int originalId, String name, int archetypeIndex, String text) {
         this.id = id;
         this.originalId = originalId;
-        this.title = title;
+        this.name = name;
         this.archetypeIndex = archetypeIndex;
         this.text = text;
     }
@@ -41 +41 @@
         this.originalId = originalId;
     }
 
-    public String getTitle() {
-        return title;
+    public String getName() {
+        return name;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public int getArchetype() {

sources/src/main/java/cz/zcu/kiv/offscreen/api/Vertex.java

@@ -14 +14 @@
      * Create new vertex.
      * @param id new generated identification number.
      * @param originalId original identification number from input file
-     * @param title title of vertex
+     * @param name of vertex
      * @param archetypeIndex index of vertex archetype
      * @param text additional info
      * @param attributes List of all attributes. Every attribute is stored in String array in pair as {attribute name, attribute value}.
      */
-    public Vertex(int id, int originalId, String title, int archetypeIndex, String text, List<String[]> attributes) {
-        super(id, originalId, title, archetypeIndex, text);
+    public Vertex(int id, int originalId, String name, int archetypeIndex, String text, List<String[]> attributes) {
+        super(id, originalId, name, archetypeIndex, text);
         this.attributes = attributes;
     }
 

sources/src/main/java/cz/zcu/kiv/offscreen/graph/GraphManager.java

@@ -145 +145 @@
      * vertices with the archetypeIndex as the key.
      *
      * @param id             - ID of the vertex to add
-     * @param title          - Title of the vertex
+     * @param name           - Name of the vertex
      * @param text           - Text of the vertex
      * @param archetypeIndex - Type of archetype associated with this vertex
      * @param attributes     - Map of attributes associated with the vertex
      */
-    public void addVertex(int id, String title, String text, int archetypeIndex, Map<Integer, Attribute> attributes) {
-        VertexImpl vertexToAdd = new VertexImpl(id, id, title, archetypeIndex, text);
+    public void addVertex(int id, String name, String text, int archetypeIndex, Map<Integer, Attribute> attributes) {
+        VertexImpl vertexToAdd = new VertexImpl(id, id, name, archetypeIndex, text);
         if (vertices.containsKey(archetypeIndex)) {
             vertices.get(archetypeIndex).add(vertexToAdd);
         } else {
@@ -505 +505 @@
     private void addVerticesToGraph(Graph graph, Set<VertexImpl> resultVertices) {
         for (VertexImpl vertexImpl : resultVertices) {
 
-            VertexArchetype archetype = vertexArchetypes.get(vertexImpl.getArchetype());
-            String title = archetype.name + ":" + vertexImpl.getTitle();
             List<String[]> attributes = getAttributesAsArray(vertexImpl.getSortedAttributes());
 
-            Vertex vertex = new Vertex(lastVertexOrGroupId++, vertexImpl.getOriginalId(), title, vertexImpl.getArchetype(), vertexImpl.getText(), attributes);
+            Vertex vertex = new Vertex(
+                    lastVertexOrGroupId++,
+                    vertexImpl.getOriginalId(),
+                    vertexImpl.getName(),
+                    vertexImpl.getArchetype(),
+                    vertexImpl.getText(),
+                    attributes);
 
             graph.addVertex(vertexImpl.getId(), vertex);
         }

sources/src/main/java/cz/zcu/kiv/offscreen/graph/VertexImpl.java

@@ -15 +15 @@
      * Creates new vertex.
      * @param id new generated identification number.
      * @param originalId original identification number from input file
-     * @param title title of vertex
+     * @param name of vertex
      * @param archetypeIndex index of vertex archetype
      * @param text additional info
      */
-    public VertexImpl(int id, int originalId, String title, int archetypeIndex, String text) {
-        super(id, originalId, title, archetypeIndex, text);
+    public VertexImpl(int id, int originalId, String name, int archetypeIndex, String text) {
+        super(id, originalId, name, archetypeIndex, text);
         this.attributesMap = new HashMap<>();
     }