changed folder structure

src/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: main
+Main-Class: com.wasteinformationserver.main
 

src/com/wasteinformationserver/Date.java

@@ -1,3 +1,5 @@
+package com.wasteinformationserver;
+
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;

src/com/wasteinformationserver/basicutils/Log.java

@@ -1,10 +1,9 @@
-package website;
+package com.wasteinformationserver.basicutils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.logging.*;
 
 public class Log {
 
@@ -79,7 +78,7 @@ public class Log {
         builder.append("]");
 
         builder.append(" [");
-        builder.append(new Exception().getStackTrace()[1].getClassName());
+        builder.append(new Exception().getStackTrace()[2].getClassName());
         builder.append("]");
 
         builder.append(" [");

src/com/wasteinformationserver/db/Database.java

@@ -1,4 +1,4 @@
-package db;
+package com.wasteinformationserver.db;
 
 import javax.swing.table.DefaultTableModel;
 import java.sql.Connection;
@@ -25,7 +25,7 @@ public abstract class Database {
         this.dbName = dbName;
     }
 
-    public abstract Connection getConnection();
+    public abstract Connection getConnection() throws SQLException;
 
     public static void logToConsole(ResultSet res) {
         try {

src/com/wasteinformationserver/db/MySQLConnector.java

@@ -1,4 +1,4 @@
-package db;
+package com.wasteinformationserver.db;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -18,20 +18,11 @@ public class MySQLConnector extends Database {
         super(user, password, host, port, dbName);
     }
 
-    public Connection getConnection() {
-        Connection con = null;
-
-        try {
-            con = DriverManager.getConnection(
+    public Connection getConnection() throws SQLException {
+           return DriverManager.getConnection(
                     "jdbc:mysql://" + host + ":" + port + "/" + dbName + "?useSSL=false",
                     user,
                     password);
-
-        } catch (SQLException e) {
-            System.err.println("no connection to database! start database server");
-        }
-
-        return con;
     }
 
 }

src/com/wasteinformationserver/db/PostRequest.java

@@ -1,4 +1,4 @@
-package website;
+package com.wasteinformationserver.db;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;

src/com/wasteinformationserver/db/PostgreSQLConnector.java

@@ -1,4 +1,4 @@
-package db;
+package com.wasteinformationserver.db;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

src/com/wasteinformationserver/db/jdcb.java

@@ -1,4 +1,8 @@
-package db;
+package com.wasteinformationserver.db;
+
+import com.wasteinformationserver.basicutils.Log;
+import com.wasteinformationserver.db.Database;
+import com.wasteinformationserver.db.MySQLConnector;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -16,7 +20,11 @@ Connection conn;
                 3306,
                 dbName);
 
+        try {
             conn = db.getConnection();
+        } catch (SQLException e) {
+            Log.error("no connection to Database! DB Server not started...?");
+        }
 
     }
 

src/com/wasteinformationserver/main.java

@@ -1,14 +1,12 @@
-import db.jdcb;
-import website.Log;
+package com.wasteinformationserver;
 
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import com.wasteinformationserver.basicutils.Log;
+import com.wasteinformationserver.website.Webserver;
 
 public class main {
     public static void main(String[] args) {
 /*
-        Date D=new Date();
+        com.wasteinformationserver.Date D=new com.wasteinformationserver.Date();
         D.getdata();
         D.printList();
         */
@@ -24,7 +22,7 @@ public class main {
             }
         }));
 
-        Thread mythread = new Thread(() -> new website.Webserver().startserver());
+        Thread mythread = new Thread(() -> new Webserver().startserver());
         mythread.start();
 
         Log.message("thread started");

src/com/wasteinformationserver/mqtt.java

@@ -1,3 +1,5 @@
+package com.wasteinformationserver;
+
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;

src/com/wasteinformationserver/website/CheckLoginState.java

@@ -1,4 +1,6 @@
-package website;
+package com.wasteinformationserver.website;
+
+import com.wasteinformationserver.db.PostRequest;
 
 import java.util.HashMap;
 

src/com/wasteinformationserver/website/GetRequest.java

@@ -1,4 +1,4 @@
-package website;
+package com.wasteinformationserver.website;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
@@ -6,9 +6,6 @@ import com.sun.net.httpserver.HttpHandler;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 
 public abstract class GetRequest implements HttpHandler {
@@ -41,8 +38,8 @@ public abstract class GetRequest implements HttpHandler {
 
     /**
      *
-     * @param params received get params from website
-     * @return json reply to website
+     * @param params received get params from com.wasteinformationserver.website
+     * @return json reply to com.wasteinformationserver.website
      */
     public abstract String myrequest(HashMap<String, String> params);
 

src/com/wasteinformationserver/website/HttpTools.java

@@ -1,4 +1,4 @@
-package website;
+package com.wasteinformationserver.website;
 
 import java.math.BigInteger;
 import java.security.MessageDigest;

src/com/wasteinformationserver/website/LoginRequest.java

@@ -1,6 +1,7 @@
-package website;
+package com.wasteinformationserver.website;
 
-import db.jdcb;
+import com.wasteinformationserver.db.PostRequest;
+import com.wasteinformationserver.db.jdcb;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

src/com/wasteinformationserver/website/LoginState.java

@@ -1,4 +1,4 @@
-package website;
+package com.wasteinformationserver.website;
 
 public class LoginState {
     private LoginState() {}

src/com/wasteinformationserver/website/MainPage.java

@@ -1,8 +1,9 @@
-package website;
+package com.wasteinformationserver.website;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
+import com.wasteinformationserver.basicutils.Log;
 
 import java.io.File;
 import java.io.FileInputStream;

src/com/wasteinformationserver/website/RegisterRequest.java

@@ -1,10 +1,11 @@
-package website;
+package com.wasteinformationserver.website;
 
-import db.jdcb;
+import com.wasteinformationserver.db.PostRequest;
+import com.wasteinformationserver.db.jdcb;
 
 import java.util.HashMap;
 
-public class RegisterRequest extends PostRequest{
+public class RegisterRequest extends PostRequest {
     @Override
     public String request(HashMap<String, String> params) {
         System.out.println(params.toString());

src/com/wasteinformationserver/website/Webserver.java

@@ -1,11 +1,11 @@
-package website;
+package com.wasteinformationserver.website;
 
 import com.sun.net.httpserver.HttpServer;
+import com.wasteinformationserver.basicutils.Log;
 
 import java.io.IOException;
 
 import java.net.InetSocketAddress;
-import java.util.logging.Level;
 
 
 public class Webserver {