Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/DataSourceDaoSimple.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/DataSourceDaoSimple.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/DataSourceDaoSimple.java	(working copy)
@@ -14,7 +14,7 @@
 import org.opennms.secret.model.NodeInterface;
 
 public class DataSourceDaoSimple implements DataSourceDao {
-    private HashMap m_dataSources = new HashMap();
+    private HashMap<String, DataSource> m_dataSources = new HashMap<String, DataSource>();
 
 	public void inititalize(Object obj) {
 	}
@@ -19,8 +19,8 @@
 	public void inititalize(Object obj) {
 	}
 
-	public List getDataSourcesByInterface(NodeInterface iface) {
-		List dataSources = new LinkedList();
+	public List<DataSource> getDataSourcesByInterface(NodeInterface iface) {
+		List<DataSource> dataSources = new LinkedList<DataSource>();
 		DataSource a = new DataSource();
 		a.setId ("interface-" + iface.getId() + "-performance-" + "ifInOctets");
 		a.setName ("In Octets");
@@ -84,8 +84,8 @@
 		return a;
 	}
 
-	public List getDataSourcesByNode(Node node) {
-		List dataSources = new LinkedList();
+	public List<DataSource> getDataSourcesByNode(Node node) {
+		List<DataSource> dataSources = new LinkedList<DataSource>();
 		DataSource a = new DataSource();
 		a.setId ("node-" + node.getNodeId() + "-performance-" + "rsUserProcessTime");
 		a.setName ("CPU User Process Time");
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeDaoSimple.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeDaoSimple.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeDaoSimple.java	(working copy)
@@ -93,8 +93,8 @@
         return Collections.EMPTY_SET;
     }
 
-    public Collection findAll() {
-        List list = new ArrayList(10);
+    public Collection<Node> findAll() {
+        List<Node> list = new ArrayList<Node>(10);
         for(int i = 0; i < 10; i++) {
             list.add(createDummyNode(new Long(i)));
         }
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeInterfaceDaoSimple.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeInterfaceDaoSimple.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/NodeInterfaceDaoSimple.java	(working copy)
@@ -70,8 +70,8 @@
         return null;
     }
     
-    public Collection getNodeInterfaces(Node node) {
-        Collection interfaces = new HashSet();
+    public Collection<NodeInterface> getNodeInterfaces(Node node) {
+        Collection<NodeInterface> interfaces = new HashSet<NodeInterface>();
         for (int i =1; i<LENGTH; i++ ) {
             interfaces.add(this.interfacearray[i]);
         }
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/ServiceDaoSimple.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/ServiceDaoSimple.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/dao/impl/ServiceDaoSimple.java	(working copy)
@@ -67,9 +67,9 @@
 
     }
 
-    public Collection getServices(NodeInterface nodeInterface) {
+    public Collection<InterfaceService> getServices(NodeInterface nodeInterface) {
         
-        Collection services = new ArrayList();
+        Collection<InterfaceService> services = new ArrayList<InterfaceService>();
         for (int i = 0; i < 5; i++) {
             services.add(getService(new Long(i)));
         }
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 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/GraphDefinition.java	(working copy)
@@ -18,11 +18,11 @@
 	
 	String graphTitle; //name of graph
 	long startTime, endTime; // epoc time interval start and end
-	LinkedList graphDataElements; // data source objects for the graph 
+	LinkedList<GraphDataElement> graphDataElements; // data source objects for the graph 
 	                     // name of data, file, rrd dsname
 
 	public GraphDefinition(){
-		graphDataElements= new LinkedList();
+		graphDataElements= new LinkedList<GraphDataElement>();
 		setGraphTitle("");
 		setEndTime(System.currentTimeMillis());
 		setStartTime(getEndTime() - 86400000);
@@ -40,7 +40,7 @@
 		return graphDataElements;
 	}
 	
-	public void setGraphDataElements(LinkedList graphDataElements) {
+	public void setGraphDataElements(LinkedList<GraphDataElement> graphDataElements) {
 		this.graphDataElements = graphDataElements;
 	}
 
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/NodeDataSources.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/NodeDataSources.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/model/NodeDataSources.java	(working copy)
@@ -1,7 +1,6 @@
 package org.opennms.secret.model;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 public class NodeDataSources {
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/MemberServiceImpl.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/MemberServiceImpl.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/MemberServiceImpl.java	(working copy)
@@ -60,7 +60,7 @@
 
     public Set findMatching(String searchKey) {
         List members = memberDAO.findAll();
-        Set matches = new HashSet();
+        Set<OGPMember> matches = new HashSet<OGPMember>();
         for (Iterator it = members.iterator(); it.hasNext();) {
             OGPMember member = (OGPMember) it.next();
             if (member.getFirstName().startsWith(searchKey) || member.getLastName().startsWith(searchKey)) {
Index: /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/NodeInterfaceServiceImpl.java
===================================================================
--- /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/NodeInterfaceServiceImpl.java	(revision 5255)
+++ /Users/mhuot/svn/eclipse/opennms-webapp/src/main/java/org/opennms/secret/service/impl/NodeInterfaceServiceImpl.java	(working copy)
@@ -15,7 +15,7 @@
     }
     
     public HashSet getInterfaces(Node node) {
-		HashSet interfaces = new HashSet();
+		HashSet<NodeInterface> interfaces = new HashSet<NodeInterface>();
 		for (int i = 0; i < 5; i++) {
 			NodeInterface newInterface = new NodeInterface();
 			newInterface.setNodeId(new Long(i));