ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2026-03-10 18:55:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
Lambdas/Lists/List/src/List.java
View File

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

2
Lambdas/Lists/List/src/ListGetter.java
View File

@@ -78,7 +78,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;