waste zone/type/city info on device page

src/java/com/wasteinformationserver/db/JDBC.java

@@ -5,10 +5,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public class JDCB {
+public class JDBC {
     static Connection conn;
 
-    static JDCB jdcb;
+    static JDBC JDBC;
     static boolean loggedin = false;
 
     static String usernamec;
@@ -21,19 +21,19 @@ public class JDCB {
         usernamec = username;
         passwordc = password;
         dbnamec = dbname;
-        jdcb = new JDCB(username, password, dbname, ip, port);
+        JDBC = new JDBC(username, password, dbname, ip, port);
     }
 
-    private JDCB(String username, String password, String dbname, String ip, int port) throws IOException {
+    private JDBC(String username, String password, String dbname, String ip, int port) throws IOException {
         logintodb(username, password, dbname, ip, port);
     }
 
-    public static JDCB getInstance() throws IOException {
+    public static JDBC getInstance() throws IOException {
         if (loggedin) {
-            return jdcb;
+            return JDBC;
         } else {
             logintodb(usernamec, passwordc, dbnamec, ipc, portc);
-            return jdcb;
+            return JDBC;
         }
 
     }

src/java/com/wasteinformationserver/db/PostgreSQLConnector.java

@@ -1,37 +0,0 @@
-package com.wasteinformationserver.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-public class PostgreSQLConnector extends Database {
-
-    static {
-        try {
-            Class.forName("org.postgresql.Driver").newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public PostgreSQLConnector(String user, String password, String host, int port, String dbName) {
-        super(user, password, host, port, dbName);
-    }
-
-    @Override
-    public Connection getConnection() {
-        Connection con = null;
-
-        try {
-            con = DriverManager.getConnection(
-                    "jdbc:postgresql://" + host + ":" + port + "/" + dbName,
-                    user,
-                    password);
-
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-        return con;
-    }
-}