Remove 'IntegerWrapper' and just use the java one instead.

2 files changed, 6 insertions, 19 deletions

diff --git a/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java b/src/main/java/com/c2kernel/graph/layout/DefaultGraphLayoutGenerator.java
index 8ab91ef..1ab332a 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;

-        IntegerWrapper valueOfLargestMidPoint = new IntegerWrapper(0);

+        Integer valueOfLargestMidPoint = new Integer(0);

         if (start == null) {

             Logger.msg(1,"Error graph must have a starting vertex to be layed out");

             return;

@@ -59,7 +59,7 @@ public class DefaultGraphLayoutGenerator {
         rowsVertices.add(vertex);

     }

 

-    private static void calculateRowMidPoints(Vector<Vector<Vertex>> rowVector, int[] midPoints, IntegerWrapper valueOfLargestMidPoint) {

+    private static void calculateRowMidPoints(Vector<Vector<Vertex>> rowVector, int[] midPoints, Integer valueOfLargestMidPoint) {

         Vector<Vertex> rowsVertices = null;

         int rowsWidth = 0;

         int i = 0;

@@ -67,14 +67,14 @@ public class DefaultGraphLayoutGenerator {
             rowsVertices = rowVector.elementAt(i);

             rowsWidth = mHorzGap * (rowsVertices.size() - 1);

             midPoints[i] = rowsWidth / 2;

-            if (midPoints[i] > valueOfLargestMidPoint.mValue) {

-                valueOfLargestMidPoint.mValue = midPoints[i];

+            if (midPoints[i] > valueOfLargestMidPoint) {

+                valueOfLargestMidPoint = midPoints[i];

             }

         }

     }

 

     private static void fillInVertexLocations(GraphModel graphModel, Vector<Vector<Vertex>> rowVector,

-        IntegerWrapper valueOfLargestMidPoint, int[] midPoints) {

+        Integer valueOfLargestMidPoint, int[] midPoints) {

             Vector<Vertex> rowsVertices = null;

             Vertex vertex = null;

             int rowIndex = 0;

@@ -83,7 +83,7 @@ public class DefaultGraphLayoutGenerator {
             GraphPoint point = new GraphPoint(0, 0);

             for (rowIndex = 0; rowIndex < rowVector.size(); rowIndex++) {

                 rowsVertices = rowVector.elementAt(rowIndex);

-                rowsLeftMargin = mLeftMargin + valueOfLargestMidPoint.mValue - midPoints[rowIndex];

+                rowsLeftMargin = mLeftMargin + valueOfLargestMidPoint - midPoints[rowIndex];

                 for (column = 0; column < rowsVertices.size(); column++) {

                     vertex = rowsVertices.elementAt(column);

                     point.x = rowsLeftMargin + column * mHorzGap;

diff --git a/src/main/java/com/c2kernel/graph/layout/IntegerWrapper.java b/src/main/java/com/c2kernel/graph/layout/IntegerWrapper.java
deleted file mode 100644
index aaee858..0000000
--- a/src/main/java/com/c2kernel/graph/layout/IntegerWrapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.c2kernel.graph.layout;

-

-

-public class IntegerWrapper

-{

-	public int mValue = 0;

-

-

-	public IntegerWrapper(int value)

-	{

-		mValue = value;

-	}

-}