From 1b5c986a41c5a0b31b75d6d92eee4d41904f364b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 20 Aug 2012 16:04:32 +0200
Subject: Remembered why Steve used an IntegerWrapper - so the int would be
 mutable. Just return the int instead.

---
 .../c2kernel/graph/layout/DefaultGraphLayoutGenerator.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java b/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
index 1ab332a..2533066 100644
--- a/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
+++ b/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
@@ -21,7 +21,7 @@ public class DefaultGraphLayoutGenerator {
         Vertex start = graphModel.getStartVertex();
         Vector<Vector<Vertex>> rowVector = new Vector<Vector<Vertex>>(10, 10);
         int[] midPoints = null;
-        Integer valueOfLargestMidPoint = new Integer(0);
+        int valueOfLargestMidPoint = 0;
         if (start == null) {
             Logger.msg(1,"Error graph must have a starting vertex to be layed out");
             return;
@@ -29,7 +29,7 @@ public class DefaultGraphLayoutGenerator {
         graphModel.clearTags(start);
         visitVertex(graphModel, start, 0, rowVector, start);
         midPoints = new int[rowVector.size()];
-        calculateRowMidPoints(rowVector, midPoints, valueOfLargestMidPoint);
+        valueOfLargestMidPoint = calculateRowMidPoints(rowVector, midPoints, valueOfLargestMidPoint);
         fillInVertexLocations(graphModel, rowVector, valueOfLargestMidPoint, midPoints);
         fillInEdgeLocations(graphModel);
         graphModel.forceNotify();
@@ -59,22 +59,24 @@ public class DefaultGraphLayoutGenerator {
         rowsVertices.add(vertex);
     }
 
-    private static void calculateRowMidPoints(Vector<Vector<Vertex>> rowVector, int[] midPoints, Integer valueOfLargestMidPoint) {
+    private static int calculateRowMidPoints(Vector<Vector<Vertex>> rowVector, int[] midPoints, int valueOfLargestMidPoint) {
         Vector<Vertex> rowsVertices = null;
+        int newValueOfLargestMidPoint = valueOfLargestMidPoint;
         int rowsWidth = 0;
         int i = 0;
         for (i = 0; i < midPoints.length; i++) {
             rowsVertices = rowVector.elementAt(i);
             rowsWidth = mHorzGap * (rowsVertices.size() - 1);
             midPoints[i] = rowsWidth / 2;
-            if (midPoints[i] > valueOfLargestMidPoint) {
-                valueOfLargestMidPoint = midPoints[i];
+            if (midPoints[i] > newValueOfLargestMidPoint) {
+            	newValueOfLargestMidPoint = midPoints[i];
             }
         }
+        return newValueOfLargestMidPoint;
     }
 
     private static void fillInVertexLocations(GraphModel graphModel, Vector<Vector<Vertex>> rowVector,
-        Integer valueOfLargestMidPoint, int[] midPoints) {
+        int valueOfLargestMidPoint, int[] midPoints) {
             Vector<Vertex> rowsVertices = null;
             Vertex vertex = null;
             int rowIndex = 0;
-- 
cgit v1.2.3