diff --git a/.idea/artifacts/shopInShop_war_exploded.xml b/.idea/artifacts/shopInShop_war_exploded.xml
index 4b50a6d7de4062e7f24bec7d313a0cd80169c011..6846a4a93bd27f1a6c3e61d7f28376c7936bec85 100644
--- a/.idea/artifacts/shopInShop_war_exploded.xml
+++ b/.idea/artifacts/shopInShop_war_exploded.xml
@@ -7,7 +7,7 @@
<element id="module-output" name="shopInShop" />
</element>
<element id="directory" name="lib">
- <element id="library" level="project" name="Maven: org.postgresql:postgresql:42.0.0" />
+ <element id="library" level="project" name="Maven: org.postgresql:postgresql:42.1.1.jre7" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-server:7.7.8" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.13" />
<element id="library" level="project" name="Maven: org.w3c.css:sac:1.3" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c42cb2f8f1f4db246118ae1057d1b0a4dbbd2eb2..7806b6745d28f9b9d041bc9b29023b93172d8c25 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,28 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5f36371d-de5c-44ce-a12c-613727d95355" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
<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$/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/main/java/org/s4s/View/InitView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/CheckoutView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/CheckoutView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.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/gui/views/VerkaeuferbewertungView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" afterPath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" afterPath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" />
</list>
<ignored path="shopInShop.iws" />
@@ -33,92 +49,67 @@
<file leaf-file-name="InitView.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="660">
- <caret line="51" column="63" lean-forward="false" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="63" />
+ <state relative-caret-position="349">
+ <caret line="43" column="40" lean-forward="false" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
+ <marker date="1494945697498" expanded="true" signature="2026:2032" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WelcomeView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="858">
- <caret line="53" column="41" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ShopView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <file leaf-file-name="Views.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="990">
- <caret line="68" column="8" lean-forward="false" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="8" />
+ <state relative-caret-position="374">
+ <caret line="24" column="49" lean-forward="false" selection-start-line="24" selection-start-column="49" selection-end-line="24" selection-end-column="49" />
<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/dao/impl/LoginControl.java">
+ <file leaf-file-name="FaqView.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="286">
- <caret line="21" column="41" lean-forward="false" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="41" />
+ <state relative-caret-position="308">
+ <caret line="20" column="5" lean-forward="true" selection-start-line="17" selection-start-column="3" selection-end-line="20" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="LoginView.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java">
+ <file leaf-file-name="TemplateView.java" pinned="false" current-in-tab="true">
+ <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="532">
- <caret line="71" column="17" lean-forward="false" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="1144">
- <caret line="61" column="39" lean-forward="false" selection-start-line="61" selection-start-column="18" selection-end-line="61" selection-end-column="39" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <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="1078">
- <caret line="49" column="23" lean-forward="false" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
- <folding />
+ <state relative-caret-position="631">
+ <caret line="57" column="57" lean-forward="true" selection-start-line="57" selection-start-column="57" selection-end-line="57" selection-end-column="57" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Product.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/objects/dto/Product.java">
+ <file leaf-file-name="WelcomeView.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="44" column="32" lean-forward="false" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="503">
+ <caret line="33" column="42" lean-forward="false" selection-start-line="33" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#511#512#0" expanded="true" />
+ <element signature="e#539#540#0" expanded="true" />
+ </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">
+ <file leaf-file-name="ImpressumView.java" pinned="false" current-in-tab="false">
+ <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="198">
- <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 relative-caret-position="110">
+ <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -126,9 +117,25 @@
</file>
</leaf>
</component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <list>
+ <option value="DesignerCompanion" />
+ <option value="Class" />
+ </list>
+ </option>
+ </component>
<component name="FindInProjectRecents">
<findStrings>
<find><dependency></find>
+ <find>v-ap</find>
+ <find>v-ui</find>
+ <find>v-scrollable</find>
+ <find>mytheme</find>
+ <find>v-win</find>
+ <find>v-sa</find>
+ <find>v-we</find>
+ <find>v-webkit</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -145,10 +152,26 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/MyUI.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/View/MyUI.java" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.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/LoginView.java" />
<option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/CheckoutView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/org/s4s/gui/views/WelcomeViewDesign.html" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
+ <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" />
+ <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
</list>
</option>
</component>
@@ -158,6 +181,13 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
+ <component name="MavenImportPreferences">
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="importAutomatically" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
<component name="MavenProjectNavigator">
<treeState />
</component>
@@ -182,7 +212,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -226,6 +255,22 @@
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="VAADIN" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="themes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mytheme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -245,7 +290,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="java" />
+ <option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -266,16 +311,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="View" />
+ <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="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -305,11 +360,7 @@
<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="util" />
+ <option name="myItemId" value="View" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -343,7 +394,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="db" />
+ <option name="myItemId" value="util" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -373,7 +424,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>
@@ -402,10 +457,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="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -433,7 +484,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="dao" />
+ <option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -466,23 +517,22 @@
<option name="myItemId" value="dao" />
<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>
</subPane>
</pane>
<pane id="Scope" />
+ <pane id="Scratches" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../../AlgoDat" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+ <property name="designer-theme-cache.timestamp" value="1494937215403" />
+ <property name="designer-theme-cache.name" value="mytheme" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -981,39 +1031,45 @@
<workItem from="1494352027924" duration="371000" />
<workItem from="1494502530533" duration="34000" />
<workItem from="1494505551347" duration="25000" />
+ <workItem from="1494762098865" duration="3273000" />
+ <workItem from="1494936644066" duration="1526000" />
+ <workItem from="1494938334998" duration="7373000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="7595000" />
+ <option name="totallyTimeSpent" value="19767000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+ <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="3" 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="6" 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="3" 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="2" 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="3" 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="8" 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="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19243243" sideWeight="0.50208336" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23541667" sideWeight="0.5" 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.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="false" show_stripe_button="true" weight="0.34054053" sideWeight="0.49791667" order="2" 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.23891892" sideWeight="0.27291667" order="7" 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.175" sideWeight="0.5" order="3" 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="5" 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="7" 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="-1" side_tool="false" 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="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="-1" side_tool="true" 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="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22916667" sideWeight="0.5" 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="3" side_tool="true" 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="3" 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="2" 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.24972972" sideWeight="0.7270833" order="3" 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="6" 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="2" 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="3" 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="8" 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="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.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.34054053" sideWeight="0.49583334" order="2" 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="7" 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.22916667" sideWeight="0.5" 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="3" 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="5" 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.33" sideWeight="0.5" order="2" side_tool="true" 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.39986283" sideWeight="0.5" order="3" side_tool="false" 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="4" 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="0" side_tool="false" content_ui="tabs" />
@@ -1060,7 +1116,9 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
- <breakpoint-manager />
+ <breakpoint-manager>
+ <option name="time" value="6" />
+ </breakpoint-manager>
<watches-manager />
</component>
<component name="antWorkspaceConfiguration">
@@ -1069,208 +1127,254 @@
</component>
<component name="designer.settings">
<option name="autodetectServerAddress" value="true" />
- <option name="serverIp" value="localhost" />
+ <option name="serverIp" value="10.20.139.245" />
+ <option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider editor-type-id="text-editor">
+ <state relative-caret-position="528">
+ <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/README">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
- <folding />
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="30" column="13" lean-forward="false" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+ <state relative-caret-position="7968">
+ <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/UI.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SPLIT">
+ <first_editor relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </first_editor>
+ <second_editor />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1826">
- <caret line="83" column="29" lean-forward="true" selection-start-line="83" selection-start-column="29" selection-end-line="83" selection-end-column="29" />
+ <state relative-caret-position="3652">
+ <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="418">
- <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ <state relative-caret-position="374">
+ <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
<folding>
<element signature="imports" expanded="true" />
+ <marker date="1494945697498" expanded="true" signature="2026:2032" ph="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="7968">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider editor-type-id="text-editor">
+ <state relative-caret-position="528">
+ <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ </state>
+ </provider>
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SPLIT">
+ <first_editor relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </first_editor>
+ <second_editor />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/README.md">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/README">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.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="7968">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="198">
+ <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/data/util/BeanContainer.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="154">
+ <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="7968">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="286">
+ <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md" />
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3652">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="484">
+ <caret line="27" column="28" lean-forward="false" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/src/main/resources/README">
+ <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="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="705">
+ <caret line="61" column="39" lean-forward="false" selection-start-line="61" selection-start-column="18" selection-end-line="61" selection-end-column="39" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/objects/dto/Product.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="864">
- <caret line="18" column="9" lean-forward="false" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+ <state relative-caret-position="705">
+ <caret line="44" column="32" lean-forward="false" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="32" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="1248">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="330">
+ <caret line="22" column="2" lean-forward="true" selection-start-line="22" selection-start-column="2" selection-end-line="22" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-25200">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="418">
+ <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/README.md" />
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="3652">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="198">
+ <caret line="15" column="47" lean-forward="false" selection-start-line="15" selection-start-column="47" selection-end-line="15" selection-end-column="47" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ <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="198">
+ <caret line="30" column="42" lean-forward="false" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/README">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="198">
+ <caret line="15" column="46" lean-forward="false" selection-start-line="15" selection-start-column="46" selection-end-line="15" selection-end-column="46" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="7968">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding />
+ <state relative-caret-position="198">
+ <caret line="15" column="54" lean-forward="false" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/UI.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </first_editor>
- <second_editor />
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractComponentContainer.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="154">
+ <caret line="19" column="11" lean-forward="false" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/server/AbstractClientConnector.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3652">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
+ <state relative-caret-position="418">
+ <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/org/s4s/gui/views/WelcomeViewDesign.html">
+ <provider selected="true" editor-type-id="com.vaadin.designer.intellij.webEditor">
+ <state />
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/VerticalLayout.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="132">
+ <caret line="9" column="44" lean-forward="true" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
- <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.jar!/com/vaadin/ui/AbstractLayout.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="132">
+ <caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </first_editor>
- <second_editor />
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/Panel.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="27" column="37" lean-forward="false" selection-start-line="27" selection-start-column="37" selection-end-line="27" selection-end-column="37" />
+ <folding />
</state>
</provider>
- <provider editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractSingleComponentContainer.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="132">
+ <caret line="22" column="75" lean-forward="false" selection-start-line="22" selection-start-column="75" selection-end-line="22" selection-end-column="75" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/README">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractComponent.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="132">
+ <caret line="56" column="39" lean-forward="false" selection-start-line="56" selection-start-column="22" selection-end-line="56" selection-end-column="39" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/addons.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractOrderedLayout.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="222">
+ <caret line="186" column="16" lean-forward="false" selection-start-line="186" selection-start-column="16" selection-end-line="186" selection-end-column="16" />
+ <folding>
+ <element signature="e#6463#6464#0" expanded="true" />
+ <element signature="e#6512#6513#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/navigator/Navigator.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="171">
+ <caret line="209" column="0" lean-forward="false" selection-start-line="209" selection-start-column="0" selection-end-line="209" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
@@ -1282,111 +1386,134 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/META-INF/context.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <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 relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="660">
- <caret line="51" column="63" lean-forward="false" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="63" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="-3765">
+ <caret line="49" column="23" lean-forward="false" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java">
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="25" column="20" lean-forward="true" selection-start-line="12" selection-start-column="31" selection-end-line="25" selection-end-column="20" />
+ <state relative-caret-position="146">
+ <caret line="1081" column="15" lean-forward="false" selection-start-line="1081" selection-start-column="7" selection-end-line="1081" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ProductDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/objects/dto/Product.java">
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="44" column="32" lean-forward="false" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="32" />
+ <state relative-caret-position="217">
+ <caret line="37" column="14" lean-forward="false" selection-start-line="37" selection-start-column="3" selection-end-line="37" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/data/util/BeanContainer.class">
+ <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="154">
- <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+ <state relative-caret-position="330">
+ <caret line="21" column="4" lean-forward="false" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="4" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <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="990">
- <caret line="68" column="8" lean-forward="false" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="8" />
+ <state relative-caret-position="198">
+ <caret line="15" column="51" lean-forward="false" selection-start-line="15" selection-start-column="51" selection-end-line="15" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/KundenDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/CheckoutView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="286">
- <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ <state relative-caret-position="198">
+ <caret line="15" column="46" lean-forward="false" selection-start-line="15" selection-start-column="46" selection-end-line="15" selection-end-column="46" />
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="858">
- <caret line="53" column="41" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
+ <state relative-caret-position="503">
+ <caret line="33" column="42" lean-forward="false" selection-start-line="33" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
+ <element signature="e#511#512#0" expanded="true" />
+ <element signature="e#539#540#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="1078">
- <caret line="49" column="23" lean-forward="false" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
+ <state relative-caret-position="110">
+ <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1144">
- <caret line="61" column="39" lean-forward="false" selection-start-line="61" selection-start-column="18" selection-end-line="61" selection-end-column="39" />
+ <state relative-caret-position="308">
+ <caret line="20" column="5" lean-forward="true" selection-start-line="17" selection-start-column="3" selection-end-line="20" selection-end-column="5" />
<folding />
</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/gui/views/ContactView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="286">
- <caret line="21" column="41" lean-forward="false" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="41" />
+ <state relative-caret-position="154">
+ <caret line="7" column="45" lean-forward="false" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="45" />
<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/util/Views.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="532">
- <caret line="71" column="17" lean-forward="false" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
+ <state relative-caret-position="374">
+ <caret line="24" column="49" lean-forward="false" selection-start-line="24" selection-start-column="49" selection-end-line="24" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="349">
+ <caret line="43" column="40" lean-forward="false" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <marker date="1494945697498" expanded="true" signature="2026:2032" ph="{...}" />
+ </folding>
+ </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="631">
+ <caret line="57" column="57" lean-forward="true" selection-start-line="57" selection-start-column="57" selection-end-line="57" selection-end-column="57" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/shopInShop.iml b/shopInShop.iml
index 580353e8fe8b23a3234afe6f7683a1b5a489e596..09c38a8d8bc2be117caa1611686a4c3f55cdc861 100644
--- a/shopInShop.iml
+++ b/shopInShop.iml
@@ -34,7 +34,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.0.0" level="project" />
+ <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.1.1.jre7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.7.8" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.13" level="project" />
diff --git a/src/main/java/org/s4s/View/InitView.java b/src/main/java/org/s4s/View/InitView.java
index fdcf6803c53f2b4fd3aabef5cfac4d984ed23559..1e166b0043ed0a47a880d08bbace11e01c8e7641 100644
--- a/src/main/java/org/s4s/View/InitView.java
+++ b/src/main/java/org/s4s/View/InitView.java
@@ -8,22 +8,13 @@ import com.vaadin.annotations.VaadinServletConfiguration;
import com.vaadin.navigator.Navigator;
import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet;
-import com.vaadin.ui.UI;
-import org.s4s.gui.views.ArtikeldetailsView;
-import org.s4s.gui.views.BenutzerkontoView;
-import org.s4s.gui.views.CheckoutView;
-import org.s4s.gui.views.FaqView;
-import org.s4s.gui.views.ImpressumView;
-import org.s4s.gui.views.KaufbestaetigungView;
-import org.s4s.gui.views.LoginView;
-import org.s4s.gui.views.PasswortView;
-import org.s4s.gui.views.ShopView;
-import org.s4s.gui.views.VerkaeuferbewertungView;
-import org.s4s.gui.views.WelcomeView;
-import org.s4s.gui.views.WarenkorbView;
+import com.vaadin.ui.*;
+import org.s4s.gui.views.*;
import org.s4s.services.db.JDBCConnection;
import org.s4s.services.util.Views;
+import static javax.accessibility.AccessibleRole.FOOTER;
+
/**
* This UI is the application entry point. A UI may either represent a browser window
* (or tab) or some part of a html page where a Vaadin application is embedded.
@@ -50,8 +41,11 @@ public class InitView extends UI {
navi.addView(Views.FAQ, FaqView.class);
navi.addView(Views.KAUFBESTAETIGUNG, KaufbestaetigungView.class);
navi.addView(Views.VERKAEUFERBEWERTUNG, VerkaeuferbewertungView.class);
+ navi.addView(Views.CONTACT, ContactView.class);
+
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
-
+ this.addStyleName("customShell");
+ this.setWidth(64f, Unit.PERCENTAGE);
}
diff --git a/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java b/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java
index d5d27c24459f5adf3e354502db727ce71337f1b1..6ec1e3caf79b8057d540b75ebcdf9e56acde352c 100644
--- a/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java
+++ b/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java
@@ -13,11 +13,12 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class ArtikeldetailsView extends VerticalLayout implements View{
+public class ArtikeldetailsView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
+
}
diff --git a/src/main/java/org/s4s/gui/views/BenutzerkontoView.java b/src/main/java/org/s4s/gui/views/BenutzerkontoView.java
index 2cd0b54a370b4aa85b19165790c839c0082bbbd8..b1883a79ad3e013262c85570bfc02465c2d39384 100644
--- a/src/main/java/org/s4s/gui/views/BenutzerkontoView.java
+++ b/src/main/java/org/s4s/gui/views/BenutzerkontoView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class BenutzerkontoView extends VerticalLayout implements View{
+public class BenutzerkontoView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/CheckoutView.java b/src/main/java/org/s4s/gui/views/CheckoutView.java
index 51d921a6e394339aa44c40c731bd12ed8c294b00..fed2aa2dd585b70a95195825b0aa5af1bdf70cef 100644
--- a/src/main/java/org/s4s/gui/views/CheckoutView.java
+++ b/src/main/java/org/s4s/gui/views/CheckoutView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class CheckoutView extends VerticalLayout implements View{
+public class CheckoutView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/ContactView.java b/src/main/java/org/s4s/gui/views/ContactView.java
new file mode 100644
index 0000000000000000000000000000000000000000..1eee50240e167cace865c7b109b994c28e7785cb
--- /dev/null
+++ b/src/main/java/org/s4s/gui/views/ContactView.java
@@ -0,0 +1,13 @@
+package org.s4s.gui.views;
+
+import com.vaadin.navigator.ViewChangeListener;
+
+/**
+ * Created by Max-Desktop on 16.05.2017.
+ */
+public class ContactView extends TemplateView{
+ @Override
+ public void enter(ViewChangeListener.ViewChangeEvent event) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+}
diff --git a/src/main/java/org/s4s/gui/views/FaqView.java b/src/main/java/org/s4s/gui/views/FaqView.java
index 5d7c4dfcf6a43d9f6a76440c5711b24ac5f09c12..0089e9366a3660db8a7e9b08737cc2a662052fec 100644
--- a/src/main/java/org/s4s/gui/views/FaqView.java
+++ b/src/main/java/org/s4s/gui/views/FaqView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class FaqView extends VerticalLayout implements View{
+public class FaqView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/ImpressumView.java b/src/main/java/org/s4s/gui/views/ImpressumView.java
index 3fb284142e4ed4fc326c0e51cc69a94426584989..16992134209629980d18c43f6284b5a799d5a65d 100644
--- a/src/main/java/org/s4s/gui/views/ImpressumView.java
+++ b/src/main/java/org/s4s/gui/views/ImpressumView.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class ImpressumView extends VerticalLayout implements View{
+public class ImpressumView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
@@ -23,8 +23,8 @@ public class ImpressumView extends VerticalLayout implements View{
}
private void setUp(){
- setSizeFull();
- setMargin(true);
+ VerticalLayout vertLayout = new VerticalLayout();
+ vertLayout.setSizeFull();
Label label = new Label("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, "
+ "sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,"
+ " sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum."
@@ -33,7 +33,11 @@ public class ImpressumView extends VerticalLayout implements View{
+ " tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."
+ " At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, "
+ "no sea takimata sanctus est Lorem ipsum dolor sit amet.");
- addComponent(label);
- setComponentAlignment(label,Alignment.MIDDLE_CENTER);
+ vertLayout.addComponent(label);
+ vertLayout.setComponentAlignment(label,Alignment.MIDDLE_CENTER);
+
+
+ super.setUpFooterAndHeader(vertLayout);
+
}
}
diff --git a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java
index 3056dffd5cbc3aac294ec904b97f1581c87b95fa..16d617dd3656a8b2e5ca48fa24770fb816ba3ed2 100644
--- a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java
+++ b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class KaufbestaetigungView extends VerticalLayout implements View{
+public class KaufbestaetigungView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/LoginView.java b/src/main/java/org/s4s/gui/views/LoginView.java
index b4019c7855f1e5fe26887237b0152541fe184353..2f6c5bd091d8905862dd62ed3bc001d9d5a354cb 100644
--- a/src/main/java/org/s4s/gui/views/LoginView.java
+++ b/src/main/java/org/s4s/gui/views/LoginView.java
@@ -23,7 +23,7 @@ import org.s4s.services.util.Views;
*
* @author Holger
*/
-public class LoginView extends VerticalLayout implements View {
+public class LoginView extends TemplateView {
private final KundenDAO kundenDAO = new LoginControl();
diff --git a/src/main/java/org/s4s/gui/views/PasswortView.java b/src/main/java/org/s4s/gui/views/PasswortView.java
index 06779817aa6f59a492033cabb57b46c25aaa9f6b..527083d921cba6677bd189b2d5b24564471266ab 100644
--- a/src/main/java/org/s4s/gui/views/PasswortView.java
+++ b/src/main/java/org/s4s/gui/views/PasswortView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class PasswortView extends VerticalLayout implements View{
+public class PasswortView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/ShopView.java b/src/main/java/org/s4s/gui/views/ShopView.java
index ed3b47e5744bf2fef547878cd0ce0c765c238410..295e3a814d7ddd58edfb61bb04cc7d4ed0cc19c4 100644
--- a/src/main/java/org/s4s/gui/views/ShopView.java
+++ b/src/main/java/org/s4s/gui/views/ShopView.java
@@ -28,7 +28,7 @@ import org.s4s.dao.impl.ProductSearch;
*
* @author Holger
*/
-public class ShopView extends VerticalLayout implements View{
+public class ShopView extends TemplateView{
private final ProductDAO products = ProductSearch.getInstance();
diff --git a/src/main/java/org/s4s/gui/views/TemplateView.java b/src/main/java/org/s4s/gui/views/TemplateView.java
new file mode 100644
index 0000000000000000000000000000000000000000..eaddd76dd350e134b9de8ef4d1c7df0a175cb3ee
--- /dev/null
+++ b/src/main/java/org/s4s/gui/views/TemplateView.java
@@ -0,0 +1,92 @@
+package org.s4s.gui.views;
+
+import com.vaadin.navigator.View;
+import com.vaadin.navigator.ViewChangeListener;
+import com.vaadin.ui.*;
+import org.s4s.services.util.Views;
+
+import javax.swing.text.AbstractDocument;
+
+/**
+ * Created by Max-Desktop on 14.05.2017.
+ */
+public class TemplateView extends VerticalLayout implements View {
+
+
+ @Override
+ public void enter(ViewChangeListener.ViewChangeEvent viewChangeEvent) {
+
+ }
+
+ public void setUpFooterAndHeader(AbstractComponent content) {
+ //HEADER
+ final GridLayout headerLayout = new GridLayout(3,1);
+ Label lblTitle = new Label("S4S Das Shop in Shop System");
+ headerLayout.addComponent(lblTitle,1,0);
+ headerLayout.setComponentAlignment(lblTitle, Alignment.TOP_CENTER);
+ headerLayout.setSpacing(true);
+
+ final HorizontalLayout navigationPanelGrid = new HorizontalLayout();
+
+ Button btnOffer = new Button("Angebote");
+ btnOffer.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
+ });
+ Button btnCategory = new Button("Kategorien");
+ btnOffer.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.SHOP);
+ });
+ Button btnShopingCard = new Button("Warenkorb");
+ btnOffer.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.WARENKORB);
+ });
+ Button btnCheckout = new Button("Kasse");
+ btnOffer.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.CHECKOUT);
+ });
+ Button btnAccount = new Button("Mein Konto");
+ btnOffer.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.LOGIN);
+ });
+ Button btnContact = new Button("Kontakt");
+ btnOffer.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.CONTACT);
+ });
+
+ navigationPanelGrid.addComponent(btnOffer);
+ navigationPanelGrid.addComponent(btnCategory);
+ navigationPanelGrid.addComponent(btnShopingCard);
+ navigationPanelGrid.addComponent(btnCheckout);
+ navigationPanelGrid.addComponent(btnAccount);
+ navigationPanelGrid.addComponent(btnContact);
+ navigationPanelGrid.setSpacing(true);
+
+
+
+
+ //FOOTER
+ final VerticalLayout footerLayout = new VerticalLayout(new Label("FOOTER"));
+ Button btnImpressum = new Button("Impressum");
+ footerLayout.addComponent(btnImpressum);
+ btnImpressum.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.IMPRESSUM);
+ });
+
+
+ // Footer Section
+ final VerticalLayout mainLayout = new VerticalLayout(headerLayout,navigationPanelGrid, content, footerLayout);
+ mainLayout.setSizeFull();
+ mainLayout.setExpandRatio(content, 1);
+ mainLayout.setSpacing(true);
+ mainLayout.setComponentAlignment(footerLayout, Alignment.BOTTOM_CENTER);
+ addComponent(mainLayout);
+
+ this.setSpacing(true);
+ this.setHeightUndefined();
+ //this.setMargin(true);
+ //setComponentAlignment(headerLayout, Alignment.TOP_CENTER);
+ //setComponentAlignment(footerLayout, Alignment.TOP_CENTER);
+ }
+
+
+}
diff --git a/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java b/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java
index dba00eafb715ee82545a332a69ee23fde1728fdc..0cbf405316c0719ce7a059325e2cdbb5d84f3faa 100644
--- a/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java
+++ b/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class VerkaeuferbewertungView extends VerticalLayout implements View{
+public class VerkaeuferbewertungView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/WarenkorbView.java b/src/main/java/org/s4s/gui/views/WarenkorbView.java
index 048d56096c5d611ab1eca00b9927b002d80c57f1..1c3314a925392eba9316f3ab9f483b62d14cc9f2 100644
--- a/src/main/java/org/s4s/gui/views/WarenkorbView.java
+++ b/src/main/java/org/s4s/gui/views/WarenkorbView.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.VerticalLayout;
*
* @author Holger
*/
-public class WarenkorbView extends VerticalLayout implements View{
+public class WarenkorbView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
diff --git a/src/main/java/org/s4s/gui/views/WelcomeView.java b/src/main/java/org/s4s/gui/views/WelcomeView.java
index 5f0765e251e4f844a5154dff94e66617e95bb606..f307f0952dd09efa3b7cc94fa0f5f3807d8efff1 100644
--- a/src/main/java/org/s4s/gui/views/WelcomeView.java
+++ b/src/main/java/org/s4s/gui/views/WelcomeView.java
@@ -7,19 +7,14 @@ package org.s4s.gui.views;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.*;
import org.s4s.services.util.Views;
/**
*
* @author Holger
*/
-public class WelcomeView extends VerticalLayout implements View{
+public class WelcomeView extends TemplateView{
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
@@ -27,7 +22,18 @@ public class WelcomeView extends VerticalLayout implements View{
}
public void setUp(){
- setSizeFull();
+
+ //CONTENT goes here
+ final VerticalLayout contentLayout = new VerticalLayout();
+ for (int i = 0; i < 25; i++) {
+ contentLayout.addComponent(new Button("test" + i));
+ }
+ final Panel contentPanel = new Panel(contentLayout);
+ contentPanel.setSizeFull();
+
+ super.setUpFooterAndHeader(contentPanel);
+
+/* setSizeFull();
setMargin(true);
final HorizontalLayout horizontalLayout = new HorizontalLayout();
final HorizontalLayout buttonLayout = new HorizontalLayout();
@@ -68,7 +74,7 @@ public class WelcomeView extends VerticalLayout implements View{
addComponent(horizontalLayout);
- setComponentAlignment(horizontalLayout, Alignment.TOP_CENTER);
+ setComponentAlignment(horizontalLayout, Alignment.TOP_CENTER);*/
}
}
diff --git a/src/main/java/org/s4s/services/util/Views.java b/src/main/java/org/s4s/services/util/Views.java
index 263d4d67ff3aa0185ab8aee5a450a021f88b8df9..5d6d37c84b07d432983eb5a91939f41861c7862c 100644
--- a/src/main/java/org/s4s/services/util/Views.java
+++ b/src/main/java/org/s4s/services/util/Views.java
@@ -22,7 +22,8 @@ public final class Views {
public final static String FAQ = "faq";
public final static String KAUFBESTAETIGUNG = "kaufbestaetigung";
public final static String VERKAEUFERBEWERTUNG = "verkaeuferbewertung";
-
+ public final static String CONTACT = "kontakt";
+
private Views(){
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
index 2c5fb8b9442511b2daa068941fdb4c765e2ec4a3..8259e78e4a56deeb7b22ec411f9bf79eb138791e 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
+++ b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
@@ -35,4 +35,9 @@
@include valo;
// Insert your own theme rules here
+ .customShell{
+ margin-left: 18%;
+ margin-right: 18%;
+ }
+
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/styles.css b/src/main/webapp/VAADIN/themes/mytheme/styles.css
index 011b106e884f396f762ea9dd742b59bc89e03feb..aa25f595472df63b5f3f5105f87032347af5dce7 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/styles.css
+++ b/src/main/webapp/VAADIN/themes/mytheme/styles.css
@@ -12983,4 +12983,9 @@ div.v-layout.v-horizontal.v-widget {
display: inline-block;
width: 19px;
overflow: hidden;
+}
+
+.mytheme .customShell {
+ margin-left: 18%;
+ margin-right: 18%;
}
\ No newline at end of file
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index d1651e0b480dc90e09299e2ddeb11e499ae2096c..d537c731b521ddd83804ba505850093288fa2240 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -15,6 +15,7 @@ org\s4s\dao\KundenDAO.class
org\s4s\gui\views\LoginView.class
org\s4s\gui\views\WarenkorbView.class
org\s4s\dao\impl\AbstractDatabaseClass.class
+org\s4s\gui\views\TemplateView.class
org\s4s\modell\objects\dto\User.class
org\s4s\services\db\JDBCConnection.class
org\s4s\gui\views\CheckoutView.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 3a0a7e3febf5aca7b37b79ce86dbdc828408ecb7..b27ebb00b89c627e34ac94c5af7b01369cb158c8 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -11,6 +11,7 @@ C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\modell\objects\dto\User.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\DAOException.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\View\InitView.java
+C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\TemplateView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\ArtikeldetailsView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\KaufbestaetigungView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\services\db\JDBCConnection.java