From 9f9d0e73ee7edda1df354a01f2c0b4e2d79bf2d2 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 18 Jan 2016 15:30:29 +0100 Subject: [PATCH] Renamed getAllUsers to getUsers Former-commit-id: 25666b0e14f38fa10625bc62460bc744be85736b --- src/se/hal/page/PCOverviewHttpPage.java | 2 +- src/se/hal/struct/User.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java index 9fb6a359..ce4a7f71 100755 --- a/src/se/hal/page/PCOverviewHttpPage.java +++ b/src/se/hal/page/PCOverviewHttpPage.java @@ -35,7 +35,7 @@ public class PCOverviewHttpPage extends HalHttpPage { DBConnection db = HalContext.getDB(); - List users = User.getAllUsers(db); + List users = User.getUsers(db); ArrayList minDataList = new ArrayList(); ArrayList hourDataList = new ArrayList(); diff --git a/src/se/hal/struct/User.java b/src/se/hal/struct/User.java index 4be81805..e36571d7 100755 --- a/src/se/hal/struct/User.java +++ b/src/se/hal/struct/User.java @@ -33,14 +33,16 @@ public class User extends DBBean{ return DBConnection.exec(stmt, DBBeanSQLResultHandler.create(User.class, db) ); } + public static List getUsers(DBConnection db) throws SQLException{ + PreparedStatement stmt = db.getPreparedStatement( "SELECT * FROM user" ); + return DBConnection.exec(stmt, DBBeanSQLResultHandler.createList(User.class, db) ); + } + public static User getUser(DBConnection db, int id) throws SQLException { return DBBean.load(db, User.class, id); } - public static List getAllUsers(DBConnection db) throws SQLException{ - PreparedStatement stmt = db.getPreparedStatement( "SELECT * FROM user" ); - return DBConnection.exec(stmt, DBBeanSQLResultHandler.createList(User.class, db) ); - } + public String getUsername() { return username;