From 56ab66a3fcc3f468dd332e2e9feae1e8184a3d70 Mon Sep 17 00:00:00 2001
From: Adam Ding <ding183@purdue.edu>
Date: Mon, 30 Nov 2020 19:11:17 -0500
Subject: [PATCH] Uncommented code to allow merge, in ListGetter and List

---
 Lambdas/Lists/List/src/List.java       | 24 ++++++++++++------------
 Lambdas/Lists/List/src/ListGetter.java |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Lambdas/Lists/List/src/List.java b/Lambdas/Lists/List/src/List.java
index 3ba2d0f..d712e5e 100644
--- a/Lambdas/Lists/List/src/List.java
+++ b/Lambdas/Lists/List/src/List.java
@@ -83,16 +83,16 @@ public class List {
         return uiPosition;
     }
 
-//    public void setUiPosition(Integer uiPosition) {
-//        this.uiPosition = uiPosition;
-//
-//   public ItemEntry[] getEntries() {
-//        //return entries.toArray(new ItemEntry[entries.size()]);
-//        return;
-//    }
-//
-//    public void addItemEntry(ItemEntry entry) {
-//        //entries.add(entry);
-//            return;
-//    }
+    public void setUiPosition(Integer uiPosition) {
+        this.uiPosition = uiPosition;
+
+   public ItemEntry[] getEntries() {
+        //return entries.toArray(new ItemEntry[entries.size()]);
+        return;
+    }
+
+    public void addItemEntry(ItemEntry entry) {
+        //entries.add(entry);
+            return;
+    }
 }
diff --git a/Lambdas/Lists/List/src/ListGetter.java b/Lambdas/Lists/List/src/ListGetter.java
index c7fe058..e29267c 100644
--- a/Lambdas/Lists/List/src/ListGetter.java
+++ b/Lambdas/Lists/List/src/ListGetter.java
@@ -72,7 +72,7 @@ public class ListGetter implements CallHandler{
         getListEntries.setInt(1, id);
         ResultSet getEntryResults = getListEntries.executeQuery();
         while (getEntryResults.next()) {
-            //retrievedList.addItemEntry(new ItemEntry(id, getEntryResults));
+            retrievedList.addItemEntry(new ItemEntry(id, getEntryResults));
         }
         System.out.println(retrievedList);
         return retrievedList;