diff --git a/src/java/com/wasteinformationserver/basicutils/Info.java b/src/java/com/wasteinformationserver/basicutils/Info.java index 06e4ae3..ecd6b2b 100644 --- a/src/java/com/wasteinformationserver/basicutils/Info.java +++ b/src/java/com/wasteinformationserver/basicutils/Info.java @@ -63,6 +63,7 @@ public class Info { /** * print memory utilization + * todo parse into website somehow */ public static void getMemoryUsage() { Runtime runtime = Runtime.getRuntime(); diff --git a/src/java/com/wasteinformationserver/db/Database.java b/src/java/com/wasteinformationserver/db/Database.java index 4f214c9..a7c1ebd 100755 --- a/src/java/com/wasteinformationserver/db/Database.java +++ b/src/java/com/wasteinformationserver/db/Database.java @@ -1,13 +1,7 @@ package com.wasteinformationserver.db; -import com.wasteinformationserver.basicutils.Log; - -import javax.swing.table.DefaultTableModel; import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.Vector; abstract class Database { @@ -28,62 +22,4 @@ abstract class Database { } public abstract Connection getConnection() throws SQLException; - - public static void logToConsole(ResultSet res) { - try { - - ResultSetMetaData rsmd = res.getMetaData(); - - while (res.next()) { - String row = ""; - - for (int i = 1; i <= rsmd.getColumnCount(); ++i) { - if (row.length() > 0) { - row += ", "; - } - - if (res.getObject(i) != null) { - row += - rsmd.getColumnName(i) + - ": " + - res.getObject(i).toString(); - } - } - - Log.Log.debug(row); - } - - } catch (SQLException e) { - } - } - - public static DefaultTableModel logToTable(ResultSet res) { - try { - ResultSetMetaData rsmd = res.getMetaData(); - Vector columnNames = new Vector<>(); - int columnCount = rsmd.getColumnCount(); - - for (int i = 1; i <= columnCount; ++i) { - columnNames.add(rsmd.getColumnName(i)); - } - - Vector> data = new Vector<>(); - - while (res.next()) { - Vector row = new Vector(); - - for (int i = 1; i <= columnCount; ++i) { - row.add(res.getObject(i)); - } - - data.add(row); - } - - return new DefaultTableModel(data, columnNames); - } catch (SQLException e) { - e.printStackTrace(); - } - - return null; - } }