Skip to content
Snippets Groups Projects
Commit 377e3a7c authored by hkarwa2s's avatar hkarwa2s
Browse files

Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

parents 4ee45ac3 9f75449c
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 436 additions and 202 deletions
.idea/uiDesigner.xml 0 → 100644
+ 124
− 0
View file @ 377e3a7c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
+ 273
− 196
View file @ 377e3a7c
This diff is collapsed.
Dokumentation/Anforderungen_Shopping@HBRS_v2.0.pdf deleted 100644 → 0
+ 0
− 0
View file @ 4ee45ac3
File deleted
Dokumentation/KickOff/Gruppe_S4S.xlsx deleted 100644 → 0
+ 0
− 0
View file @ 4ee45ac3
File deleted
Dokumentation/KickOff/S4S.pptx deleted 100644 → 0
+ 0
− 0
View file @ 4ee45ac3
File deleted
Dokumentation/KickOff/UseCase.xml deleted 100644 → 0
+ 0
− 1
View file @ 4ee45ac3
<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" version="6.4.6" editor="www.draw.io" type="device"><diagram name="Page-1">3Zvfc7o4EMD/Gh/bASK/Hqtt727mbqYzzs3dPUaImCkSJ8bafv/6WyQRScCiUrD1RViWBHY/bHYXHaHp6v03jtfLv1hM0pFjxe8j9DhyHDsch/CVSz4KiYesQpBwGkulUjCjv4gUKrUtjcmmoigYSwVdV4URyzISiYoMc852VbUFS6uzrnFCDMEswqkp/YfGYllIA8cr5b8TmizVzLYnb3iOo9eEs20m5xs5aLH/FIdXWI0lb3SzxDHbHYnQ0whNOWOi2Fq9T0ma21aZrTjvueHo4bo5yUSbE5zihDecbuWtP2QJmcP0jkX4RoA2yeSlig9lHpCCJ2BnsltSQWZrHOVHdgADyJZilcKeDZtydMIFeW+8Qvtw38ATYSsi+AeoyBMcT5pKomQrlHalY2xlzuWRUwIpw5KF5DB0aQ/YkCapNw8yzDMT2zi/csdLYZ5JTN9gMxH7ey1Ec65LYJaKnmZNYGCdb25X6UMkGAed3GIUcPwTz0n6wjZUUJaBCjhGsBUopPmByQG2KUvz8x5L3MoxHlKa5OcK1r1zUNU3Tmj6BtW4xu/ANW4TuSS3Lo2W4sbAPez3Aa5/yjrPNBWED2udsWYd5PRoncC0TsQieJBuN+yhmkfry+wTmvbZwgpmlWsDJzihhA9spLGNqmuD26ORbNuw0hMFA6UsSeDxgiN/b/Kvnxvt2wV7rwtbn8pTXvF2cWtPa58cmklKaZs5+YWXQ8cyI9b3aZ2xYZ0/siiFJK7LFI5k8UNedsAeW4O10QQksqwBdmESvFmSWJr0yLrknYp/j7b/g23r3t0PAHeaH7LUTnmsmJ/ERhGjeQSukW15pLTkQyQwT4g4hqfRc3fWvUq0pO/u7BrnKf9ykmJB36pXVec9OeELo/slV3Eyrg8waoTiZuRJx0WNPo5THce2tIEKC5wYSCmyxWJDKjp73g6GaoegmaqeAihjGWkDCdI+8uAL4RQujvBjdDrlCJkYBfUUHTHi1jzfbjfY2Jq7D/HlXG5sX+NGD0AN3FzChHctEyfcehUvnTHhDsmE3jTQk5DWSITaQDpbDUiA4/DHkdo6V9hcC41Z1V0Kzb3lBVVwxodFx4ggN4GTPyROemDQGxhtcdIHQvbXRRizyP3Wq44qtyrZizPoumNXnTl2Lw0yWrQat8xXLqHCLO1/HBW3BcW4IygODaDuoVD509BQ3FuWo4ERBE2rUne8hIPyMv7EzZdmKkgHr0NezJr6FC/zlEWvRUn8TFPFzDE+4MSZPJVxsWQJy3D6VEonWHa1UrIQjc0uRSFg46MKiWEb+FzLr8Jnu/7Xw/dJ/W13AtmdXiFdWlnrtBoDnZ0ON1Tw1aaD72nEFuNdzG+LgpyTDf2F5/tdq4rrJzCe07VdsEyoNlHJlXyrLWcflfH5dBOueCy7Y6lti82pq2W7663BLYuqA3TfSJpA252M3McjF0VgHMJrnLSicbyPLC2c1Gj8Jj+d4xTr3vfdoEL7nXvdQ99p86rmTeIEczPc99hO9rQiqs83YzWvDmdsAYsWyEZTNAqnc8J3hG62WXJTRrJ7tZJZZbzgjzVOb8okyOrRJOi8HLv3nKn5/cOhcXRtraZCyTnvH7rJfzwtbbm0GxhYp8fpKPvxGn7y1HRZur7vnlZ3r1OvXMzVyRgyX6MbD8Y3TMaQNeoU7NZxxvm2caam/A+7LcDU6t1/BHL1wklfU9qGIN/6ZKAvikHOmTFIta+a9N3gpP71YcX8VcSPCCvOQGHlxls+LdMX+/LQEQ4VOjz9Z1cXh45wmNChOpFtQ4cq6NqGjnP1w6DbSPMzu0mon24S7Jb/diisX/6lBD39Dw==</diagram></mxfile>
\ No newline at end of file
Dokumentation/Projekttagebuch.xlsx deleted 100644 → 0
+ 0
− 0
View file @ 4ee45ac3
File deleted
Dokumentation/Technical_Notes_Admin_v2.2.pdf deleted 100644 → 0
+ 0
− 0
View file @ 4ee45ac3
File deleted
Dokumentation/testdok.txt deleted 100644 → 0
+ 0
− 1
View file @ 4ee45ac3
test test
\ No newline at end of file
src/main/java/org/s4s/View/LogInUI.java 0 → 100644
+ 38
− 0
View file @ 377e3a7c
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 {
}
}
src/main/java/org/s4s/MyUI.java → src/main/java/org/s4s/View/MyUI.java
+ 1
− 4
View file @ 377e3a7c
package org.s4s;
package org.s4s.View;
import javax.servlet.annotation.WebServlet;
......@@ -7,11 +7,8 @@ import com.vaadin.annotations.Title;
import com.vaadin.annotations.VaadinServletConfiguration;
import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
/**
* This UI is the application entry point. A UI may either represent a browser window
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment