diff options
Diffstat (limited to 'Dozentenmodulserver/src/server/ServerHandler.java')
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 78e81464..9b52aea6 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -92,31 +92,21 @@ public class ServerHandler implements Server.Iface { @Override public List<Image> getImageList() throws TException { - ResultSet resWith=sql.getImageListWithLectures(con); - ResultSet resWithout=sql.getImageListWithoutLectures(con); - List<Image> listWith = new ArrayList<Image>(); - List<Image> listWithout = new ArrayList<Image>(); + ResultSet res=sql.getImageList(con); + + List<Image> list = new ArrayList<Image>(); + try { - while(resWith.next()) + while(res.next()) { - listWith.add(new Image(resWith.getString("image_name"),resWith.getString("cond_hasLicenseRestriction"),resWith.getString("name"),resWith.getString("lecture"),resWith.getString("image_update_time"),resWith.getString("user"))); - - } - - while(resWithout.next()) - { - listWithout.add(new Image(resWithout.getString("image_name"),resWithout.getString("cond_hasLicenseRestriction"),resWithout.getString("name"),"''",resWithout.getString("image_update_time"),resWithout.getString("user"))); + list.add(new Image(res.getString("image_name"),res.getString("cond_hasLicenseRestriction"),res.getString("name"),res.getString("lecture"),res.getString("image_update_time"),res.getString("user"))); } - if(listWithout!=null) - { - listWith.addAll(listWith.size(), listWithout); - } - return listWith; + return list; } catch (SQLException e1) { // TODO Auto-generated catch block e1.printStackTrace(); |