diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 09a6967035647278dbc0a19323b4d97840b89147..aabc90744de4a0a6c843f43d48edd7e962ff0b02 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,18 +25,6 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <file leaf-file-name="RegistrationControl_Test.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="18" column="5" lean-forward="false" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="RegistrationControl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/RegistrationControl.java">
<provider selected="true" editor-type-id="text-editor">
@@ -50,57 +38,30 @@
<file leaf-file-name="RegistrationDAO.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/RegistrationDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="630">
- <caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
+ <state relative-caret-position="495">
+ <caret line="38" column="28" lean-forward="false" selection-start-line="38" selection-start-column="28" selection-end-line="38" selection-end-column="28" />
<folding>
- <marker date="1497893381000" expanded="true" signature="587:922" ph="INSERT INTO \"ERR\".\"user\"... " />
- <marker date="1497893381000" expanded="true" signature="1318:1364" ph="SELECT MAX(u... " />
+ <marker date="1497906075000" expanded="true" signature="633:968" ph="INSERT INTO \"ERR\".\"user\"... " />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="LoginControl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LoginControl.java">
+ <file leaf-file-name="RegistrierungView.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="25" column="43" lean-forward="false" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+ <state relative-caret-position="417">
+ <caret line="102" column="0" lean-forward="false" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TransactionControl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/TransactionControl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-129">
- <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
- <folding>
- <marker date="1497892099000" expanded="true" signature="1899:2096" ph="INSERT INTO \"ERR\".\"transaktion\"... " />
- <marker date="1497892099000" expanded="true" signature="2399:2516" ph="UPDATE INTO " />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="JDBCConnectionTest.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="16" column="26" lean-forward="true" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1496932737000" expanded="true" signature="585:784" ph="SELECT u.\"b... user" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="RegistrierungView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
+ <file leaf-file-name="LoginControl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LoginControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="417">
- <caret line="111" column="0" lean-forward="false" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" />
+ <state relative-caret-position="330">
+ <caret line="31" column="41" lean-forward="false" selection-start-line="31" selection-start-column="41" selection-end-line="31" selection-end-column="41" />
<folding />
</state>
</provider>
@@ -285,8 +246,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -316,108 +275,6 @@
<option name="myItemId" value="test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="services" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="shopInShop" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="services" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="db" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="shopInShop" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="shopInShop" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="impl" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -611,7 +468,9 @@
</PATH>
</subPane>
</pane>
+ <pane id="PackagesPane" />
<pane id="Scope" />
+ <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -1169,6 +1028,7 @@
<workItem from="1496742832611" duration="6144000" />
<workItem from="1497882792519" duration="2838000" />
<workItem from="1497892141475" duration="1318000" />
+ <workItem from="1497902421348" duration="3435000" />
</task>
<servers />
</component>
@@ -1205,7 +1065,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="61594000" />
+ <option name="totallyTimeSpent" value="65029000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1920" height="1080" extended-state="0" />
@@ -1298,7 +1158,6 @@
<option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/Button.java" />
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/themes/BaseTheme.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java" />
@@ -1525,16 +1384,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="18" column="5" lean-forward="false" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/KundenDAO.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="12" column="2" lean-forward="true" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
<folding />
</state>
</provider>
@@ -1565,10 +1414,10 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="16" column="26" lean-forward="true" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+ <state relative-caret-position="150">
+ <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="imports" expanded="false" />
<marker date="1496932737000" expanded="true" signature="585:784" ph="SELECT u.\"b... user" />
</folding>
</state>
@@ -1592,29 +1441,45 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/TransactionControl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="51">
+ <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ <folding>
+ <marker date="1497902355000" expanded="true" signature="2070:2267" ph="INSERT INTO \"ERR\".\"transaktion\"... " />
+ <marker date="1497902355000" expanded="true" signature="2570:2687" ph="UPDATE INTO " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-396">
+ <state relative-caret-position="-504">
<caret line="27" column="2" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/TransactionControl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/KundenDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-129">
- <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
- <folding>
- <marker date="1497892099000" expanded="true" signature="1899:2096" ph="INSERT INTO \"ERR\".\"transaktion\"... " />
- <marker date="1497892099000" expanded="true" signature="2399:2516" ph="UPDATE INTO " />
- </folding>
+ <state relative-caret-position="150">
+ <caret line="12" column="2" lean-forward="true" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LoginControl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/RegistrationControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="25" column="43" lean-forward="false" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+ <state relative-caret-position="242">
+ <caret line="32" column="27" lean-forward="false" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="27" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.1.1.jre7/postgresql-42.1.1.jre7.jar!/org/postgresql/jdbc/PgResultSet.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="661">
+ <caret line="570" column="0" lean-forward="false" selection-start-line="570" selection-start-column="0" selection-end-line="570" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -1622,26 +1487,25 @@
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="417">
- <caret line="111" column="0" lean-forward="false" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" />
+ <caret line="102" column="0" lean-forward="false" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/RegistrationControl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LoginControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="242">
- <caret line="32" column="27" lean-forward="false" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="27" />
+ <state relative-caret-position="330">
+ <caret line="31" column="41" lean-forward="false" selection-start-line="31" selection-start-column="41" selection-end-line="31" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/RegistrationDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="630">
- <caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
+ <state relative-caret-position="495">
+ <caret line="38" column="28" lean-forward="false" selection-start-line="38" selection-start-column="28" selection-end-line="38" selection-end-column="28" />
<folding>
- <marker date="1497893381000" expanded="true" signature="587:922" ph="INSERT INTO \"ERR\".\"user\"... " />
- <marker date="1497893381000" expanded="true" signature="1318:1364" ph="SELECT MAX(u... " />
+ <marker date="1497906075000" expanded="true" signature="633:968" ph="INSERT INTO \"ERR\".\"user\"... " />
</folding>
</state>
</provider>
diff --git a/src/main/java/org/s4s/dao/RegistrationDAO.java b/src/main/java/org/s4s/dao/RegistrationDAO.java
index bbadd23c431c71f05ee299e7cfbf7647bdad737b..4936321d6dd6253e483a5775801fe8055befb856 100644
--- a/src/main/java/org/s4s/dao/RegistrationDAO.java
+++ b/src/main/java/org/s4s/dao/RegistrationDAO.java
@@ -5,6 +5,8 @@ import org.s4s.dao.impl.AbstractDatabaseClass;
import org.s4s.exceptions.WrongInputException;
import org.s4s.services.db.JDBCConnection;
+import javax.sql.rowset.serial.SQLInputImpl;
+
/**
*
* @author Simon
@@ -35,9 +37,9 @@ public class RegistrationDAO extends AbstractDatabaseClass {
}
public int getUserID() {
- sql_query = "SELECT MAX(u.userID)\" FROM \"ERR\".\"user\" u";
- try {
- ResultSet set = JDBCConnection.getInstance().getStatement().executeQuery(sql_query);
+ sql_query = "SELECT MAX('u.userID') FROM \"ERR\".\"user\" u";
+ try (ResultSet set = executeQuery(sql_query);){
+ System.out.println(set.getInt("userID"));
result = set.getInt("userID");
} catch (SQLException e) {
e.printStackTrace();