Removed utils and added Web-Utils

Author: JulianFun123

pom.xml

@@ -42,6 +42,11 @@
             <version>5.4.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.javawebstack</groupId>
+            <artifactId>web-utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -86,4 +91,4 @@
         </repository>
     </distributionManagement>
 
-</project>
+</project>

src/main/java/org/javawebstack/framework/WebApplication.java

@@ -9,14 +9,13 @@
 import org.javawebstack.framework.seed.AllSeeder;
 import org.javawebstack.framework.seed.MergedSeeder;
 import org.javawebstack.framework.seed.Seeder;
-import org.javawebstack.framework.util.*;
 import org.javawebstack.httpserver.HTTPServer;
-import org.javawebstack.injector.Injector;
-import org.javawebstack.injector.SimpleInjector;
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.javawebstack.orm.wrapper.SQL;
 import org.javawebstack.orm.wrapper.SQLDriverFactory;
 import org.javawebstack.orm.wrapper.SQLDriverNotFoundException;
+import org.javawebstack.webutils.*;
+import org.javawebstack.webutils.crypt.Crypt;
 
 import java.io.IOException;
 import java.util.*;
@@ -98,9 +97,9 @@ public void addTranslation(Locale locale, ClassLoader classLoader, String resour
         try {
             AbstractElement element = AbstractElement.fromJson(IO.readTextResource(classLoader, resource));
             if (element.isObject())
-                translation.add(locale, element.object());
+                translation.set(locale, new Translation(element.object()));
             if (element.isArray())
-                translation.add(locale, element.array());
+                translation.set(locale, new Translation(element.object()));
         } catch (IOException ignored) {
         }
     }

src/main/java/org/javawebstack/framework/config/Config.java

@@ -2,8 +2,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import org.javawebstack.framework.util.IO;
-import org.javawebstack.framework.util.Json;
+import org.javawebstack.abstractdata.AbstractElement;
+import org.javawebstack.framework.utils.Json;
+import org.javawebstack.webutils.IO;
 
 import java.io.File;
 import java.io.IOException;
@@ -72,6 +73,10 @@ public void addJsonFile(String path, File file) {
         }
     }
 
+    private void add(String path, AbstractElement readJsonFile) {
+        add(path, readJsonFile.toJson());
+    }
+
     public void addJsonFile(String path, String fileName) {
         addJsonFile(path, new File(fileName));
     }
@@ -83,6 +88,10 @@ public void addJsonFile(File file) {
         }
     }
 
+    private void add(AbstractElement readJsonFile) {
+        add(readJsonFile.toJson());
+    }
+
     public void addJsonFile(String fileName) {
         addJsonFile(new File(fileName));
     }