1 files changed, 9 insertions, 95 deletions

diff --git a/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java b/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java
index 478b72dc07..c8ebf5afdd 100644
--- a/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java
+++ b/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java
@@ -20,10 +20,6 @@
 package services;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -31,18 +27,12 @@ import javax.xml.bind.Unmarshaller;
 
 import org.oasisopen.sca.annotation.Init;
 
-import com.example.ipo.jaxb.MileStone;
-import com.example.ipo.jaxb.Milestones;
 import com.example.ipo.jaxb.Plan;
-import com.example.ipo.jaxb.PlanDTO;
-import com.example.ipo.jaxb.WorkItem;
-import com.example.ipo.jaxb.WorkItems;
 
 public class PlanViewImpl implements PlanView {
 
-	private Plan _p = null;
-	private Map<String, MileStone> _milestoneMap = null;
-	private Map<String, WorkItem> _workItemMap = null;
+	private com.example.ipo.jaxb.Plan _p = null;
+
 
 	@Init
 	public void init() {
@@ -63,97 +53,21 @@ public class PlanViewImpl implements PlanView {
 			} catch (Exception e) {
 				e.printStackTrace();
 			} finally {
-			}
 
-		}
-		return _p;
-	}
-	
-	private Map<String , MileStone> getMileStoneMap()
-	{
-		if(_milestoneMap == null) {
-			_milestoneMap = new HashMap<String, MileStone>();
-			
-			Plan p = getPlan();
-			List<MileStone> ms = p.getMilestones().getMilestone();
-			for (Iterator<MileStone> iterator = ms.iterator(); iterator.hasNext();) {
-				MileStone mileStone = iterator.next();
-				_milestoneMap.put(mileStone.getID(), mileStone);
 			}
-		}
-		return _milestoneMap;
-	}
 
-	private Map<String, WorkItem> getWorkItemMap()
-	{ 
-		if(_workItemMap == null) {
-			_workItemMap = new HashMap<String, WorkItem>();
-			
-			Plan p = getPlan();
-			List<WorkItem> ms = p.getWorkitems().getWorkitem();
-			for (Iterator<WorkItem> iterator = ms.iterator(); iterator.hasNext();) {
-				WorkItem workItem = iterator.next();
-				_workItemMap.put(workItem.getID(), workItem);
-			}
 		}
-		return _workItemMap;
-	}
-
-
-
-	public MileStone[] getMilestones() {
-
-		List<MileStone> ms = null;
-		Plan p = getPlan();
-		ms = p.getMilestones().getMilestone();
-		MileStone[] ma = new MileStone[(ms.size())];
-		ms.toArray(ma);
+		return _p;
 
-		return ma;
 	}
+	
 
-	public WorkItem[] getMilestoneWorkitems(String msid) {
-		Map<String,MileStone> msmap = getMileStoneMap();
-		Map<String,WorkItem> wimap = getWorkItemMap();
-		MileStone ms = msmap.get(msid);
-		List<String> wirefs = ms.getWorkItem();
-
-		WorkItem[] retval = new WorkItem[wirefs.size()];
-		int i=0;
-		for (Iterator<String> iterator = wirefs.iterator(); iterator.hasNext();) {
-			String wiref = iterator.next();
-			retval[i] = wimap.get(wiref);
-			i++;
-		}
-		
-		return retval;
-	}
 
-	public MileStone[] get() {
-		Plan p = getPlan();
-		
-		
-		Milestones ms = p.getMilestones();
-		WorkItems ws = p.getWorkitems();
-		
-		MileStone[] plan = new MileStone[ms.getMilestone().size()];
-
-		
-		int i=0;
-		List<MileStone> lm = ms.getMilestone();
-
-		for (MileStone mileStone : lm) {
-			plan[i++] = mileStone;
-		}
-		
-//		List<WorkItem> lw = ws.getWorkitem();
-//		
-//		for (WorkItem workItem : lw) {
-//			plan[i++] = workItem;
-//		}
-		
-		
-		return plan;
+	public Plan get() {
+		com.example.ipo.jaxb.Plan modelplan = getPlan();
+	
+		// dto.Plan dtoplan = new dto.Plan(modelplan);
+		return modelplan;
 	}
 
 }
\ No newline at end of file