[GeoNetwork-commit] SF.net SVN: geonetwork: [570] trunk/src/org/wfp/vam/intermap

[<e_t...@us...>]

Revision: 570
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=570&view=rev
Author:   e_tajariol
Date:     2007-07-05 11:41:33 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Fixes for java 1.5.

Modified Paths:
--------------
    trunk/src/org/wfp/vam/intermap/kernel/map/DefaultMapServers.java
    trunk/src/org/wfp/vam/intermap/services/map/AddServices.java
    trunk/src/org/wfp/vam/intermap/services/map/MainEmbedded.java
    trunk/src/org/wfp/vam/intermap/services/map/MapUtil.java

Modified: trunk/src/org/wfp/vam/intermap/kernel/map/DefaultMapServers.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/map/DefaultMapServers.java	2007-07-05 18:27:31 UTC (rev 569)
+++ trunk/src/org/wfp/vam/intermap/kernel/map/DefaultMapServers.java	2007-07-05 18:41:33 UTC (rev 570)
@@ -42,7 +42,7 @@
 	private static Element getServersEl(Element config)
 	{
 		Element elServers = (Element)(config.getChild(Constants.MAP_SERVERS).detach());
-		List servers = elServers.getChildren();
+		List<Element> servers = elServers.getChildren();
 
 		// Set the id attribute for each server
 		int n = 1;
@@ -55,7 +55,7 @@
 	private static Element getContextsEl(Element config)
 	{
 		Element elContexts = (Element)config.getChild(Constants.MAP_CONTEXTS).clone();
-		List contextList = elContexts.getChildren(Constants.MAP_CONTEXT);
+		List<Element> contextList = elContexts.getChildren(Constants.MAP_CONTEXT);
 
 		// Set the id attribute for each server
 		int n = 1;
@@ -80,7 +80,7 @@
 	private static Hashtable getContextsHt(Element config)
 	{
 		Element elContexts = (Element)config.getChild(Constants.MAP_CONTEXTS).clone();
-		List lContexts = elContexts.getChildren();
+		List<Element> lContexts = elContexts.getChildren();
 
 		// Set the id attribute for each server
 		Hashtable htContexts = new Hashtable();

Modified: trunk/src/org/wfp/vam/intermap/services/map/AddServices.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/services/map/AddServices.java	2007-07-05 18:27:31 UTC (rev 569)
+++ trunk/src/org/wfp/vam/intermap/services/map/AddServices.java	2007-07-05 18:41:33 UTC (rev 570)
@@ -32,7 +32,7 @@
 		// get some request parameters
 		String serverUrl = params.getChildText(Constants.MAP_SERVER_URL);
 		int serverType = Integer.parseInt(params.getChildText(Constants.MAP_SERVER_TYPE));
-		List lServices = params.getChildren(Constants.MAP_SERVICE);
+		List<Element> lServices = params.getChildren(Constants.MAP_SERVICE);
 
 
 		Element response = new Element("response");

Modified: trunk/src/org/wfp/vam/intermap/services/map/MainEmbedded.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/services/map/MainEmbedded.java	2007-07-05 18:27:31 UTC (rev 569)
+++ trunk/src/org/wfp/vam/intermap/services/map/MainEmbedded.java	2007-07-05 18:41:33 UTC (rev 570)
@@ -1,6 +1,7 @@
 //==============================================================================
 package org.wfp.vam.intermap.services.map;
 
+import java.util.List;
 import jeeves.interfaces.Service;
 import jeeves.server.ServiceConfig;
 import jeeves.server.context.ServiceContext;
@@ -134,12 +135,12 @@
 		Element mapContext = DefaultMapServers.getDefaultContext();
 
 		// Add each layer in the map context to the map
-		for (Element elServer: mapContext.getChildren("server"))
+		for (Element elServer: (List<Element>)mapContext.getChildren("server"))
 		{
 			String serverType = elServer.getAttributeValue(Constants.MAP_SERVER_TYPE);
 			String serverUrl  = elServer.getAttributeValue(Constants.MAP_SERVER_URL);
 
-			for (Element elLayer: elServer.getChildren(Constants.MAP_LAYER))
+			for (Element elLayer: (List<Element>)elServer.getChildren(Constants.MAP_LAYER))
 			{
 				try
 				{

Modified: trunk/src/org/wfp/vam/intermap/services/map/MapUtil.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/services/map/MapUtil.java	2007-07-05 18:27:31 UTC (rev 569)
+++ trunk/src/org/wfp/vam/intermap/services/map/MapUtil.java	2007-07-05 18:41:33 UTC (rev 570)
@@ -89,7 +89,7 @@
 
 	protected static void setVisibleLayers(Element request, MapMerger mm)
 	{
-		for(Element param : request.getChildren())
+		for(Element param : (List<Element>)request.getChildren())
 		{
 			String key   = param.getName();
 			String value = param.getText();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.