changed settings

d1900e7b · Maximilian Komp · 93233b99 · d1900e7b · d1900e7b · d1900e7b
Commit d1900e7b authored 7 years ago by Maximilian Komp
--- a/.idea/.name
+++ b/.idea/.name
+shopInShop
\ No newline at end of file
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -22,11 +22,11 @@
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
        <outputRelativeToContentRoot value="true" />
        <processorPath useClasspath="true" />
-        <module name="S4S" />
+        <module name="shopInShop" />
      </profile>
    </annotationProcessing>
    <bytecodeTargetLevel>
-      <module name="S4S" target="1.5" />
+      <module name="shopInShop" target="1.8" />
    </bytecodeTargetLevel>
  </component>
 </project>
\ No newline at end of file
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_external_atmosphere_atmosphere_runtime_2_2_9_vaadin2.xml
+++ b/.idea/libraries/Maven__com_vaadin_external_atmosphere_atmosphere_runtime_2_2_9_vaadin2.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.9.vaadin2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/atmosphere/atmosphere-runtime/2.2.9.vaadin2/atmosphere-runtime-2.2.9.vaadin2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/atmosphere/atmosphere-runtime/2.2.9.vaadin2/atmosphere-runtime-2.2.9.vaadin2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/atmosphere/atmosphere-runtime/2.2.9.vaadin2/atmosphere-runtime-2.2.9.vaadin2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_external_flute_flute_1_3_0_gg2.xml
+++ b/.idea/libraries/Maven__com_vaadin_external_flute_flute_1_3_0_gg2.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/flute/flute/1.3.0.gg2/flute-1.3.0.gg2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/flute/flute/1.3.0.gg2/flute-1.3.0.gg2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/flute/flute/1.3.0.gg2/flute-1.3.0.gg2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_external_slf4j_vaadin_slf4j_jdk14_1_6_1.xml
+++ b/.idea/libraries/Maven__com_vaadin_external_slf4j_vaadin_slf4j_jdk14_1_6_1.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/slf4j/vaadin-slf4j-jdk14/1.6.1/vaadin-slf4j-jdk14-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/slf4j/vaadin-slf4j-jdk14/1.6.1/vaadin-slf4j-jdk14-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/slf4j/vaadin-slf4j-jdk14/1.6.1/vaadin-slf4j-jdk14-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_vaadin_client_compiled_7_7_8.xml
+++ b/.idea/libraries/Maven__com_vaadin_vaadin_client_compiled_7_7_8.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin:vaadin-client-compiled:7.7.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-client-compiled/7.7.8/vaadin-client-compiled-7.7.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-client-compiled/7.7.8/vaadin-client-compiled-7.7.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-client-compiled/7.7.8/vaadin-client-compiled-7.7.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_vaadin_push_7_7_8.xml
+++ b/.idea/libraries/Maven__com_vaadin_vaadin_push_7_7_8.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin:vaadin-push:7.7.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-push/7.7.8/vaadin-push-7.7.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-push/7.7.8/vaadin-push-7.7.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-push/7.7.8/vaadin-push-7.7.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_vaadin_sass_compiler_0_9_13.xml
+++ b/.idea/libraries/Maven__com_vaadin_vaadin_sass_compiler_0_9_13.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin:vaadin-sass-compiler:0.9.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-sass-compiler/0.9.13/vaadin-sass-compiler-0.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-sass-compiler/0.9.13/vaadin-sass-compiler-0.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-sass-compiler/0.9.13/vaadin-sass-compiler-0.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_vaadin_server_7_7_8.xml
+++ b/.idea/libraries/Maven__com_vaadin_vaadin_server_7_7_8.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin:vaadin-server:7.7.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_vaadin_shared_7_7_8.xml
+++ b/.idea/libraries/Maven__com_vaadin_vaadin_shared_7_7_8.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin:vaadin-shared:7.7.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-shared/7.7.8/vaadin-shared-7.7.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-shared/7.7.8/vaadin-shared-7.7.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-shared/7.7.8/vaadin-shared-7.7.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__com_vaadin_vaadin_themes_7_7_8.xml
+++ b/.idea/libraries/Maven__com_vaadin_vaadin_themes_7_7_8.xml
+<component name="libraryTable">
+  <library name="Maven: com.vaadin:vaadin-themes:7.7.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-themes/7.7.8/vaadin-themes-7.7.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-themes/7.7.8/vaadin-themes-7.7.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-themes/7.7.8/vaadin-themes-7.7.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml
+++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
+++ b/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
+<component name="libraryTable">
+  <library name="Maven: org.jsoup:jsoup:1.8.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
+++ b/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
+<component name="libraryTable">
+  <library name="Maven: org.w3c.css:sac:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/w3c/css/sac/1.3/sac-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/w3c/css/sac/1.3/sac-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/w3c/css/sac/1.3/sac-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="gwt" url="file://$PROJECT_DIR$" />
+  </component>
  <component name="MavenProjectsManager">
    <option name="originalFiles">
      <list>
@@ -18,6 +62,6 @@
    <ConfirmationsSetting value="0" id="Remove" />
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
+    <output url="file://$PROJECT_DIR$/classes" />
  </component>
 </project>
\ No newline at end of file
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
-      <module fileurl="file://$PROJECT_DIR$/S4S.iml" filepath="$PROJECT_DIR$/S4S.iml" />
+      <module fileurl="file://$PROJECT_DIR$/shopInShop.iml" filepath="$PROJECT_DIR$/shopInShop.iml" />
    </modules>
  </component>
 </project>
\ No newline at end of file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/S4S.iml
+++ b/S4S.iml
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/shopInShop.iml
+++ b/shopInShop.iml
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="gwt" name="GWT">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-resources/gwt" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
+      <excludeFolder url="file://$MODULE_DIR$/target/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <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" />
+    <orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-shared:7.7.8" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-push:7.7.8" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.9.vaadin2" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-client-compiled:7.7.8" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-themes:7.7.8" level="project" />
+  </component>
+</module>
\ No newline at end of file