소스 검색

keine doppelten knotennamen in einem graphen

Kolja Strohm 6 년 전
부모
커밋
cb51594e08
5개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. BIN
      bin/View/NodeView.class
  2. BIN
      bin/inputReader/Reader.class
  3. 0 3
      src/View/NodeView.java
  4. 4 0
      src/inputReader/Reader.java
  5. 1 1
      test.graph

BIN
bin/View/NodeView.class


BIN
bin/inputReader/Reader.class


+ 0 - 3
src/View/NodeView.java

@@ -3,11 +3,8 @@ package View;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
-import java.awt.Insets;
 
 import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.EtchedBorder;
 
 import Model.LayeredGraphNode;
 

+ 4 - 0
src/inputReader/Reader.java

@@ -65,7 +65,11 @@ public class Reader {
 			}
 		}
 		if( node.has( "name" ) )
+		{
+		    if( parent != null && parent.findNodeByName( node.getString( "name" ) ) != null )
+		        throw new JSONException( "Node " + node.getString( "name" ) + " is already known" );
 			newNode.setName( node.getString( "name" ) );
+		}
         if( node.has( "width" ) )
             newNode.setWidth( node.getInt( "width" ) );
         if( node.has( "height" ) )

+ 1 - 1
test.graph

@@ -1 +1 @@
-{"layers": [[{"name": "n1","width":10,"height":10,"x":0,"y":0},{"name":"n2","width":10,"height":10,"x":20,"y":0}],[{"name":"n3","width":10,"height":10,"x":0,"y":20},{"layers": [[{"name": "n1","width":10,"height":10,"x":0,"y":0},{"name":"n2","width":10,"height":10,"x":20,"y":0}],[{"name":"n3","width":10,"height":10,"x":0,"y":20}]],"edges":[{"source":"n1","target":"n3",},{"source":"n2","target":"n3"}],"name":"n0","x":20,"y":20,"width":10,"height":10}]],"edges":[{"source":"n1","target":"n3",},{"source":"n2","target":"n3"}],"name":"n0"}
+{"layers": [[{"name": "n1","width":10,"height":10,"x":0,"y":0},{"name":"n2","width":10,"height":10,"x":20,"y":0}],[{"name":"n3","width":10,"height":10,"x":0,"y":20},{"layers": [[{"name": "n1","width":10,"height":10,"x":0,"y":0},{"name":"n2","width":10,"height":10,"x":20,"y":0}],[{"name":"n3","width":10,"height":10,"x":0,"y":20}]],"edges":[{"source":"n1","target":"n3"},{"source":"n2","target":"n3"}],"name":"n0","x":20,"y":20,"width":10,"height":10}]],"edges":[{"source":"n1","target":"n3"},{"source":"n2","target":"n3"}],"name":"n0"}