From 61559eef9369dbdbb027bec7c571d7f770b2e7a3 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 11 Jul 2012 15:12:59 +0200
Subject: Moved getVertex(Point) and getEdge(Point) to GraphPanel in
 cristal-gui

---
 .../java/com/c2kernel/graph/model/GraphModel.java  | 50 ----------------------
 1 file changed, 50 deletions(-)

diff --git a/src/main/java/com/c2kernel/graph/model/GraphModel.java b/src/main/java/com/c2kernel/graph/model/GraphModel.java
index 63fe0e3..9c11190 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModel.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModel.java
@@ -2,7 +2,6 @@ package com.c2kernel.graph.model;
 
 import java.io.Serializable;
 import java.util.Hashtable;
-import java.util.Vector;
 
 import com.c2kernel.graph.event.ClearedEvent;
 import com.c2kernel.graph.event.EdgeRemovedEvent;
@@ -199,59 +198,10 @@ public class GraphModel implements Serializable {
         return edges;
     }
 
-    // If the specified point is within more than one vertex,
-    // then the smallest vertex is returned.
-    public Vertex getVertex(GraphPoint p) {
-        Object[] vertexObjs = mVertexHashtable.values().toArray();
-        Vertex vertex = null;
-        Vector<Vertex> vertexVector = new Vector<Vertex>(10, 10);
-        int numVerticesFound = 0;
-        Vertex smallestVertex = null;
-        int sizeOfSmallestVertex = 0;
-        int sizeOfVertex = 0;
-        int i = 0;
-        for (i = 0; i < vertexObjs.length; i++) {
-            vertex = (Vertex)vertexObjs[i];
-            if (vertex.containsPoint(p)) {
-                vertexVector.add(vertex);
-            }
-        }
-        numVerticesFound = vertexVector.size();
-        if (numVerticesFound == 0) {
-            return null;
-        }
-        else {
-            smallestVertex = vertexVector.elementAt(0);
-            sizeOfSmallestVertex = smallestVertex.getHeight() * smallestVertex.getWidth();
-            // Determine the smallest vertex
-            for (i = 1; i < numVerticesFound; i++) {
-                vertex = vertexVector.elementAt(i);
-                sizeOfVertex = vertex.getHeight() * vertex.getWidth();
-                if (sizeOfVertex < sizeOfSmallestVertex) {
-                    smallestVertex = vertex;
-                    sizeOfSmallestVertex = sizeOfVertex;
-                }
-            }
-            return smallestVertex;
-        }
-    }
-
 	public Vertex getVertexById(int id) {
 		return mVertexHashtable.get(String.valueOf(id));
 	}
 
-    public DirectedEdge getEdge(GraphPoint p) {
-        Object[] edgeObjs = mEdgeHashtable.values().toArray();
-        DirectedEdge edge = null;
-        int i = 0;
-        for (i = 0; i < edgeObjs.length; i++) {
-            edge = (DirectedEdge)edgeObjs[i];
-            if (edge.containsPoint(p)) {
-                return edge;
-            }
-        }
-        return null;
-    }
 
     public int addEdgeAndCreateId(DirectedEdge e, int originId, int terminusId) {
         return addEdgeAndCreateId(e, resolveVertex(originId), resolveVertex(terminusId));
-- 
cgit v1.2.3