diff --git a/.idea/artifacts/shopInShop_war_exploded.xml b/.idea/artifacts/shopInShop_war_exploded.xml
index c52ec2abde5e5bf08ebbaac38c9a192185e9f051..5188ce519f6c2cb4b40922c77c1cff5ca0d2b444 100644
--- a/.idea/artifacts/shopInShop_war_exploded.xml
+++ b/.idea/artifacts/shopInShop_war_exploded.xml
@@ -25,6 +25,10 @@
<element id="library" level="project" name="Maven: com.vaadin:vaadin-client-compiled:7.7.8" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-themes:7.7.8" />
<element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
+ <element id="library" level="project" name="Maven: org.eclipse.jetty:jetty-server:9.4.6.v20170531" />
+ <element id="library" level="project" name="Maven: org.eclipse.jetty:jetty-http:9.4.6.v20170531" />
+ <element id="library" level="project" name="Maven: org.eclipse.jetty:jetty-util:9.4.6.v20170531" />
+ <element id="library" level="project" name="Maven: org.eclipse.jetty:jetty-io:9.4.6.v20170531" />
</element>
</element>
<element id="directory" name="META-INF">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99e178237eb06e9123360a8399e3460985011b73..6e926c6b4d0107edbbec91821491ec831e4aa01f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5f36371d-de5c-44ce-a12c-613727d95355" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/shopInShop_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/shopInShop_war_exploded.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopInShop.iml" afterPath="$PROJECT_DIR$/shopInShop.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java" />
</list>
<ignored path="shopInShop.iws" />
<ignored path=".idea/workspace.xml" />
@@ -28,33 +28,25 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <file leaf-file-name="ShopView.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <file leaf-file-name="ShopControlTest.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="39" column="60" lean-forward="true" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="60" />
+ <state relative-caret-position="287">
+ <caret line="55" column="10" lean-forward="false" selection-start-line="55" selection-start-column="10" selection-end-line="55" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
+ <marker date="1498209467000" expanded="true" signature="2099:2181" ph="SELECT name shop" />
+ <marker date="1498209467000" expanded="true" signature="2794:2866" ph="DELETE FROM " />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BenutzerkontoView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java">
+ <file leaf-file-name="JDBCConnection.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="KundenDAO.java" pinned="false" current-in-tab="false">
- <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" />
+ <state relative-caret-position="708">
+ <caret line="54" column="0" lean-forward="false" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -63,80 +55,33 @@
<file leaf-file-name="KundenDAOimpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="334">
- <caret line="42" column="52" lean-forward="true" selection-start-line="42" selection-start-column="52" selection-end-line="42" selection-end-column="52" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="344">
- <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
+ <state relative-caret-position="240">
+ <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="LoginView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java">
+ <file leaf-file-name="ShopDAOimpl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ShopDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="163">
- <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+ <state relative-caret-position="135">
+ <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ProductDAO.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ProductDAO.java">
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="19" column="62" lean-forward="true" selection-start-line="19" selection-start-column="62" selection-end-line="19" selection-end-column="62" />
+ <state relative-caret-position="464">
+ <caret line="126" column="27" lean-forward="false" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ArtikeldetailsView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="69" column="71" lean-forward="false" selection-start-line="69" selection-start-column="69" selection-end-line="69" selection-end-column="71" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ProductControl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ProductControl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="397">
- <caret line="35" column="44" lean-forward="true" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
- <folding>
- <element signature="imports" expanded="true" />
- </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="174">
- <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="29" selection-end-column="39" />
- <folding>
- <marker date="1497960469000" expanded="true" signature="2070:2267" ph="INSERT INTO \"ERR\".\"transaktion\"... " />
- <marker date="1497960469000" expanded="true" signature="2570:2687" ph="UPDATE INTO " />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -216,20 +161,23 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/RegistrationControl.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/RegistrationDAO.java" />
<option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" />
- <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopwithProducts.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java" />
- <option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/ProductSearchTest.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/TransactionControl.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java" />
+ <option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/ProductSearchTest.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ProductDAOimpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ShopDAOimpl.java" />
+ <option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java" />
+ <option value="$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java" />
</list>
</option>
</component>
@@ -283,8 +231,8 @@
</treeState>
</component>
<component name="ProjectFrameBounds">
- <option name="width" value="1440" />
- <option name="height" value="900" />
+ <option name="width" value="1280" />
+ <option name="height" value="800" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -301,8 +249,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
- <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -311,7 +257,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -321,29 +267,23 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <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>
- <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="SE-2" />
+ <option name="myItemId" value="test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="src" />
+ <option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="main" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -353,7 +293,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -361,13 +301,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="main" />
+ <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="control" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -375,7 +323,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -383,7 +331,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="main" />
+ <option name="myItemId" value="test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -394,6 +342,10 @@
<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>
@@ -401,7 +353,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -412,20 +364,26 @@
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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="services" />
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="util" />
+ <option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -435,7 +393,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -454,10 +412,6 @@
<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>
@@ -465,7 +419,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -485,7 +439,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="control" />
+ <option name="myItemId" value="services" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -495,7 +449,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -515,7 +469,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="dto" />
+ <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>
@@ -525,7 +483,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -545,7 +503,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui" />
+ <option name="myItemId" value="control" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -555,7 +513,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -578,10 +536,6 @@
<option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -589,7 +543,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -619,7 +573,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="SE-2" />
+ <option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -649,7 +603,9 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
<pane id="PackagesPane" />
+ <pane id="Scratches" />
<pane id="AndroidView" />
</panes>
</component>
@@ -663,6 +619,7 @@
<property name="designer-theme-cache.name" value="mytheme" />
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
<property name="FullScreen" value="true" />
+ <property name="nodejs.jest.jest_package" value="" />
</component>
<component name="RecentsManager">
<key name="CreateTestDialog.RecentsKey">
@@ -739,8 +696,8 @@
<patterns />
<method />
</configuration>
- <configuration default="false" name="LoginControl_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+ <configuration default="false" name="LoginControl_Test.login_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" track_test_folders="true" runner="emma">
<pattern>
<option name="PATTERN" value="org.s4s.dao.impl.*" />
<option name="ENABLED" value="true" />
@@ -751,8 +708,34 @@
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.s4s.dao.impl" />
<option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.LoginControl_Test" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="METHOD_NAME" value="login_Test" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
+ <configuration default="false" name="ProductSearchTest.byIdTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+ <pattern>
+ <option name="PATTERN" value="org.s4s.dao.impl.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <module name="shopInShop" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.s4s.dao.impl" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.ProductSearchTest" />
+ <option name="METHOD_NAME" value="byIdTest" />
+ <option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -765,8 +748,8 @@
<patterns />
<method />
</configuration>
- <configuration default="false" name="LoginControl_Test.login_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" track_test_folders="true" runner="emma">
+ <configuration default="false" name="ProductSearchTest.byNameTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.s4s.dao.impl.*" />
<option name="ENABLED" value="true" />
@@ -776,12 +759,12 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.s4s.dao.impl" />
- <option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.LoginControl_Test" />
- <option name="METHOD_NAME" value="login_Test" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.ProductSearchTest" />
+ <option name="METHOD_NAME" value="byNameTest" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
@@ -876,65 +859,6 @@
<envs />
<method />
</configuration>
- <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="arquillianRunConfiguration">
- <value>
- <option name="containerStateName" value="" />
- </value>
- </option>
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
- <method />
- </configuration>
- <configuration default="true" type="ArquillianTestNG" factoryName="">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="arquillianRunConfiguration">
- <value>
- <option name="containerStateName" value="" />
- </value>
- </option>
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method />
- </configuration>
<configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
<method />
</configuration>
@@ -1022,14 +946,6 @@
</ExternalSystemSettings>
<method />
</configuration>
- <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
- <setting name="vmparams" value="" />
- <setting name="cmdLine" value="run-app" />
- <setting name="passParentEnv" value="true" />
- <setting name="launchBrowser" value="true" />
- <setting name="launchBrowserUrl" value="" />
- <method />
- </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -1143,12 +1059,6 @@
<option name="PORT" value="5005" />
<method />
</configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <envs />
- <method />
- </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -1193,12 +1103,6 @@
<envs />
<method />
</configuration>
- <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
- <method />
- </configuration>
- <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
- <method />
- </configuration>
<configuration default="false" name="JDBCConnectionTest" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" />
<module name="shopInShop" />
@@ -1241,20 +1145,44 @@
<patterns />
<method />
</configuration>
- <list size="6">
+ <configuration default="false" name="ShopControlTest" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="shopInShop" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.s4s.process.control" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.process.control.ShopControlTest" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
+ <list size="8">
<item index="0" class="java.lang.String" itemvalue="JUnit.JDBCConnectionTest" />
<item index="1" class="java.lang.String" itemvalue="JUnit.ProductSearchTest" />
- <item index="2" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
- <item index="3" class="java.lang.String" itemvalue="JUnit.RegistrationControl_Test" />
- <item index="4" class="java.lang.String" itemvalue="JUnit.LoginControl_Test" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.ShopControlTest" />
+ <item index="3" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.RegistrationControl_Test" />
<item index="5" class="java.lang.String" itemvalue="JUnit.LoginControl_Test.login_Test" />
+ <item index="6" class="java.lang.String" itemvalue="JUnit.ProductSearchTest.byIdTest" />
+ <item index="7" class="java.lang.String" itemvalue="JUnit.ProductSearchTest.byNameTest" />
</list>
<recent_temporary>
- <list size="4">
+ <list size="5">
<item index="0" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
- <item index="1" class="java.lang.String" itemvalue="JUnit.RegistrationControl_Test" />
- <item index="2" class="java.lang.String" itemvalue="JUnit.LoginControl_Test.login_Test" />
- <item index="3" class="java.lang.String" itemvalue="JUnit.LoginControl_Test" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.ProductSearchTest.byNameTest" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.ProductSearchTest.byIdTest" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.RegistrationControl_Test" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.LoginControl_Test.login_Test" />
</list>
</recent_temporary>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -1318,46 +1246,48 @@
<workItem from="1498024473611" duration="60000" />
<workItem from="1498032392863" duration="2354000" />
<workItem from="1498119950625" duration="3876000" />
+ <workItem from="1498159493584" duration="1831000" />
+ <workItem from="1498207046533" duration="2128000" />
</task>
<servers />
</component>
<component name="TestHistory">
- <history-entry file="ProductSearchTest - 2017.06.22 at 11h 01m 23s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 50m 22s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="ProductSearchTest - 2017.06.22 at 11h 28m 55s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 50m 48s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="ProductSearchTest - 2017.06.22 at 11h 33m 15s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 51m 47s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="ProductSearchTest - 2017.06.22 at 11h 37m 25s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 53m 47s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="ProductSearchTest - 2017.06.22 at 12h 48m 42s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 56m 00s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="ProductSearchTest - 2017.06.22 at 12h 49m 10s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 56m 22s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="ProductSearchTest - 2017.06.22 at 17h 10m 54s.xml">
- <configuration name="ProductSearchTest" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 58m 12s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="RegistrationControl_Test - 2017.06.20 at 09h 51m 04s.xml">
- <configuration name="RegistrationControl_Test" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 10h 58m 56s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="RegistrationControl_Test - 2017.06.20 at 09h 53m 04s.xml">
- <configuration name="RegistrationControl_Test" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 11h 05m 33s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
- <history-entry file="RegistrationControl_Test - 2017.06.20 at 10h 10m 43s.xml">
- <configuration name="RegistrationControl_Test" configurationId="JUnit" />
+ <history-entry file="ShopControlTest - 2017.06.23 at 11h 07m 08s.xml">
+ <configuration name="ShopControlTest" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="95604000" />
+ <option name="totallyTimeSpent" value="99563000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+ <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -1368,57 +1298,33 @@
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38108107" sideWeight="0.7270833" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3283582" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3804453" sideWeight="0.7270833" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802126" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28606966" sideWeight="0.64180064" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3930943" sideWeight="0.64180064" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21530758" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19453125" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18093699" sideWeight="0.5072727" order="4" side_tool="true" content_ui="tabs" />
<window_info id="PlantUML" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4189189" sideWeight="0.35819936" order="11" side_tool="true" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17427653" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="com.vaadin.designer.intellij.palette.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.35135135" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="com.vaadin.designer.intellij.outline.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.6486486" order="12" side_tool="true" content_ui="tabs" />
- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3804453" sideWeight="0.7270833" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39399806" sideWeight="0.64180064" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19479166" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18093699" sideWeight="0.5072727" order="4" side_tool="true" content_ui="tabs" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -1498,20 +1404,6 @@
<option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/util/ViewsTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/RegistrationControl.java" />
<entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java">
@@ -1535,21 +1427,6 @@
</state>
</provider>
</entry>
- <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="393">
- <caret line="57" column="28" lean-forward="true" selection-start-line="57" selection-start-column="28" selection-end-line="57" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ShopDAO.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="12" column="48" lean-forward="true" selection-start-line="12" selection-start-column="48" selection-end-line="12" selection-end-column="48" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ProductSearch.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LogoutControl.java">
<provider selected="true" editor-type-id="text-editor">
@@ -1565,20 +1442,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="108">
- <caret line="254" column="18" lean-forward="false" selection-start-line="254" selection-start-column="18" selection-end-line="254" selection-end-column="18" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ShopSearchDAO.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ShopSearchDAO.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="867">
@@ -1586,13 +1450,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="54" column="0" lean-forward="false" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- </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="160">
@@ -1615,13 +1472,6 @@
</provider>
</entry>
<entry file="jar://C:/Program Files/Java/jdk1.8.0_92/src.zip!/java/sql/ResultSet.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="238">
- <caret line="26" column="40" lean-forward="false" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="40" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ContactControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
@@ -1641,7 +1491,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-866">
<caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
- <folding />
</state>
</provider>
</entry>
@@ -1666,225 +1515,240 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="28" column="5" lean-forward="false" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
- <folding>
- <element signature="e#550#551#0" expanded="false" />
- <element signature="e#579#580#0" expanded="false" />
- <element signature="e#620#621#0" expanded="false" />
- <element signature="e#656#657#0" expanded="false" />
- <element signature="e#687#688#0" expanded="false" />
- <element signature="e#714#715#0" expanded="false" />
- <element signature="e#754#755#0" expanded="false" />
- <element signature="e#786#787#0" expanded="false" />
- <element signature="e#818#819#0" expanded="false" />
- <element signature="e#849#850#0" expanded="false" />
- <element signature="e#894#895#0" expanded="false" />
- <element signature="e#934#935#0" expanded="false" />
- <element signature="e#970#971#0" expanded="false" />
- <element signature="e#1002#1003#0" expanded="false" />
- <element signature="e#1052#1053#0" expanded="false" />
- <element signature="e#1094#1095#0" expanded="false" />
- <element signature="e#1134#1135#0" expanded="false" />
- <element signature="e#1172#1173#0" expanded="false" />
- <element signature="e#1232#1233#0" expanded="false" />
- <element signature="e#1286#1287#0" expanded="false" />
- </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/Product.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="345">
+ <caret line="24" column="5" lean-forward="false" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/Product.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopSearch.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopwithProducts.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="24" column="5" lean-forward="false" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
- <folding />
+ <state relative-caret-position="210">
+ <caret line="17" column="1" lean-forward="false" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ProductDAOimpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-714">
- <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+ <state relative-caret-position="371">
+ <caret line="41" column="53" lean-forward="false" selection-start-line="41" selection-start-column="53" selection-end-line="41" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/ProductSearchTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/SucheView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="441">
- <caret line="43" column="29" lean-forward="false" selection-start-line="43" selection-start-column="16" selection-end-line="43" selection-end-column="29" />
- <folding />
+ <state relative-caret-position="210">
+ <caret line="46" column="24" lean-forward="true" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="24" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopSearch.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="23" column="39" lean-forward="true" selection-start-line="23" selection-start-column="39" selection-end-line="23" selection-end-column="39" />
- <folding />
+ <state relative-caret-position="278">
+ <caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopwithProducts.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="17" column="1" lean-forward="false" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
+ <state relative-caret-position="205">
+ <caret line="20" column="33" lean-forward="true" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="310">
+ <caret line="212" column="0" lean-forward="true" selection-start-line="212" selection-start-column="0" selection-end-line="212" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Roles.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="371">
- <caret line="41" column="53" lean-forward="false" selection-start-line="41" selection-start-column="53" selection-end-line="41" selection-end-column="53" />
+ <state relative-caret-position="891">
+ <caret line="95" column="0" lean-forward="false" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+ </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="false" 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/gui/views/SucheView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="46" column="24" lean-forward="true" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="24" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="344">
+ <caret line="64" column="0" lean-forward="false" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopControl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="173">
- <caret line="24" column="4" lean-forward="true" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1498143497000" expanded="true" signature="2778:2926" ph="INSERT INTO \"ERR\".\"shop\"... " />
- </folding>
+ <state relative-caret-position="163">
+ <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ProductDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="278">
- <caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+ <state relative-caret-position="300">
+ <caret line="23" column="69" lean-forward="false" selection-start-line="23" selection-start-column="69" selection-end-line="23" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="165">
+ <caret line="72" column="55" lean-forward="false" selection-start-line="72" selection-start-column="55" selection-end-line="72" selection-end-column="55" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ProductControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="397">
- <caret line="35" column="44" lean-forward="true" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="439">
+ <caret line="38" column="46" lean-forward="false" selection-start-line="38" selection-start-column="46" selection-end-line="38" selection-end-column="46" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java">
+ <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="205">
- <caret line="20" column="33" lean-forward="true" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+ <state relative-caret-position="174">
+ <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="29" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ProductDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="19" column="62" lean-forward="true" selection-start-line="19" selection-start-column="62" selection-end-line="19" selection-end-column="62" />
+ <state relative-caret-position="270">
+ <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ProductDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="310">
- <caret line="212" column="0" lean-forward="true" selection-start-line="212" selection-start-column="0" selection-end-line="212" selection-end-column="0" />
+ <state relative-caret-position="-1601">
+ <caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ShopDAO.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="69" column="71" lean-forward="false" selection-start-line="69" selection-start-column="69" selection-end-line="69" selection-end-column="71" />
+ <state relative-caret-position="105">
+ <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopControl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="255">
+ <caret line="24" column="4" lean-forward="false" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
+ <element signature="e#621#622#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/TransactionControl.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/ProductSearchTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="174">
- <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="29" selection-end-column="39" />
+ <state relative-caret-position="529">
+ <caret line="47" column="23" lean-forward="false" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" />
<folding>
- <marker date="1497960469000" expanded="true" signature="2070:2267" ph="INSERT INTO \"ERR\".\"transaktion\"... " />
- <marker date="1497960469000" expanded="true" signature="2570:2687" ph="UPDATE INTO " />
+ <element signature="imports" expanded="true" />
+ <marker date="1498161242000" expanded="true" signature="2074:2149" ph="DELETE FROM " />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Roles.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="90">
- <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+ <state relative-caret-position="315">
+ <caret line="26" column="1" lean-forward="true" selection-start-line="26" selection-start-column="1" selection-end-line="26" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="163">
- <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+ <state relative-caret-position="708">
+ <caret line="54" column="0" lean-forward="false" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/KundenDAO.java">
+ <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="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 relative-caret-position="307">
+ <caret line="55" column="8" lean-forward="false" selection-start-line="55" selection-start-column="8" selection-end-line="59" selection-end-column="13" />
+ <folding>
+ <marker date="1498159345000" expanded="true" signature="1429:1515" ph="SELECT * FRO... user" />
+ <marker date="1498159345000" expanded="true" signature="2414:2492" ph="DELETE FROM " />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="344">
- <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
+ <state relative-caret-position="240">
+ <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+ <state relative-caret-position="464">
+ <caret line="126" column="27" lean-forward="false" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ShopDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="334">
- <caret line="42" column="52" lean-forward="true" selection-start-line="42" selection-start-column="52" selection-end-line="42" selection-end-column="52" />
+ <state relative-caret-position="135">
+ <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="39" column="60" lean-forward="true" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="60" />
+ <state relative-caret-position="287">
+ <caret line="55" column="10" lean-forward="false" selection-start-line="55" selection-start-column="10" selection-end-line="55" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
+ <marker date="1498209467000" expanded="true" signature="2099:2181" ph="SELECT name shop" />
+ <marker date="1498209467000" expanded="true" signature="2794:2866" ph="DELETE FROM " />
</folding>
</state>
</provider>
diff --git a/pom.xml b/pom.xml
index ae60c426b4051b60b6b28b7817e70f83768c3a1a..38dca139875d1a5abda6677f890d43ec8146035e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,20 @@
<version>LATEST</version>
</dependency>-->
+ <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server
+ fuer den Jetty-Server-->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>LATEST</version>
+ </dependency>
+
</dependencies>
+
+
+
+
<build>
<plugins>
<plugin>
diff --git a/shopInShop.iml b/shopInShop.iml
index 57f2f5dadaf654d03873482e8787056d2b2c4afa..fd7a3da2b39da6365e531b16852ef8ccc9f4c1da 100644
--- a/shopInShop.iml
+++ b/shopInShop.iml
@@ -57,5 +57,9 @@
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.6.v20170531" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.6.v20170531" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.6.v20170531" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.6.v20170531" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/src/main/java/org/s4s/gui/views/WarenkorbView.java b/src/main/java/org/s4s/gui/views/WarenkorbView.java
index f2765feb6f36af494761de7676a560ede5fc0bf0..8d9d0e1eba9d7a006f485ef629ce103d32bfadd3 100644
--- a/src/main/java/org/s4s/gui/views/WarenkorbView.java
+++ b/src/main/java/org/s4s/gui/views/WarenkorbView.java
@@ -80,10 +80,11 @@ public class WarenkorbView extends TemplateView {
table.addGeneratedColumn("Anzahl", (Table source, Object itemId, Object columnId) -> {
int a = 0;
for (Product p : list) {
-
+ a = warenkorb.getAmount(p);
+ Panel panel = new Panel("" + a);
+ return panel;
}
- Panel p = new Panel("" + a);
- return p;
+ return a;
});
table.addItemClickListener(new ItemClickEvent.ItemClickListener() {
diff --git a/src/main/java/org/s4s/process/control/TransactionControl.java b/src/main/java/org/s4s/process/control/TransactionControl.java
index 902368f337184907ef8425db8507cb633db1dc74..2bedd4f2ffd9378a2260c6bc854c0b182c644f4a 100644
--- a/src/main/java/org/s4s/process/control/TransactionControl.java
+++ b/src/main/java/org/s4s/process/control/TransactionControl.java
@@ -30,20 +30,22 @@ public class TransactionControl extends AbstractDatabaseClass {
User user = new User(name, id);
transaktion.setKaeufer(user);
for (Product p : Warenkorb.getInstance().inhalt()) {
- transaktion.setVerkaeufer(kaeuferinDB(p.getId()));
transaktion.setProdukt(p);
+ transaktion.setVerkaeufer(kaeuferinDB(p.getId()));
createTransactionInDB(transaktion);
updateGekauftStatusInArtikel(transaktion);
}
}
public Integer kaeuferinDB(int produktid) throws DAOException, SQLException {
- Integer verkaeufer;
- try (ResultSet rs = executeQuery("SELECT u.\"besitzer\"" + " FROM \"ERR\".\"shop\" u , \"ERR\".\"artikel\" s"
- + " WHERE u.shopid = s.shopid AND "
- + "s.artikelid = '" + transaktion.getProdukt().getId() + "';");) {
-
- verkaeufer = rs.getInt("besitzer");
+ Integer verkaeufer = null;
+ Integer test = transaktion.getProdukt().getId();
+ try (ResultSet rs = executeQuery("SELECT u.\"besitzer\" FROM \"ERR\".\"shop\" u , "
+ + "\"ERR\" .\"artikel\" s WHERE u.\"shopid\" = s.\"shopid\" "
+ + "AND s.\"artikelid\" = ('" + transaktion.getProdukt().getId() + "');")) {
+ if (rs.next()) {
+ verkaeufer = rs.getInt("besitzer");
+ }
} catch (SQLException ex) {
throw new DAOException(ex);
}
@@ -52,10 +54,8 @@ public class TransactionControl extends AbstractDatabaseClass {
public void createTransactionInDB(Transaction transaktion) throws DAOException, SQLException {
try {
- statement.execute("INSERT INTO \"ERR\".\"transaktion\" (verkaeufer, kaeufer, artikelid) VALUES("
- + transaktion.getVerkaeufer() + ","
- + transaktion.getKaeufer().getUserId() + ","
- + transaktion.getProdukt().getId());
+ statement.execute("INSERT INTO \"ERR\".\"transaktion\" (verkaeufer, kaeufer, artikelid) VALUES (\'" + transaktion.getVerkaeufer() + "\', \'" + transaktion.getKaeufer().getUserId() + "\', \'" + transaktion.getProdukt().getId() + "\')");
+
} catch (SQLException ex) {
throw new DAOException(ex);
}
@@ -63,10 +63,7 @@ public class TransactionControl extends AbstractDatabaseClass {
public void updateGekauftStatusInArtikel(Transaction transaktion) throws DAOException, SQLException {
try {
- statement.execute("UPDATE INTO \"ERR\".\"artikel\""
- + "SET gekauft = true"
- + "WHERE artikelid = "
- + transaktion.getProdukt().getId());
+ statement.execute("UPDATE \"ERR\".\"artikel\" SET gekauft = 'true' WHERE \"artikelid\" = ('" + transaktion.getProdukt().getId() + "');");
} catch (SQLException ex) {
throw new DAOException(ex);
}
diff --git a/src/test/java/org/s4s/dao/impl/ProductSearchTest.java b/src/test/java/org/s4s/dao/impl/ProductSearchTest.java
index 65af3bafee6ec5dc5cbc8518c7570ff91de0d516..4cd232949b56c1ad23ddb9ed3cce97ac9c8b419b 100644
--- a/src/test/java/org/s4s/dao/impl/ProductSearchTest.java
+++ b/src/test/java/org/s4s/dao/impl/ProductSearchTest.java
@@ -25,21 +25,23 @@ public class ProductSearchTest {
//aktueller Fehler: ID wird nicht automatisch vergeben, die hardcoded ID muss entfernt werden und durch Methode ersetzt
// aktuell manuell in der Datenbank hinzugefuegt um den Test durchzufuehren, automatisiert hinzufuegen, sobald View fertig ist
- product = new Product("Testbuch", 31, "Buch", 2.99, "Ein Buch zum testen", 17);
+ product = new Product("Testbuch", 34, "Buch", 2.99, "Ein Buch zum testen", 17);
}
/*
@Test
public void byNameTest() throws DAOException {
+ boolean result = false;
list = productDAOimpl.getProductByName("Testbuch");
- assertTrue(list.contains("Testbuch"));
+ assertTrue(list.contains(product));
}
@Test
public void byIdTest() throws DAOException {
Product resultproduct = productDAOimpl.getProductById(31);
- assertTrue(resultproduct.equals(product));
+ assertEquals(17,resultproduct.getShopId());
+ assertEquals(2.99, resultproduct.getPrice());
}
@Test
@@ -47,7 +49,7 @@ public class ProductSearchTest {
list = productDAOimpl.getProductByDescription("zum testen");
assertTrue(list.contains("Testbuch"));
}
-
+
@Test
public void byOwner() throws DAOException {
Shop resultShop = productDAOimpl.getProductOwner(product);
diff --git a/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java b/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
index 508e47e29dcb9b270890f5cdc0e688653148f989..61db1d25241ff37b154523d87d67706279b694c4 100644
--- a/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
+++ b/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
@@ -31,6 +31,9 @@ public class RegistrationControl_Test {
@Before
public void init() {
Date bday = new Date(1995, 5, 15);
+ bday.setYear(1995);
+ bday.setMonth(5);
+ bday.setDate(15);
RegistrationDAO regDAO = new RegistrationDAO();
int userID = regDAO.getUserID();
@@ -39,7 +42,7 @@ public class RegistrationControl_Test {
user = new User("Testcase", userID);
user.setEmail("testmail@gmx.de");
user.setFachbereichId(2);
- user.setGeburtsdatum(bday);
+
user.setNachname("Nachname");
user.setVorname("Tester");
}
diff --git a/src/test/java/org/s4s/process/control/ShopControlTest.java b/src/test/java/org/s4s/process/control/ShopControlTest.java
index 253a67207fe003ce67dd2ee469225c812073d166..5763eb452f4b8f71f04b6c1b4869a310365fba59 100644
--- a/src/test/java/org/s4s/process/control/ShopControlTest.java
+++ b/src/test/java/org/s4s/process/control/ShopControlTest.java
@@ -1,9 +1,11 @@
package org.s4s.process.control;
import java.util.Date;
+import org.eclipse.jetty.server.Server;
import org.junit.After;
import org.junit.Before;
import org.s4s.dao.RegistrationDAO;
+import org.s4s.dao.impl.ShopDAOimpl;
import org.s4s.exceptions.WrongInputException;
import org.s4s.modell.dto.User;
import org.s4s.services.db.JDBCConnection;
@@ -15,11 +17,12 @@ public class ShopControlTest {
RegistrationDAO regDAO = new RegistrationDAO();
int userID = regDAO.getUserID();
- ShopControl shopControl = new ShopControl();
+ ShopDAOimpl shopDAOimpl = new ShopDAOimpl();
User testuser = new User("Testcase", userID);
+ Server server;
@Before
- public void init() {
+ public void init() throws Exception {
//Testuser befuellen
testuser.setNachname("Nachname");
testuser.setVorname("Tester");
@@ -33,30 +36,46 @@ public class ShopControlTest {
bday.setDate(15);
RegistrationControl.init(testuser.getBenutzername(), testuser.getNachname(), testuser.getVorname(), bday, testuser.getFachbereichId(), testuser.getEmail(), testuser.getEmail(), "test12345", "test12345");
+ //Server starten
+ server = new Server(8080);
+ server.start();
+ server.join();
+ //UI.getCurrent().getSession().setAttribute(User, testuser);
+
}
/*
@Test
public void existenz_Test() {
//testen ob Shop existiert
- assertFalse(shopControl.viewShop(testuser));
+ assertFalse(shopDAOimpl.viewShop(testuser));
}
@Test
- public void erstellungs_Test() {
+ public void erstellungs_Test() throws Exception {
//Shop erstellen
- assertTrue(shopControl.addShop(testuser, "Testshop"));
+ shopDAOimpl.checkUserShop("Testshop");
+ String sql = "SELECT name" + " FROM \"ERR\".\"shop\" u " + " WHERE u.name = '" + "Testshop" + "';";
+ try {
+ ResultSet set = JDBCConnection.getInstance().getStatement().executeQuery(sql);
+ if (!set.next()) {
+ throw new WrongInputException("Wrong Input");
+ }
+ assertEquals("Testshop", set.getString("name"));
+ }catch(Exception e){
+ throw new Exception("Fehler");
+ }
}
@Test
- public void existenz_Test_nach_Erstellun() {
+ public void existenz_Test_nach_Erstellung() {
//erneut testen ob Shop existiert
- assertTrue(shopControl.viewShop(testuser));
-
- }*/
+ assertTrue(shopDAOimpl.viewShop(testuser));
+ }
+ */
@After
- public void delete() {
+ public void delete() throws Exception {
String sql_delete = "DELETE FROM \"ERR\".\"shop\" s " + " WHERE s.name = '" + "Testshop" + "';";
try {
int exe = JDBCConnection.getInstance().getStatement().executeUpdate(sql_delete);
@@ -66,6 +85,8 @@ public class ShopControlTest {
} catch (Exception e) {
e.printStackTrace();
}
+
+ server.stop();
}
}