Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/NodeDao.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/NodeDao.java	(revision 5261)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/NodeDao.java	(working copy)
@@ -14,6 +14,6 @@
 
     public abstract Collection getInterfaceCollection(Node node);
 
-    public abstract Collection findAll();
+    public abstract Collection<Node> findAll();
 
 }
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeDaoHibernate.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeDaoHibernate.java	(revision 5261)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeDaoHibernate.java	(working copy)
@@ -74,7 +74,7 @@
      
     }
 
-    public Collection findAll() {
+    public Collection<Node> findAll() {
         // TODO Auto-generated method stub
         return null;
     }
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/GraphDefinition.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/GraphDefinition.java	(revision 5261)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/GraphDefinition.java	(working copy)
@@ -36,7 +36,7 @@
 		graphDataElements.remove(ds);
 	}
 	
-	public LinkedList getGraphDataElements() {
+	public LinkedList<GraphDataElement> getGraphDataElements() {
 		return graphDataElements;
 	}
 	
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/NodeServiceImpl.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/NodeServiceImpl.java	(revision 5261)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/NodeServiceImpl.java	(working copy)
@@ -23,13 +23,13 @@
 		m_nodeDao = nodeDao;
 	}
 
-    public Set findAll() {
-        return new HashSet(m_nodeDao.findAll());
+    public Set<Node> findAll() {
+        return new HashSet<Node>(m_nodeDao.findAll());
     }
 
-    public Set findWithMatchingLabel(String searchKey) {
+    public Set<Node> findWithMatchingLabel(String searchKey) {
         Collection nodes = m_nodeDao.findAll();
-        Set matching = new HashSet();
+        Set<Node> matching = new HashSet<Node>();
         for (Iterator it = nodes.iterator(); it.hasNext();) {
             Node node = (Node) it.next();
             if (node.getNodeLabel().startsWith(searchKey)) {
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/ServiceServiceImpl.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/ServiceServiceImpl.java	(revision 5261)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/ServiceServiceImpl.java	(working copy)
@@ -2,12 +2,9 @@
 
 import java.util.HashSet;
 
-import org.opennms.secret.dao.NodeInterfaceDao;
 import org.opennms.secret.dao.ServiceDao;
 import org.opennms.secret.model.InterfaceService;
-import org.opennms.secret.model.Node;
 import org.opennms.secret.model.NodeInterface;
-import org.opennms.secret.service.NodeInterfaceService;
 import org.opennms.secret.service.ServiceService;
 
 public class ServiceServiceImpl implements ServiceService {
@@ -19,8 +16,8 @@
         m_serviceDao = serviceDao;
     }
     
-    public HashSet getServices(NodeInterface iface) {
-		HashSet services = new HashSet();
+    public HashSet<InterfaceService> getServices(NodeInterface iface) {
+		HashSet<InterfaceService> services = new HashSet<InterfaceService>();
 		for (int i = 0; i < 5; i++) {
 			InterfaceService service = new InterfaceService();
 			service.setId(new Long(i));
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/web/GraphCartTileController.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/web/GraphCartTileController.java	(revision 5261)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/web/GraphCartTileController.java	(working copy)
@@ -36,10 +36,8 @@
 package org.opennms.secret.web;
 
 import java.awt.Color;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -46,9 +44,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.struts.tiles.ComponentContext;
-import org.opennms.netmgt.config.rrd.Datasources;
-import org.opennms.netmgt.config.rrd.Def;
-import org.opennms.netmgt.config.rrd.Rrd_graph_def;
 import org.opennms.secret.model.DataSource;
 import org.opennms.secret.model.GraphDataElement;
 import org.opennms.secret.model.GraphDataLine;
@@ -75,7 +70,7 @@
 //        Rrd_graph_def graph = getGraph(request);
         GraphDefinition graphDef = getGraphDef(request);
 //        Datasources dataSources = getGraphDataSources(graph);
-        LinkedList dataSources = getGraphDataSources(graphDef);
+        LinkedList<GraphDataElement> dataSources = getGraphDataSources(graphDef);
         
         if (clearDataSources(request)) {
             dataSources = newDataSources(graphDef);
@@ -109,8 +104,8 @@
     }
     */
     
-    private LinkedList getGraphDataSources(GraphDefinition graphDef) {
-        LinkedList dataSources = graphDef.getGraphDataElements();
+    private LinkedList<GraphDataElement> getGraphDataSources(GraphDefinition graphDef) {
+        LinkedList<GraphDataElement> dataSources = graphDef.getGraphDataElements();
         if (dataSources == null) {
             dataSources = newDataSources(graphDef);
         }
@@ -118,8 +113,8 @@
     }
 
 
-    private LinkedList newDataSources(GraphDefinition graphDef) {
-        LinkedList dataSources = new LinkedList();
+    private LinkedList<GraphDataElement> newDataSources(GraphDefinition graphDef) {
+        LinkedList<GraphDataElement> dataSources = new LinkedList<GraphDataElement>();
         graphDef.setGraphDataElements(dataSources);
         
         return dataSources;
@@ -169,7 +164,7 @@
     }
     */
     
-    private void addDataSource(LinkedList dataSources, HttpSession session, String dataSourceId) {
+    private void addDataSource(LinkedList<GraphDataElement> dataSources, HttpSession session, String dataSourceId) {
         if (m_dataSourceService == null) {
             throw new IllegalStateException("setDataSourceService has never been called to initialize the DataSourceService provider");
         }