Uncommented code in List.java and ListGetter.java to prevent merge conflict

This commit is contained in:
Adam Ding 2020-12-01 21:12:42 -05:00
parent 337c2e117b
commit 7bdd65b122
2 changed files with 12 additions and 12 deletions

View File

@ -83,15 +83,15 @@ public class List {
return uiPosition; return uiPosition;
} }
// public void setUiPosition(Integer uiPosition) { public void setUiPosition(Integer uiPosition) {
// this.uiPosition = uiPosition; this.uiPosition = uiPosition;
// } }
//
// public ItemEntry[] getEntries() { public ItemEntry[] getEntries() {
// return entries.toArray(new ItemEntry[entries.size()]); return entries.toArray(new ItemEntry[entries.size()]);
// } }
//
// public void addItemEntry(ItemEntry entry) { public void addItemEntry(ItemEntry entry) {
// entries.add(entry); entries.add(entry);
// } }
} }

View File

@ -78,7 +78,7 @@ public class ListGetter implements CallHandler{
getListEntries.setInt(1, id); getListEntries.setInt(1, id);
ResultSet getEntryResults = getListEntries.executeQuery(); ResultSet getEntryResults = getListEntries.executeQuery();
while (getEntryResults.next()) { while (getEntryResults.next()) {
//retrievedList.addItemEntry(new ItemEntry(id, getEntryResults)); retrievedList.addItemEntry(new ItemEntry(id, getEntryResults));
} }
System.out.println(retrievedList); System.out.println(retrievedList);
return retrievedList; return retrievedList;