diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java index 5f67325..db8bb5d 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java @@ -7,7 +7,6 @@ public DAGLayoutAction(Editor editor) { super("DAG Layout", editor); - // TODO Auto-generated constructor stub } @Override diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java index 252d0f9..c09178c 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java @@ -40,7 +40,7 @@ mxGraphView view = graph.getView(); mxCellState state = view.getState(cell); - if(!"ellipse".equals(state.getStyle().get("shape")) && (cell.getEdgeCount() == 1)) { + if (!"ellipse".equals(state.getStyle().get("shape")) && (cell.getEdgeCount() == 1)) { List newline = new ArrayList(); map.add(newline); lines(map, cell); @@ -48,20 +48,20 @@ } } - //���בւ� + // ���בւ� sort(map, 0, false); - //layout + // layout int count; int skip = 0; mxGraphView view = graph.getView(); - for(int i = 0; i < map.size(); i++) { + for (int i = 0; i < map.size(); i++) { count = 0; - for(int j = 0; j < map.get(i).size(); j++) { + for (int j = 0; j < map.get(i).size(); j++) { mxGeometry geom = (mxGeometry) map.get(i).get(j).getGeometry().clone(); mxCellState state = view.getState(map.get(i).get(j)); - if(checkmoved(moved, map.get(i).get(j))) { - if("ellipse".equals(state.getStyle().get("shape"))){ + if (checkmoved(moved, map.get(i).get(j))) { + if ("ellipse".equals(state.getStyle().get("shape"))){ geom.setX(50 + j*200); } else { geom.setX(100 + j*200); @@ -69,8 +69,8 @@ geom.setY(100 + (i-skip)*100); model.setGeometry(map.get(i).get(j), geom); moved.add(map.get(i).get(j).getId()); - } else if(geom.getX() < 100 + j*150) { - if("ellipse".equals(state.getStyle().get("shape"))){ + } else if (geom.getX() < 100 + j*150) { + if ("ellipse".equals(state.getStyle().get("shape"))){ geom.setX(50 + j*200); } else { geom.setX(100 + j*200); @@ -81,11 +81,10 @@ count++; } } - if(count >= map.get(i).size())skip++; + if (count >= map.get(i).size())skip++; } - } - finally { + } finally { model.endUpdate(); } } @@ -95,13 +94,13 @@ mapping.get(mapping.size()-1).add(next); int tagcount = 0; mxCell edge; - for(int i = 0; i < next.getEdgeCount(); i++) { + for (int i = 0; i < next.getEdgeCount(); i++) { edge = (mxCell) next.getEdgeAt(i); - if(next != (mxCell) edge.getTarget() && ((mxCell) edge.getTarget() != null)) { + if (next != (mxCell) edge.getTarget() && ((mxCell) edge.getTarget() != null)) { tagcount++; - if(tagcount > 1) { + if (tagcount > 1) { List newline = new ArrayList(mapping.get(mapping.size()-1)); - while(newline.get(newline.size()-1).getId() != next.getId()) { + while (newline.get(newline.size()-1).getId() != next.getId()) { newline.remove(newline.size()-1); } mapping.add(newline); @@ -115,8 +114,8 @@ } public boolean checkmoved(List list, mxCell cell) { - for(int i = 0; i < list.size(); i++) { - if(list.get(i).equals(cell.getId()))return false; + for (int i = 0; i < list.size(); i++) { + if (list.get(i).equals(cell.getId()))return false; } return true; } @@ -124,20 +123,20 @@ public void sort(List> map, int n, boolean check) { int msize = -1; int mnum = -1; - if(check) { - for(int i = n; i < map.size(); i++) { - if(map.get(i).size() > msize && (map.get(n-1).get(0).getId().equals(map.get(i).get(0).getId()))) { + if (check) { + for (int i = n; i < map.size(); i++) { + if (map.get(i).size() > msize && (map.get(n-1).get(0).getId().equals(map.get(i).get(0).getId()))) { mnum = i; } } } else { - for(int i = n; i < map.size(); i++) { - if(map.get(i).size() > msize) { + for (int i = n; i < map.size(); i++) { + if (map.get(i).size() > msize) { mnum = i; } } } - if(mnum >= 0) { + if (mnum >= 0) { Collections.swap(map, n, mnum); sort(map, n+1, true); } else if(n < map.size()) {