From 5d1d8aeb96a31ed266546e9b992d273d59bd7444 Mon Sep 17 00:00:00 2001
From: Maximilian Komp <m.komp@sprinteins.com>
Date: Tue, 9 May 2017 19:53:58 +0200
Subject: [PATCH] changed myui delt login ui
---
.idea/workspace.xml | 481 +++++++++++++-----
.../org/s4s/View/{MyUI.java => InitView.java} | 19 +-
src/main/java/org/s4s/View/LogInUI.java | 38 --
target/classes/org/s4s/MyUI$MyUIServlet.class | Bin 613 -> 0 bytes
target/classes/org/s4s/MyUI.class | Bin 1868 -> 0 bytes
.../compile/default-compile/createdFiles.lst | 13 +-
6 files changed, 365 insertions(+), 186 deletions(-)
rename src/main/java/org/s4s/View/{MyUI.java => InitView.java} (78%)
delete mode 100644 src/main/java/org/s4s/View/LogInUI.java
delete mode 100644 target/classes/org/s4s/MyUI$MyUIServlet.class
delete mode 100644 target/classes/org/s4s/MyUI.class
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8d47d40..e839351 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,12 @@
<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$/.idea/uiDesigner.xml" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/Controller/LogInUI.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/MyUI.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/View/MyUI.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/org/s4s/MyUI$MyUIServlet.class" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/org/s4s/MyUI.class" afterPath="" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/View/MyUI.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <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" />
</list>
<ignored path="shopInShop.iws" />
<ignored path=".idea/workspace.xml" />
@@ -27,34 +29,44 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="2089">
- <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="594">
+ <caret line="48" column="47" lean-forward="false" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </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="22">
+ <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="LogInUI.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/LogInUI.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="25">
- <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+ <state relative-caret-position="264">
+ <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="MyUI.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/MyUI.java">
+ <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="457">
- <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <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>
</provider>
</entry>
@@ -75,6 +87,7 @@
<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" />
</list>
</option>
</component>
@@ -88,10 +101,10 @@
<treeState />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-16" />
- <option name="y" value="-16" />
- <option name="width" value="3232" />
- <option name="height" value="1756" />
+ <option name="x" value="-8" />
+ <option name="y" value="-8" />
+ <option name="width" value="1936" />
+ <option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -109,6 +122,8 @@
</navigator>
<panes>
<pane id="PackagesPane" />
+ <pane id="Scratches" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -121,6 +136,38 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shopInShop" />
@@ -138,6 +185,10 @@
<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>
<PATH>
<PATH_ELEMENT>
@@ -194,11 +245,103 @@
<option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="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_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="dto" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="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_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="views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="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_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="dao" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -206,8 +349,7 @@
<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="com.vaadin.designer.intellij.Projectsettings" />
- <property name="settings.editor.splitter.proportion" value="0.2" />
+ <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -331,6 +473,65 @@
<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>
@@ -642,71 +843,50 @@
<updated>1492093190319</updated>
<workItem from="1492093193584" duration="1280000" />
<workItem from="1492103546172" duration="630000" />
+ <workItem from="1494350488432" duration="1255000" />
+ <workItem from="1494351812983" duration="186000" />
+ <workItem from="1494352027924" duration="371000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="2493000" />
+ <option name="totallyTimeSpent" value="4305000" />
</component>
<component name="ToolWindowManager">
- <frame x="-16" y="-16" width="3232" height="1756" extended-state="6" />
- <editor active="true" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<layout>
- <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="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="2" 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="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="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" 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.2040625" 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.40583554" sideWeight="0.5" order="2" 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="4" 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="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="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="3" 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.2484375" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <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="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="4" 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="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="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="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="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" />
<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.33" sideWeight="0.5" 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="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="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="3" 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="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.39986283" 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="Messages" 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="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="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="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="5" 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.5" 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.2578125" 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="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="1" 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="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" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -757,50 +937,90 @@
<option name="serverIp" value="localhost" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="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" />
+ <state relative-caret-position="594">
+ <caret line="48" column="47" lean-forward="false" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </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="22">
+ <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
<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/gui/views/ArtikeldetailsView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1248">
- <caret line="26" column="25" lean-forward="true" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
+ <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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.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="1296">
- <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
+ <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" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.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="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="594">
+ <caret line="48" column="47" lean-forward="true" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </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="22">
+ <caret line="5" column="26" lean-forward="true" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java">
+ <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="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="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
+ <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="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="30" column="13" lean-forward="false" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+ <folding />
+ </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" />
+ <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" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -812,6 +1032,10 @@
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -819,14 +1043,22 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java">
+ <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 />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/README.md">
<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="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7968">
@@ -844,14 +1076,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java">
- <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 />
- </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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -881,14 +1106,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1296">
- <caret line="27" column="18" lean-forward="false" selection-start-line="27" selection-start-column="8" selection-end-line="27" selection-end-column="18" />
- <folding />
- </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">
<provider selected="true" editor-type-id="text-editor">
@@ -898,14 +1116,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java">
- <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 />
- </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">
@@ -928,21 +1139,8 @@
</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">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="465">
- <caret line="1317" column="16" lean-forward="false" selection-start-line="1317" selection-start-column="16" selection-end-line="1317" selection-end-column="16" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="706">
- <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 />
- </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">
@@ -961,7 +1159,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/MyUI.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="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" />
@@ -995,29 +1193,54 @@
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2089">
- <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="1826">
+ <caret line="83" column="29" lean-forward="false" selection-start-line="83" selection-start-column="29" selection-end-line="83" selection-end-column="29" />
<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/AppWidgetset.gwt.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="25">
- <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" 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/MyUI.java">
+ <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="457">
- <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="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>
+ </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="594">
+ <caret line="48" column="47" lean-forward="false" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</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="22">
+ <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <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="264">
+ <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/org/s4s/View/MyUI.java b/src/main/java/org/s4s/View/InitView.java
similarity index 78%
rename from src/main/java/org/s4s/View/MyUI.java
rename to src/main/java/org/s4s/View/InitView.java
index 520209a..a50340f 100644
--- a/src/main/java/org/s4s/View/MyUI.java
+++ b/src/main/java/org/s4s/View/InitView.java
@@ -5,23 +5,10 @@ import javax.servlet.annotation.WebServlet;
import com.vaadin.annotations.Theme;
import com.vaadin.annotations.Title;
import com.vaadin.annotations.VaadinServletConfiguration;
-import com.vaadin.data.util.BeanContainer;
import com.vaadin.navigator.Navigator;
-import com.vaadin.server.FontAwesome;
import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
-import com.vaadin.ui.VerticalLayout;
-import java.util.List;
import org.s4s.gui.views.ArtikeldetailsView;
import org.s4s.gui.views.BenutzerkontoView;
import org.s4s.gui.views.CheckoutView;
@@ -34,8 +21,6 @@ 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 org.s4s.modell.objects.dto.Product;
-import org.s4s.dao.impl.ProductSearch;
import org.s4s.services.util.Views;
/**
@@ -47,7 +32,7 @@ import org.s4s.services.util.Views;
*/
@Theme("mytheme")
@Title("Shop in Shop")
-public class MyUI extends UI {
+public class InitView extends UI {
@Override
protected void init(VaadinRequest vaadinRequest) {
@@ -69,7 +54,7 @@ public class MyUI extends UI {
@WebServlet(urlPatterns = "/*", name = "MyUIServlet", asyncSupported = true)
- @VaadinServletConfiguration(ui = MyUI.class, productionMode = false)
+ @VaadinServletConfiguration(ui = InitView.class, productionMode = false)
public static class MyUIServlet extends VaadinServlet {
}
}
\ No newline at end of file
diff --git a/src/main/java/org/s4s/View/LogInUI.java b/src/main/java/org/s4s/View/LogInUI.java
deleted file mode 100644
index b5dc883..0000000
--- a/src/main/java/org/s4s/View/LogInUI.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.s4s.View;
-import javax.servlet.annotation.WebServlet;
-
-import com.vaadin.annotations.VaadinServletConfiguration;
-import com.vaadin.server.FontAwesome;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.server.VaadinServlet;
-import com.vaadin.ui.*;
-/**
- * Created by Max on 18.04.2017.
- */
-public class LogInUI extends UI{
-
-
- @Override
- protected void init(VaadinRequest vaadinRequest) {
- FormLayout form = new FormLayout();
- TextField tf1 = new TextField("Name");
- tf1.setIcon(FontAwesome.USER);
- form.addComponent(tf1);
-
- TextField tf2 = new TextField("Passwort-Test");
- tf2.setIcon(FontAwesome.ROAD);
- form.addComponent(tf2);
-
-
- setContent(form);
- }
-
- @WebServlet(urlPatterns = "/*", name = "MyUIServlet", asyncSupported = true)
- @VaadinServletConfiguration(ui = LogInUI.class, productionMode = false)
- public static class MyUIServlet extends VaadinServlet {
- }
-
-
-
-
-}
diff --git a/target/classes/org/s4s/MyUI$MyUIServlet.class b/target/classes/org/s4s/MyUI$MyUIServlet.class
deleted file mode 100644
index 4fabc72c0a6cea28aa4c3c0ecb4b0523252f2231..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 613
zcmZ`$O-~y!5PjZ!EZL-i(n3kvLMzb<IN(FMQ6Zs7NRbwV8b~ELIUAR{+O;Fw8<n5M
z38{zvfc~he;}D^6=&m%Lc{6@*X8h;xuipR;@Ge0GuVcK8vB^;XthDk+43(YTAw#ui
z#*$$<Ra%~v#Yox<G0F*9O-&~9p|C2%bFk{aE6310y}j%Yq@Cu{Gqn0zOWVtZbCQzX
z)Yu#D4jd0v+Y6<K49UQhHj^hRNHjuj|A&|ghR&B#dsWDxa*FhhwKiUOWi&B<NJGs}
z?j97mcuexIay0LQ$eX3j&xQBWhFcNeqw%yTNU1H{t<DDJWMZtB;|lGCF?>ohQ}C$}
zW2F~J9Uso1IdRYEZ|bJBvu;QwDiskv8IsWU#F}xLg^o{Yqd@^JR8fnu#jx?el`w2A
z^biJ=_NhGWckwdbBckUFAETcH$kr+1vlyuD-Gki`5FsX8Cm85siEL};*U%sjMDmPm
tgf^Dx{7BvkVb8C@99HqdA;HTltYMupuQF_)bA>LNRGSb_gg10H{s9Tbm9_u?
diff --git a/target/classes/org/s4s/MyUI.class b/target/classes/org/s4s/MyUI.class
deleted file mode 100644
index b7c2a3afa945bd0a41c50b09c320e030d3531a00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1868
zcmah~>vG#f6#kUk%C2%jO`%O`>ZT#JL#UvXmexty#3hi{2_;TlTCQt*qiiipiL|n(
zycK@}12a4T&%!e>oRw_i)E*em?6-T)cW$e*$AA9)+aCaK!_8s=MTXTZMzF@PZsGyM
zLw(vXvB^*}@rdCw6I%?QoA`oZ+r(prCnm}aJ0^A+zBKWa;VTn+3>6dm49`qd8J=tB
zU+d+CcKDLv8-{NgzB6!c=k>GgiU`}DPzJ1R-xp!Y<546c0~4##mulU>XueQ2Fjfj0
z!oYM{`eHY3)kL_@YaU7La!}`9m4{NFyTUPbD9OiEIS5@Rx*a(>Qjxr9p9U85<$BO^
z+MG9}??jY=2%Tzj+7rjIh*VL>oJ<K_k%4RfYef-!-j)V({ZuV-xe7vOx3{BQvXvkX
z>tajlDl$63o3D7A8@RL=`%1P%RYsCZ+VK5AaU}zvDw^;2%TG1V{-J0I@;ct;UQ7;I
z>$TFN|1y!v(<WBsFgVIdKc~^c5^j)D-~9|pU$ee9aJhHA`U+)TL{6-v=TxQWP_APU
z`7<!rBe}73+FIr4K$>LX2mDC6c7#XqDAy~4+~=uI)2TWyaHZcD_|#`vYf@IG!$aXW
zgRo}c>JX1TZOS%}sN*_8NPRIsNPgN?rrgPz@MHCp2%CYg0t43v4L183snrw@m23*H
zArzM$-OS>k*~S@4H?#Vos5gUncxI)pGUaAu>nIda6t{-fyxr5L?9l^$OpP{}#uh(L
z88b~DAJph2aG|6d`>uhdLHd(7NU804dQMF);sX)ZL`Q@wF)s|7R|k38g9VP7g*qA*
z1P-V}d#3u87?|m6PU<Nwy4cTHJTq6;&OG*nU+jNHB&kT>^+YLX9R<GdRf#?>r#TZQ
zQ-JYCBdu#GU)C?w@wo3g6%~?Iu}_kWuEZqk3RQ|jYC`&Sv-!ds;gV5g5$E4=U|``a
zYsj0^Bcm%8`_y|EhGbKy;u`%HXsm;VEqycGpfyh?htMD#U;YKg&xyJ~>qH{Fg=N}X
zDFN?eg-&Dm05?gZjsK$4C}I0|jJ#MT52HIP_P9N90=8nCb|%5BeJ(-Eo=kAco=$Ma
zek(!SKA+&MeIdcO?ROHqXkSWj&c2-ByY>~rUon4ztG0Q9+-bJ!n5Hc5Ad9=O@hRqT
zkBYrd*%xsOtF&9gCf4y753q-ac!>?vNb(9L#CVicnM*6_R!KF{)qF^GX5rx@@-jmD
kk15Is{WE?-I7_=bq`w<cz<cTDKHeiumJZkHx)+i82lq$$MF0Q*
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 2c5883f..d1651e0 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
@@ -1,12 +1,22 @@
org\s4s\gui\views\PasswortView.class
org\s4s\modell\objects\dto\Product.class
+org\s4s\View\InitView.class
+org\s4s\dao\impl\ProductSearch.class
org\s4s\gui\views\VerkaeuferbewertungView.class
org\s4s\modell\objects\dto\Warenkorb.class
-org\s4s\MyUI.class
+org\s4s\gui\views\LoginView$1.class
org\s4s\gui\views\ImpressumView.class
+org\s4s\View\InitView$MyUIServlet.class
org\s4s\gui\views\FaqView.class
+org\s4s\dao\impl\LoginControl.class
+org\s4s\dao\ProductDAO.class
org\s4s\gui\views\KaufbestaetigungView.class
+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\modell\objects\dto\User.class
+org\s4s\services\db\JDBCConnection.class
org\s4s\gui\views\CheckoutView.class
org\s4s\gui\views\WelcomeView.class
org\s4s\gui\views\ShopView.class
@@ -15,4 +25,3 @@ org\s4s\gui\views\BenutzerkontoView.class
org\s4s\dao\NoSuchUserOrPassword.class
org\s4s\services\util\Views.class
org\s4s\gui\views\ArtikeldetailsView.class
-org\s4s\MyUI$MyUIServlet.class
--
GitLab