Updated dependencies.

dustin · Nov 11, 2008 · ee0a2be · ee0a2be
1 parent a1374ba
commit ee0a2be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/.classpath b/.classpath
@@ -5,11 +5,11 @@
   <classpathentry kind="src" path="target/src"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/spy/jars/spy-2.2.36.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/spy/jars/spy-2.4.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/spy/jars/jwebkit-2.2.36.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/spy/jars/jwebkit-3.2.2.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/spy/jars/spyxmlrpc-2.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/spy/jars/spyxmlrpc-2.2.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-2.0.jar">
   </classpathentry>

diff --git a/project.xml b/project.xml
@@ -34,31 +34,25 @@
 		<dependency>
 			<groupId>spy</groupId>
 			<artifactId>spy</artifactId>
-			<version>2.2.36</version>
+			<version>2.4</version>
 			<properties><war.bundle>true</war.bundle></properties>
 		</dependency>
 		<dependency>
 			<groupId>spy</groupId>
 			<artifactId>jwebkit</artifactId>
-			<version>2.2.36</version>
+			<version>3.2.2</version>
 			<properties><war.bundle>true</war.bundle></properties>
 		</dependency>
 		<dependency>
 			<groupId>spy</groupId>
 			<artifactId>spyxmlrpc</artifactId>
-			<version>2.1</version>
+			<version>2.2</version>
 			<properties><war.bundle>true</war.bundle></properties>
 		</dependency>
-		<dependency>
-			<groupId>spy</groupId>
-			<artifactId>maven-tla-plugin</artifactId>
-			<version>1.0</version>
-			<type>plugin</type>
-		</dependency>
 		<dependency>
 			<groupId>spy</groupId>
 			<artifactId>maven-spy-build-plugin</artifactId>
-			<version>1.0</version>
+			<version>1.12</version>
 			<type>plugin</type>
 		</dependency>
 

diff --git a/src/java/net/spy/geo/PolygonFactory.java b/src/java/net/spy/geo/PolygonFactory.java
@@ -9,7 +9,6 @@
 
 import net.spy.SpyObject;
 import net.spy.cache.SimpleCache;
-import net.spy.db.DBSPLike;
 import net.spy.geo.sp.GetPolygonByID;
 import net.spy.geo.sp.GetPolygonDataByID;
 import net.spy.geo.sp.GetPossibleAreas;
@@ -34,7 +33,7 @@ public static PolygonFactory getInstance() {
 
 	/**
 	 * Get the polygon with the given ID.
-	 * 
+	 *
 	 * @param id the ID of the polygon we want.
 	 * @return the polygon
 	 * @throws Exception if we can't get it
@@ -62,7 +61,7 @@ private DBPolygon getPolygonFromDB(int id) throws Exception {
 			rv=new DBPolygon(rs);
 			rs.close();
 		} finally {
-			CloseUtil.close((DBSPLike)db);
+			CloseUtil.close(db);
 		}
 
 		GetPolygonDataByID db2=new GetPolygonDataByID(GeoConfig.getInstance());
@@ -75,7 +74,7 @@ private DBPolygon getPolygonFromDB(int id) throws Exception {
 						rs.getFloat("latitude"), rs.getFloat("longitude") ));
 			}
 		} finally {
-			CloseUtil.close((DBSPLike)db2);
+			CloseUtil.close(db2);
 		}
 
 		return rv;
@@ -86,7 +85,7 @@ private DBPolygon getPolygonFromDB(int id) throws Exception {
 	 */
 	public Collection<DBPolygon> getAreasForPoint(Point p)
 		throws Exception {
-	
+
 		// Find the potential matches.
 		Collection<DBPolygon> rv=new ArrayList<DBPolygon>();
 		ArrayList<Integer> a=new ArrayList<Integer>();
@@ -100,9 +99,9 @@ public Collection<DBPolygon> getAreasForPoint(Point p)
 			}
 			rs.close();
 		} finally {
-			CloseUtil.close((DBSPLike)db);
+			CloseUtil.close(db);
 		}
-	
+
 		// Filter out all of the polygons that don't contain the given point
 		PolygonFactory pf=getInstance();
 		for(int i : a) {
@@ -111,7 +110,7 @@ public Collection<DBPolygon> getAreasForPoint(Point p)
 				rv.add(poly);
 			}
 		}
-	
+
 		return(rv);
 	}
 }