From 4e6161cfd72997ad803ca47dc12ea413e76e6acf Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 8 Oct 2015 22:17:51 +0200
Subject: [PATCH] Adding simplified GUI, part 2
---
Doc/Sda1/jdbc.xml | 125 ++++++++--
P/Sda1/InsertGui/V4/.gitignore | 6 +
P/Sda1/InsertGui/V4/README.md | 37 +++
P/Sda1/InsertGui/V4/Schema/schema.sql | 7 +
P/Sda1/InsertGui/V4/pom.xml | 215 ++++++++++++++++++
.../java/de/hdm_stuttgart/mi/LoginUI.java | 134 +++++++++++
.../hdm_stuttgart/mi/MyAppWidgetset.gwt.xml | 6 +
.../V4/src/main/resources/log4j2.xml | 24 ++
.../webapp/VAADIN/themes/mytheme/addons.scss | 7 +
.../webapp/VAADIN/themes/mytheme/favicon.ico | Bin 0 -> 31005 bytes
.../webapp/VAADIN/themes/mytheme/mytheme.scss | 36 +++
.../webapp/VAADIN/themes/mytheme/styles.scss | 11 +
P/pom.xml | 3 +
13 files changed, 595 insertions(+), 16 deletions(-)
create mode 100644 P/Sda1/InsertGui/V4/.gitignore
create mode 100644 P/Sda1/InsertGui/V4/README.md
create mode 100644 P/Sda1/InsertGui/V4/Schema/schema.sql
create mode 100644 P/Sda1/InsertGui/V4/pom.xml
create mode 100644 P/Sda1/InsertGui/V4/src/main/java/de/hdm_stuttgart/mi/LoginUI.java
create mode 100644 P/Sda1/InsertGui/V4/src/main/resources/de/hdm_stuttgart/mi/MyAppWidgetset.gwt.xml
create mode 100644 P/Sda1/InsertGui/V4/src/main/resources/log4j2.xml
create mode 100644 P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/addons.scss
create mode 100644 P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/favicon.ico
create mode 100644 P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
create mode 100644 P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/styles.scss
diff --git a/Doc/Sda1/jdbc.xml b/Doc/Sda1/jdbc.xml
index 62268ab56..6acdfa08c 100644
--- a/Doc/Sda1/jdbc.xml
+++ b/Doc/Sda1/jdbc.xml
@@ -1120,7 +1120,7 @@ public class SimpleInsert {
</qandaset>
</section>
- <section xml:id="sectSimpleInsertGui">
+ <section xml:id="sda1SectSimpleInsertGui">
<title>A first GUI sketch</title>
<para>So far all data records being written to the database server by
@@ -1150,16 +1150,35 @@ public class SimpleInsert {
<para>Based on your existing JavaFX GUI experience the subsequent GUI
employs the <link xlink:href="https://vaadin.com/book/-/page">Vaadin
- application framework</link>.</para>
+ application framework</link>. Suggested reading:</para>
- <qandaset defaultlabel="qanda" xml:id="quandaentry_GuiDb">
+ <itemizedlist>
+ <listitem>
+ <para><link
+ xlink:href="https://vaadin.com/book/vaadin7/-/page/application.html">Writing
+ a Server-Side Web Application</link></para>
+ </listitem>
+
+ <listitem>
+ <para><link xlink:href="https://vaadin.com/maven">Creating a maven
+ based Vaadin project.</link></para>
+ </listitem>
+
+ <listitem>
+ <para><link
+ xlink:href="https://vaadin.com/book/-/page/application.notifications.html">Notifications</link></para>
+ </listitem>
+ </itemizedlist>
+
+ <qandaset defaultlabel="qanda" xml:id="sda1QandaSimpleInsertGui">
<title>GUI for inserting Person data to a database server</title>
<qandadiv>
<qandaentry>
<question>
- <para>Write a WEB GUI application as being outlined in <xref
- linkend="simpleInsertGui"/>. You may proceed as follows:</para>
+ <para>Write a WEB GUI based application as being outlined in
+ <xref linkend="simpleInsertGui"/>. You may proceed as
+ follows:</para>
<orderedlist>
<listitem>
@@ -1175,17 +1194,19 @@ public class SimpleInsert {
button. Return this string to the user as being shown in the
message window of <xref linkend="simpleInsertGui"/>.</para>
- <para>At this point you still do not need a database
- connection. The message shown to the user is just a fake, so
- the GUI <emphasis role="bold">appears</emphasis> to be
+ <para>You do not (yet) need a database connection. The
+ message shown to the user is just a mock up making the GUI
+ <emphasis role="bold">appear</emphasis> to be
working.</para>
</listitem>
<listitem>
<para>Establish a <classname>java.sql.Connection</classname>
- and create a <classname>java.sql.Statement</classname>
- instance when launching your application. Use the latter in
- your <classname>java.awt.event.ActionListener</classname> to
+ to your favourite database server (providing a suitable
+ table) and create a
+ <classname>java.sql.Statement</classname> instance when
+ launching your application. Use the latter in your
+ <classname>java.awt.event.ActionListener</classname> to
actually insert datasets into your database.</para>
</listitem>
@@ -1198,10 +1219,12 @@ public class SimpleInsert {
</question>
<answer>
- <para>The complete implementation resides in
- <classname>P/Sda1/InsertGui/V2</classname>. The included
- README.md contains hints with respect to starting this
- application.</para>
+ <annotation role="make">
+ <para role="eclipse">P/Sda1/InsertGui/V2</para>
+ </annotation>
+
+ <para>The included README.md contains hints with respect to
+ starting this application.</para>
<para>Notice the separation of problem related messages:</para>
@@ -1222,7 +1245,9 @@ public class SimpleInsert {
<callout arearefs="sda1JdbcMsgEnduserProgrammer-2-co"
xml:id="sda1JdbcMsgEnduserProgrammer-2">
- <para>Detailed message to the application developer.</para>
+ <para>Detailed message to the application developer being
+ directed to the log file <filename>A1.log</filename> as
+ being configured in <filename>log4j2.xml</filename>. </para>
</callout>
</calloutlist>
</answer>
@@ -1231,6 +1256,74 @@ public class SimpleInsert {
</qandaset>
</section>
+ <section xml:id="sda1SectSimpleInsertGuiErrorHandling">
+ <title>Input validation and error handling</title>
+
+ <qandaset defaultlabel="qanda"
+ xml:id="sda1QandaSimpleInsertGuiErrorHandling">
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>The solution of <xref linkend="sda1QandaSimpleInsertGui"/>
+ does have deficiencies:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>There is no input data validation. Even if both fields
+ remain blank hitting Insert will still trigger a database
+ <code>INSERT INTO Person VALUES('', '')</code>
+ attempt.</para>
+
+ <tip>
+ <para>Read about <link
+ xlink:href="https://vaadin.com/book/vaadin7/-/page/components.fields.html#components.fields.validation">input
+ field valuators</link>. Then use <methodname
+ xlink:href="https://vaadin.com/api/com/vaadin/ui/Component.html#setEnabled(boolean)">setEnabled(...)</methodname>
+ to activate and de-activate the <code>Insert</code> button
+ accordingly.</para>
+ </tip>
+ </listitem>
+
+ <listitem>
+ <para>Trying to insert a second record having identical
+ email address will fail due to a primary key violation. This
+ exception type should be explained to the end user in a
+ meaningful fashion.</para>
+
+ <tip>
+ <para>There are various ways to deal with this problem.
+ Analyzing the precise type of SQLException allows for
+ distinguishing primary key constraint violations from
+ other problem types like e.g. database (link layer)
+ communication failures. Examine the instance's precise
+ exception class. Then modify your <code>try {} catch
+ {}</code> code.</para>
+ </tip>
+ </listitem>
+ </orderedlist>
+ </question>
+
+ <answer>
+ <annotation role="make">
+ <para role="eclipse">P/Sda1/InsertGui/V4</para>
+ </annotation>
+
+ <para>Creating appropriate primary key violation messages will
+ only work for databases of type
+ <productname>Mysql</productname>. Other database type require
+ different classes.</para>
+
+ <para>A more general way to deal with this problem is trying to
+ <code>SELECT</code> a dataset having the email address in
+ question. If the result is non-empty the INSERT will not happen
+ thus avoiding the attempt in the first place rather than giving
+ rise to an exception.</para>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+ </section>
+
<section xml:id="jdbcExceptions">
<title>Handling possible exceptions</title>
diff --git a/P/Sda1/InsertGui/V4/.gitignore b/P/Sda1/InsertGui/V4/.gitignore
new file mode 100644
index 000000000..c761c2a94
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/.gitignore
@@ -0,0 +1,6 @@
+/target/
+/.settings/
+src/main/webapp/VAADIN/themes/mytheme/styles.scss.cache
+A1.log
+.classpath
+.project
diff --git a/P/Sda1/InsertGui/V4/README.md b/P/Sda1/InsertGui/V4/README.md
new file mode 100644
index 000000000..9c49b3ff9
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/README.md
@@ -0,0 +1,37 @@
+addressinsert
+==============
+
+Inserting address records into a relational database.
+
+Workflow
+========
+
+To compile the entire project, run "mvn install".
+To run the application, run "mvn jetty:run" and open http://localhost:8080/ .
+
+To develop the theme, simply update the relevant theme files and reload the application.
+Pre-compiling a theme eliminates automatic theme updates at runtime - see below for more information.
+
+Debugging client side code
+ - run "mvn vaadin:run-codeserver" on a separate console while the application is running
+ - activate Super Dev Mode in the debug window of the application
+
+To produce a deployable production mode WAR:
+- change productionMode to true in the servlet class configuration (nested in the UI class)
+- run "mvn clean vaadin:compile-theme package"
+ - See below for more information. Running "mvn clean" removes the pre-compiled theme.
+- test with "mvn jetty:run-war
+
+Using a precompiled theme
+-------------------------
+
+When developing the application, Vaadin can compile the theme on the fly when needed,
+or the theme can be precompiled to speed up page loads.
+
+To precompile the theme run "mvn vaadin:compile-theme". Note, though, that once
+the theme has been precompiled, any theme changes will not be visible until the
+next theme compilation or running the "mvn clean" target.
+
+When developing the theme, running the application in the "run" mode (rather than
+in "debug") in the IDE can speed up consecutive on-the-fly theme compilations
+significantly.
diff --git a/P/Sda1/InsertGui/V4/Schema/schema.sql b/P/Sda1/InsertGui/V4/Schema/schema.sql
new file mode 100644
index 000000000..327a0f5ea
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/Schema/schema.sql
@@ -0,0 +1,7 @@
+CREATE TABLE Person (
+ name CHAR(20) NOT NULL,
+ email CHAR(20) PRIMARY KEY
+
+);
+
+SELECT * FROM Person;
\ No newline at end of file
diff --git a/P/Sda1/InsertGui/V4/pom.xml b/P/Sda1/InsertGui/V4/pom.xml
new file mode 100644
index 000000000..4f730bcd8
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/pom.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>lecturenotes-pom</artifactId>
+ <version>1.0</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>de.hdm_stuttgart.mi</groupId>
+ <artifactId>addressinsert</artifactId>
+ <packaging>war</packaging>
+ <version>4.0</version>
+ <name>addressinsert</name>
+
+ <properties>
+ <vaadin.version>7.5.7</vaadin.version>
+ <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
+ <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
+ <project.source.version>1.8</project.source.version>
+ <project.target.version>1.8</project.target.version>
+ <project.encoding>UTF-8</project.encoding>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>vaadin-addons</id>
+ <url>http://maven.vaadin.com/vaadin-addons</url>
+ </repository>
+ <repository>
+ <id>vaadin-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-bom</artifactId>
+ <version>${vaadin.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-push</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
+ For widgetset compilation, vaadin-client-compiler is automatically added
+ on the compilation classpath by vaadin-maven-plugin so normally there is
+ no need for an explicit dependency. -->
+ <!-- <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId>
+ <scope>provided</scope> </dependency> -->
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-themes</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.35</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>${project.encoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <!-- Exclude some unnecessary files generated by the GWT compiler. -->
+ <packagingExcludes>WEB-INF/classes/VAADIN/gwt-unitCache/**,
+ WEB-INF/classes/VAADIN/widgetsets/WEB-INF/**</packagingExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-maven-plugin</artifactId>
+ <version>${vaadin.plugin.version}</version>
+ <configuration>
+ <extraJvmArgs>-Xmx512M -Xss1024k</extraJvmArgs>
+ <webappDirectory>${basedir}/target/classes/VAADIN/widgetsets</webappDirectory>
+ <draftCompile>false</draftCompile>
+ <compileReport>false</compileReport>
+ <style>OBF</style>
+ <strict>true</strict>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>update-theme</goal>
+ <goal>update-widgetset</goal>
+ <goal>compile</goal>
+ <!-- disabled by default to use on-the-fly theme compilation -->
+ <!-- <goal>compile-theme</goal> -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6.1</version>
+ <!-- Clean up also any pre-compiled themes -->
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/main/webapp/VAADIN/themes</directory>
+ <includes>
+ <include>**/styles.css</include>
+ <include>**/styles.scss.cache</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <!-- The Jetty plugin allows us to easily test the development build by
+ running jetty:run on the command line. -->
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.plugin.version}</version>
+ <configuration>
+ <scanIntervalSeconds>2</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
+ <!-- TODO Remove when http://dev.vaadin.com/ticket/14924 is resolved -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.vaadin</groupId>
+ <artifactId>
+ vaadin-maven-plugin
+ </artifactId>
+ <versionRange>[7.1.11,)</versionRange>
+ <goals>
+ <goal>resources</goal>
+ <goal>update-widgetset</goal>
+ <goal>compile</goal>
+ <goal>compile-theme</goal>
+ <goal>update-theme</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+
+</project>
diff --git a/P/Sda1/InsertGui/V4/src/main/java/de/hdm_stuttgart/mi/LoginUI.java b/P/Sda1/InsertGui/V4/src/main/java/de/hdm_stuttgart/mi/LoginUI.java
new file mode 100644
index 000000000..a81e57eab
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/src/main/java/de/hdm_stuttgart/mi/LoginUI.java
@@ -0,0 +1,134 @@
+package de.hdm_stuttgart.mi;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.servlet.annotation.WebServlet;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException;
+import com.vaadin.annotations.Theme;
+import com.vaadin.annotations.VaadinServletConfiguration;
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinServlet;
+import com.vaadin.server.ClientConnector.DetachListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI;
+
+@Theme("mytheme")
+@Widgetset("de.hdm_stuttgart.mi.MyAppWidgetset")
+public class LoginUI extends UI implements DetachListener {
+
+ private static final long serialVersionUID = 9013400739498375365L;
+
+ private static Logger log = LogManager.getLogger(LoginUI.class);
+
+ Statement stmt;
+
+ private final TextField
+ nameField = new TextField(),
+ emailField = new TextField();
+
+ private Button
+ insertButton = new Button("Insert");
+
+ public LoginUI () {
+ final String jdbcUrl = "jdbc:mysql://localhost:3306/hdm";
+ try {
+ final Connection conn = DriverManager.getConnection(
+ jdbcUrl, "hdmuser", "XYZ");
+ stmt = conn.createStatement();
+ } catch (SQLException ex) {
+ log.error("Unable to connect to database using '" + jdbcUrl + "':", ex);
+ stmt = null;
+ }
+ }
+
+ @Override
+ public void detach(DetachEvent event) {
+ if (null != stmt) {
+ try {
+ stmt.getConnection().close();
+ } catch (final SQLException ex) {
+ log.error("Unable to disconnect from database:", ex);
+ }
+ stmt = null;
+ }
+ }
+
+ void conditionallyActivateInsertButton() {
+ final boolean isValid =
+ 0 < nameField.getValue().trim().length() &&
+ 0 < emailField.getValue().trim().length() &&
+ emailField.isValid();
+
+ insertButton.setEnabled(isValid);
+ }
+
+ @Override
+ protected void init(final VaadinRequest vaadinRequest) {
+
+ final GridLayout layout = new GridLayout(2, 3);
+ layout.setMargin(true);
+ setContent(layout);
+
+
+ if (null == stmt) { // Database access failed? No hope ...
+ layout.addComponent(new Label("Unable to connect to database server, see log for details"), 0, 0);
+ return;
+ }
+ // Assembling GUI components
+ layout.addComponent(new Label("Name:"), 0, 0);
+ layout.addComponent(nameField, 1, 0);
+
+ layout.addComponent(new Label("Email:"), 0, 1);
+ layout.addComponent(emailField, 1, 1);
+
+ layout.addComponent(insertButton, 1, 2);
+
+ // Inserting requires valid user input.
+ insertButton.setEnabled(false);
+
+ // Caveat: Vaadin's validator will refuse e.g. "domainregistry@de"
+ // and may generally be non-RFC compliant.
+ emailField.addValidator(new EmailValidator("Not a valid email"));
+
+ // Check for global user input validity
+ nameField.addValueChangeListener(event -> conditionallyActivateInsertButton());
+ emailField.addValueChangeListener(event -> conditionallyActivateInsertButton());
+
+ insertButton.addClickListener(event -> {
+ final String sql = "INSERT INTO Person VALUES('" + nameField.getValue() + "', '"
+ + emailField.getValue() + "')";
+ try {
+ final int updateCount = stmt.executeUpdate(sql);
+ emailField.clear();
+ nameField.clear();
+ Notification.show("Successfully executed \n'" + sql + "'\ninserting "
+ + updateCount + " dataset");
+
+ } catch (final MySQLIntegrityConstraintViolationException ex) {// Duplicate email?
+ Notification.show("E-Mail already in database", Notification.Type.ERROR_MESSAGE);
+ } catch(final SQLException ex) {// Other SQL problems
+ Notification.show("Failed to insert record, see log for details", Notification.Type.ERROR_MESSAGE);
+ log.error("JDBC exception on data insert:", ex);
+ }
+ });
+ }
+
+ @WebServlet(urlPatterns = "/*", name = "LoginUIServlet", asyncSupported = true)
+ @VaadinServletConfiguration(ui = LoginUI.class, productionMode = false)
+ public static class LoginUIServlet extends VaadinServlet {
+ private static final long serialVersionUID = -8657597788907698974L;
+ }
+}
diff --git a/P/Sda1/InsertGui/V4/src/main/resources/de/hdm_stuttgart/mi/MyAppWidgetset.gwt.xml b/P/Sda1/InsertGui/V4/src/main/resources/de/hdm_stuttgart/mi/MyAppWidgetset.gwt.xml
new file mode 100644
index 000000000..763aa41e8
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/src/main/resources/de/hdm_stuttgart/mi/MyAppWidgetset.gwt.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN"
+ "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd">
+<module>
+ <inherits name="com.vaadin.DefaultWidgetSet"/>
+</module>
diff --git a/P/Sda1/InsertGui/V4/src/main/resources/log4j2.xml b/P/Sda1/InsertGui/V4/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..436cd31a9
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/src/main/resources/log4j2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+
+ <Appenders>
+
+ <File name="A1" fileName="A1.log" append="false">
+ <PatternLayout pattern="%t %-5p %c{2} - %m%n"/>
+ </File>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%C{2} (%F:%L) - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+
+ <!-- You my want to define class or package level per-logger rules -->
+ <Logger name="de.hdm_stuttgart.mi.sda1.xmlstatistics.App" level="info">
+ <AppenderRef ref="STDOUT"/>
+ </Logger>
+ <Root level="info">
+ <AppenderRef ref="STDOUT"/>
+ <AppenderRef ref="A1"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/addons.scss b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/addons.scss
new file mode 100644
index 000000000..a5670b70c
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/addons.scss
@@ -0,0 +1,7 @@
+/* This file is automatically managed and will be overwritten from time to time. */
+/* Do not manually edit this file. */
+
+/* Import and include this mixin into your project theme to include the addon themes */
+@mixin addons {
+}
+
diff --git a/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/favicon.ico b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..ffb34a65c73eb1b3d59dcbb8f18ec78a8b0fc767
GIT binary patch
literal 31005
zcmeHu2UL{1_U{a!(mMiDMY@6o1XQYkh@c=AiU^1bD4-}RAjLsZnt+0I1!+<g=|wuy
zRFEP?dJ$>Td!Kp9Hw<z-p7X!=tasmA>%BW`h2+b(v-dAMJ3Bkc2MUEok)UX4Q6T3=
z32s86j-XH|Ztk^bMilBAsN1t=?O6nc3Sb2UC<R6|_-nWig(?6I1VI_F037giAVZ-*
zyTAJt-UEWyenSZ;%86__UYKB+P`{CeP=^B|aQ9F|@OdPSL}Dxj^=3SsesC-qwE`1T
z26gZqq=B@s4J^YSq3u{I$-Vh^M7Wg#M%;873O7}H12<iI6Dh+w_zu!+Y(u~U>v6?I
zxbZY7k9leAEoyaTW*ECNH-?4f@ieBT@igKUNJHR3XgiXIl7PJNZJAcbQ-JJ}o7k0w
zNhD2`*<fMacsh6o_(NLQ1_2NL!2T}h6XV8HQA-n<LfFw*6n4HdAG_FBg<bsq3A@l;
zh}2DF?!-bGNDJG*_E5Kg=iqb}Xb<_Pps-UV7FZk(hn=bR#m!WCfg%pn-GCUdpl_=P
zEocMV4yB-YA*P9RG;Tao5TTj==z?AB{|smWeJTo+tFY6b-0<xI4MGdrz_vfz)8K%f
zuw#iJy+&b2UZAkEjnPON3B%VR?*Pq2It`*Lq&>u+&O8XmYxYan>hgFGc6q!TyFAu~
z#bQ@+Fu^iX2i`#%NDJE#><a2)rH}`=y0W;mvM>c`d$4fq=G!xo1j|Src!$scT7v$d
z4o4Ee_~lFDfQ*%iY?;-uHz<5xV1Eb+)J<ed1AN^pkQTOqZ3#9omWsNEE87il(F6No
zUjk`$Jc9#^Bv?l3=vN>Oq}|wd-F}l%i2cIxg<}Nu3==HFI>def4QxwjgOq<af57-6
z_6Y46lwp7WYW_eT@JHwiEE8;lFh;Nr{x;I!YySWK3;iTFNb(>-e~bKpkNu}VIIg%t
z6v;;a_A4*=4xw4|nZLgOC(nr71QhYcwu7%w%s(<wdxw)y@-V?NtlLO~18rd2jdlNS
z8TN(HW;AirF5q(>O{Al$fZa|_XX5Q1+CD79I^-RofwY8n8+j1w{-+$#<657gor8Iq
zIF*UQVGD_H3pqqMSRPNKz)oarUx5jhVI6!2X<!+)fo-8IL>C*@rN5KEaeM&}bI`BV
zm3$J|KP*UKtpPqcjbau0U&L<$zY5Dp9ez$j8tht|Rmg)NZzFF)-Nt<5`>{0QKpf}`
z^fPO65&u4sPL7wCwHLeCTL#vl57>$91Nb`dZjBzn3d@iO<VBFPQ3j!okV8GeG9tSO
z$WB8o0@<qwPq^lQG?B3b_8T|b^a@$a;2Jj9l8A-A8NNf-CP;_Jy$X5Y051Xtf((L8
zLQb#~s4t}7c-eS91lfS+L<R?LJQ;;u8f}N`C-PgK=*Gb{bRuILUSAvN;aDITpdQx7
zf*@;M_S!sw_OjmJwSE)&4)ck0dStDgD$qmLKkUjP4!b-LFko?0#h2DFFs)<8w?W1a
zuS39d-6l88O@dAUzQi@VS;ET&ZIQm<^NCDe9Mt_>(<`LkVExA}_EjL|xt6y$WDEe!
z#x~;!ZoCaa-cSbYH$f)BN5DCYpI3;T<Hs6~;Ran!WN<>=;|RK+tqs7<eD>Zr24H-C
zGX{_ce*Pfyl;9r-J{97Dz6H)*K=+5f6Lbjq!dPvpKo_rjsB=)B%vHmI-~qvai~+z0
zZG_N{pbJEwfHxuo$U=0m!Jk9l1^ow*58?!9>-aSumM79l0Y63<d*J5V)A9YC{08Gf
z1k>_ZCsH@xm4na#I|1~Ri0=L{j(|6m0c9cb*L)K6-9YZty8aQFYh#{H0{X*($XOby
zMdZLg3tjn$EIg*n_4=hBjR-BoI|16_@vn^|7=tw#QybR{xPGkpaQrwS{m0K?$YUaX
zP5x*LA_u#=1Y&q=eE(rQ|Nbft&IR~e9`F2ve0=}$zJp)`P!^O4bpU^G4f`3V<8@EK
zjUPv#OQ7qCEFs)<g&l6HP#=*2`wkP{E_86yAMOGg5j-u3W$|qZHoUF_B+iF25#fI)
zKVvJ<Jr6!*@~!Iu^aI)nn1?Y)B0NJJ6X~E$rohj3fCs^zkQ~?m?CVDPf6_nnSsAR*
z*C6v9&Ur!_PXguFP!|G-zTqEOhIPoh4YaTgf(i0kn}0C>RsX-*AL8f0Jen*v#?IA8
z;N}`ZKM4u=p1Fny+|uArTZCm;2mR7I9i#_sArI&?5T3uWKf-#nKL64=R>qRR9;L>Q
z&_B4&{PqVnalq~te*12%5@`#0L7wA)_pkGhuokTQAF#)SI$N3QgDn11Hhj6zQwUNK
zEdJdO3wc4FaR2%z|FgCZ;QjArXjfowLW}H^Ak(FhR_t6`8rUyo0pF8}PaRo6-;qG4
z&@Yi9<#|xI{vOc6Hn1(^0ry#uC*(bqxf!?7|H3&ySPRBdw}ABr;v`>MU6_PTag%w+
zuw(Iv{UK{SvIm3vFko9?T}2XNo3M_M;9e87naoo~<U?MNC*%!fY?O(V*VkVru>LZv
zPJp=%u&=JpjR4!;4dxOn7MW9-JV^Wj*Fj`nuJs=&BXv6f9iTzxA7}&GLLQJ8<Oz8X
zr7+=R!VT*$f?+Mz9ZRJJ@dxNv2HWBUh_MhK4`Z%1pN#h@1mB2XBYv&J&vztF1Nip>
z%xsI0C*-|R7A$Z4t&c+*RUobi;7x_`7d40-;Fv&}gaqXh%7px9-5M?EFExx)LHq?|
z1D;S8LB>Y8gfd|+!e>a2E208&fZxQ&y+~a1XSoFVgdCxVwuY?ZkOx6F<hxM@eE#*f
z@jZ;!0H5E)-{9P5L;sO7paZmUPyLVMZvqyGfuN_q-hY63ikAmv{%_lV5HP@;;G19>
z&ROWAfd2pE`!6Vu@cX~H|0H05IU!cuXdfHjBQ*bk{r9gj{`>r24g6OF|L<r3o)dyA
z7nBi5>*s{v?&UxAL)I1$d%*RjDj2m1_e(<R*3Rz!&e#2?@coW2VLgPH{~b*KwB7G8
z{L?zPhW?7VFBL`J_XZ_6o=U7ZnvBu`cRt22!7{9a?;y=anMhwYoQH0F_n#;uy510@
zjwGVkL7ZbWo{EkJ@kSHKr{P{6?j;v<(MW=2WPcCdf%lLm8n%IL2^fF3o)g~v@5q1E
z({M6Md@KbW3NZgz%0uH;3y6_(T6lLdiH|K|j1A*d7{6g*9efA(X^?ga^bNL!JRmOu
z#@~%A;oU#Y5#6kv$^1w}v4Z$B1jt^7IOekPXG3deqRXHjo^1lm#9(g)_SYF~ARZ)!
zXN|BQFfFgquE4gC2do4A2!XsIMnqQ|#`vG&MtH5A-NN!{DoT4S6+HlDP9taKASO;n
zLCkA0Jbte*p1v9EYnbr&hsYfyINwChkbly_HfwE{ATP)h@`f@9cnPsG;rZXq3-A5B
zXP8JK_Jno}6OfHRZ{Khh2e2UfSOh!725?X2$bh7P?+1bx?7i@~|FCZZb;$mJz#qyY
zVBLs;Q1`FogudSc<2aUvib3}GaBs4<|3UUo5c3}r)H~RZgLCY;=GVww^y=ai*ypF>
z`+)2>@q5mV?eP0dFm_NcfZv*|Xo7zuVEI>YLmFuB1X_q4p1T7bK|8_UJO2UmS|5O3
z!G0F6_q>zX)#W+3$H%ADCG2F8A<{2|X2Tf#+K;udSVm-~qoN5oHew>w{Vqr5&e~js
z<A~@2kNpq#6$H6(-@0DT;6m<hX6wW7xK~!NxRqt3Jo_~cc{dJd*6BC2{aJ_jC1jpM
z*<)+Av=P_ua1-hXdpkIf5L<^bexvt|xbd=~?Eu>VcE33EWlis^AcqMD&U{+_I1e^p
z|CJYFo2h8n2Q0)un9~Go1gyX21Utj~Nb~?<uKsH48|5Ko#CCwM1a?1Jpbd_Zr}6k#
zmVo|20{B-~7O<1=O|alB6WAHJr-yC+r#^uB05L$nwC-Cs_`^TpU$cAY-`D)|+MUBs
z8~HiT__~R7;O8NhOn!I{2ELz&#A8Qv-i%!uZdiYwYk7mvKw8*l9JU30*w_yOe|$au
zj0NvoQ6UiTU(Ex;*ub?A@Lpc??`wA!1gt-EDD$V>HNOLFXKA=;9q(*Y4ETN{bp3g0
ztR1;e#AB!W!#p7HBIN7+0Jgh^Wtp%}6R;BWzj1EB_563b|CKL%M(PmT0do@CPT_fA
zJ2Pu|SHU+lmPj2A_#eCt&11ox1Qwq8PGoFfx1rzhCg4YG7uXTR1kMWaV*t++)_e>y
zCTli@#9|;Of$KWpx%{i$<HvNP-obbv_>sF)EYvr_XRgc)0-FN<6x<;%Pxh|Y&$Yfq
z{1Afw7yJLU9|RkMSk~f{AB32XFjqI?2lPg3aTRiQ^-~9bVK)eN5GSOAx%-RlEPgLV
z^bGD{!1qx3>-d+U4I#Eq3&wzXt&G<R#82o0AxAJkdSFKgHh^&>=8d)k<62~#z#TC`
z_XIwK9Iq36f8hLs>(OWeu$_FZKdf0ZHGX*fz*c6e+}82qRu+LDGRBU^LmLA9UYo-N
zU2Wt~kO{HCm=9tb1sD<hYc@of&v0J>`q;E~*Z2q9A@Cva#y_w5dte{4HNN0`srGe@
z@H@82yc2kT55GZpCk?)f8(n|DJkf=ntqa;Pmm#m8y8m+-@k7f9Hn4vn?13P5f*s-a
zP3UPDql0lk&S5w5A@l*s5xd!re5(cS?bdNY-6Ct%a3eCG!M9mJ#~jEwEDly9@4)w9
z>-5u~9wIyl-xvHr#xMPWnAWgO13x4{upzjwhGn?FgMMml@3DT44Eyk>ejxb4oCUT$
z{prCv9>Uz6ZHmVG`3!LH01~(d0e&?2PjoY%pW^3oCNJI({32_kTwoik5F36UN2~}j
z6V3@>8SYWn*4y<tMZmt14?#yrtbm_a*tymu#D1U+&3ESkzaxa$2Dnc_@Wc5!0q%+B
zJ2HRLwPzrDf$zrC@oNErHzD6BAE5)Zb1<F&SRrP@83!!GeKy>$!hYg;{<KHPZzIp2
zWqdr3+~EN`hwawOU|z!Ufr%g+c?a=AT6pgVa~Ly$x}QApWx_KdU*oX~F+!~W4*re$
z|3ev(3%|_)K6DKi-lu^12%cvuA0i2P2l|7&Tk9umGXeDu+x?|}HuMY90p0!;emEv@
zY!H5HJpV9$h;738$OaO}h6JCvfXx6~fhlV@G6u6>p0C?GEF)`fmgrA9*yeY<;I}ku
z^WYCT9{->0=kMk((jMsx)Ez!%gzFTH75*+k-@f?0d>ub5!@9p~gS>;hfjmSO7%#%u
ztl{|m{9TJ3{>p#i*B5%cT?5{e`DelUV~WJWFdqJ6GQ&<5U%<}RJ_CEliFN$24C~;#
z$@hTfPwgNdz!UI>n2~vci~~MCMezTH|NO)H1=fZ?u3xY{7*C+@nMzmSJ36tei_=If
z599gYB^;<H_)%~}4a)fa3sUzNZPxh!-cSaVg^b5qACOo8#KgZ{zc$2je~KS~eL`JK
zA!`(VANUj7+TND1$K9B(LfqgJgn95i`uy6uyH@uvwZ|<ZGLdnBbM0^92gDDp*$@~f
zBY2hu#t_8)a7|}I@Gtg#!s`_7r67)f5zBmMHWqxlv|&8{hdx8TYx^}Q6K_W_K1BT4
zZ{xR(`2QF`Q^9jG#2+nB^x!f4i@2fPER8gS?;oW=>~jDq<8A40@Ds*wO$L;S%w_m3
zLps&p$IlyVh_HW|NTXf?>kDo?V-twqzpv{M?!#xQJV4y=@GsL;>2<vCfc|97r@*?u
zYXf;g-UR!CGNEjU0b+r%C&Y&6djnqh41a_@+4}x5ixz%o0KTIo2l&_Y59S~IUxm>)
zye}lIuYbzn+6w(3n16)td!Q}+iH@*71OEVdPL-Gg`@zqDC=<$t7^Wc>Fn|AQ|A_Cw
z&%H4`OI<AlZBoFu1{vU+o#}qOUe;oFs8jgA8TfS!u0tEwv$ZnfJ3v2>wG|(S{+VvA
zE&M+Zz!UBZ2>78)C>vscSSC`@!HAwWoUIXX6LLZ<jXyux0?tq9;dhlw^X(~MSXYsA
z9k|8<od8_mobY$+B!ZWK`{(+<9>@H)4d4ZM!gC4y+0iQat|$dB8(;w6=KM?NCrJO+
z?n03Bs~j?XJORdVs^ARx{tc|b(4N=gMZ9i*VkJC7tbdgVG#hhRMtCCQ%7KNl!2eI+
z&#wT6fA#zd!M|Z{Or)T|`5`%Cd%%9-xjy*b=4Z@>my5?wz(dgUulRp`|7%+~Um$NN
z1ImK-4rPOWAZO7V_qhan`Kz3;Cd2nYPBgBF9DXYW_LQ`LeSW)U7X;kD;@w#PC+zEO
z;r#)S0c1g$P&NVMMofgdzsm`80rnezehzgH>|*`={HNYG;@PNwLjCXR2=5S{kS~6X
zMZOWjf^V`w{XafGC-kfE-?_g)#{Z9f`b(X!(IS`uZeS~axW6ErIYS&9F%WS5J2_z-
zU>i7({-^t+je7lEc>`wXzu=w1f9(E<&`)T4g!4MQZ~dG5I}qmr8^iBGp`O<gQU}j9
zz`O)y`2P=oxW5Bq6}*1N41LJo_;~`Ze<w%g|Au>JxE8|o9N_o?&&A;S4&&QD+@Iq6
zf%N6C?oZ*FCShHLcwihr(AB?#?_Z^b_OwwqNX!S~Rv3GOw0?gL_o9URYgpcRe+|#j
zfbIMry}$mof4|ccJQoAH6!@#}2jDxx*%^V~uj5Ln|38r<vf+5Z1Z?(SmHAKG{j2={
z2_1rI?L3ljE=D+Cf;m#RW_$lmU;hb~|F-$B2L7vo|7zgB8u+gU{;PriYT*B64Y+Hb
zP@y8<2EU1=Qa!4qg%2aqDALWKM*n7<2?|B7a79s3Q&mxsTl401lPeaNQK+L-F9K{%
zpK96aT9YrCUrW!!%{Q~{E*bZiLr0lNPP(gNG>IO$@ZV9|bcB&k=<KD_MQ9aQo{P$i
z6c6qje<hou)hsVQsifT3@z|VfJaPYYXUJ-WZdc1d*4Gx(amTMYD9x4oB=2wOpfTbR
zI*en(#rpINm8J7UEVO899duETi3y3yf)Y`~O1?~RaNN=Iw7D@+%%$A6U4@$b)=jv3
zPkAI2c{iiTl^Z3bo%osih@PEFD`VY<Bl$GrFSPH`-hEpm$RgkH^p+-B%*FQa%>5V?
z$p1ZJn{G90o_N^fT+Pl9zMiPZBoX>SeBGu|4qGngpH>Y)_00>`*DpL*N9|z@Hmn-p
zkFapxr_9JY<~~J)B7IhRAnzu%=i&jgFqG{p)9)T6?yAPG=)MMB=^OlDvNV}?YSDP_
z&SxdZd)#c*Yi80Zz4tI<lCB3Rqxp0#gUz0fCbEx?>NfS8Ef%(PaXOt^mHBXY`OGB$
zNKKf+<1pPWi;*|G^S7erc=bX#(hB^~pwcZj%lGxX(HQ4OO>IJ@cRruyd}LwZTl$Ss
zfWmWR#KIaKZZ5iWP;xo^{`F6Vj}FWSSB@>8J@krM&UuF_lh|eDzE`oY)Rd~KD5(Q$
zF0Ibf;(Ch?T>1R5WY_cXBIe15gJ(_-J|lB+H_Lq}?X2@e^b)zty~dt<ED{1+Se;&&
zGn(BtL^(b@pqZ_@<->Iul;RFz-fMDqi5!Q|(e5SxP>^Sq_%zAdXWw1yz!DdQzQ?s5
zbp@VN{d1H)mu~V!?qZGVa<M2TqJOgG)=P46XVE=GyNsyVF=AH4o!lrF%u!n60AkUj
zL|5cVQWa#IfeG$yM&EgG)e6<%e7Bb5#C-{?&H5zTMO0Q4lo%Cx@<+vLd(fTES4i(q
z&@x3TBs|#~O%r^$iIz=|)J{=BQ;LzeOws)bt*`uIEq@$~@PmX1MNOHR9k;gSke+|A
z^m0orxA^8&w4)1M5K;XFs%BIsrX~3hJE_Y1%5EiFrsrFji`sgQWp9<G&U(+>!#081
z_0aIWAF2EYQsTNJI;3oqN{655@S^Fqn?L1=CW==Mc|sk{_Rj0*(;MH3H@ik$2x8e<
z&f4p$`?$yW?1d)dV|yBdE(V=dXYQ9Up%rspydPuSnDR<T;EmiJG6}j+FOkx-Mm|R8
zk^@tSn=gzUVyCVsV*SQ$<&@2$zwg@qw<K9KUmxdUhD)e=_$O`iggY6>@6!}pPZ&FF
zFCf3ievh-uhpW6$;0c)?iTQn+?E&1p7QClvw~-EzuDZ~@7eDD7r*Vtt5v^URzOhh>
zce6sCDm(uPKStF@yv$m>Lc!_Ir&X`=oadL}&)@F%@!%zun=HEW1{!a9!?_LlXnf@~
zp9%6aY8+!%KHPHRz_EAocJg+LF<Mk{*BW#Zf^uHyY2+(89&_BS;wKh39oYLZ(eL$B
zbN}H$dp?b4UjuCd4MoER47cAqhJCe?O?0wYzW9`LRPxz~BR%QwWge<3heY}tyBUWV
zyBk0Fw!iEoU!JeCZx+2qy!=q|7rvP7+YZ;q*nP=PKc0TD^>XVT4i(Ah<$AxNvKg+y
z{28*#e3#Gl3HGt~ZR<<>q_z3|9-{>@E!LRFevfk>`%H`XzpLr3X_H90Vt~sN@?R9b
zChXwP<8R`R_V-CpKXbj2vGGNMWr9Y-o~!&<FI;W8y4)!G+N&nE#wM)hg`qg^`-<z2
z<Q(_A*-KYvOMb}w@Y@!$tzaALwlmuT#mo1zhFlBz7}6IqAYPGfrbm%MqSvQ4kYTXL
zKX|O_v<Y9D=YfdCx1+Hlb+XYNuVoT1#--_)Mx98jW;pLFdQMUyOF!$B&0!6--8#Ds
zlTMCD$es*O4392UDLi-YQ&BB<tC6QdXmMPGM?~R;unSQ=7k4B)eO)IUr5AOmT<T)x
z4Ub9L-gErP?k`k*RlPnQKh@mOdD<waCcTEzyx)vp{Pq6aipb=4UEMcFnqD3#k^bNi
zWf!`*lS0N*$MeP3j;)5fMt7YO8Q#UEE2O(g$1?p#@={4_X^8pxi;fkKuJ&F`tA5qd
zpOF|Z(sieB)bUWr`Q(nRxhHaK=BVd*mid?WZjo`db<L-qZ@zU$FxSPgk#2afC%by`
zaqkuZdx4aC)!42Vy46C}RMk-wl*|*%4I(Tz>u&U9v)_CwdP(%Lp{-R!!<jb!UcKR^
zs^ee12JVzvmUcADw5(<?@1#+qd8*=B@hsMFU|S7^fm>jb_EYVoEZ=$K@vGypvIk||
zWxZq>3horVcHF&iVU=k0&Qizp*NK6puge-FQY3H42FasIj*y()B1^H4jDFK?l9FO{
zaqfMt-CqoO^&7Sl9bQqq^H7>>KjnF*C2JPZUE*)}N9?lC*gDzTkcb#7D=C)d9`*U~
z<%5c+*H*QyHb*|Hlqol=99Oni4pdeP)Y+w*_Wj6Xy~o_IWVUj#G1>FpxfwtIr9;iN
zcjOy+@0h5Ven8qt>&=Y5_{y5MPYjE7ZwPa;adC9f;@lbD$M>nfoiTi8(?{~vFV}V1
zcc6UdfY;>th07~XNdjF`UFwtqOV7JsRDG+;q}ofQp^(viJJoQ?`Fs4cC(ojU#NzAX
zKVNZ4Ur4V%%y+>fdFOdC8G-!WCE`(g6mvdZX&gJl5Gh~xR9(<o*CaQ{8>>Eh^f7NJ
z-veEWw5zF|rYe`iKb@?i>!0}^^8H#R$H(c9%TD`E_S@VxEx3byv{Jl(%$z#$Vbfdv
zws$9N&KKwO%oYs$SaMq)ZJDS%Qt5S>t?QacXT!;tCzA_|%+kjD%MZUhe6lBBr1~7S
zMVSSY#b}2~TH@8VKpum-S>wuY9^W+h+I@$+bRD%9JF4bfM)PClVwP>X?~vNGcMRoB
z>jWF?8no2D?LME_S2Yzmm6fYKQgHUdxf@0_S9~t{r0<JM%|DiORi!cZNAwTpZ9XCW
z`9JKlMqjj6w0$k?vb<N1_98CZBFo9ho_FuVyry}gf@Rr-_MSH-HN%lVatclF8QxPG
zJv#ZcM&+SOOvQVj+l_}BzDmYPK9hLw<y)T8d!yp|YWJ+7J;UoEO|htV3nWt84@`cm
zSl}8Dqm*v3^KeWU5?BqN%dFM&(2HnlZ*tF!mbhZCZr?S8sei#y%^@NeigTEGJQp02
z_Q_PO=4mz4^Uwp~HcnHA%O6g9x-+{T)V?K~lm7k7i?_*dJ1d<7lME)`-HdO`UtT#A
z_}cXCf%AtPUpVHEK3er^;>-;TFdT8ZGL$iHnLlKewi?iz=v}bMabW5E^6t*L9LGLy
z+zU2h&&^9?q6PLigLauA$IjKdE%7u4a#eSwR?Su~j`T(fkZTBsCCDYNHZFWMiO-)I
zdHL0-Ce6*%=TWxeZk+#Ol19m<n)sTXN79e{P)Ss&dA#_z<8I1K*+k{z!1~^Yg+kcO
zdH=fC;Z8Qo`KHDnODD|hhJ)pfb;cDOSZbQH9Jn<2z24@^_^Vit&esKUbIz*~%NJ)V
zo(_#@ENJ+Ld&${2kgZJF@>`npcg?#@FYi03>x4oHw5Td6oVG=eI+6vQY4jgEn8lwU
z9~Vi^cms8%&Do8YdT;Ue?WAUy!=p(&BD?KY<CBhu-fDZ{FjU;+R41`&AbV)9Wfk+G
z)}a&T4L?X3mA_$nl*!zuF?2Cr_aiZy42qv`k2~RVE`N-PJ9oRLbNP8%%{y~P#`#X`
z>Q4L7dr7n5GS_+N6y#}XNl4KDiL8PydwFr+H@T;g%0)X{p9=`}dgZ>V%}!-i>Qs;P
zWe`-p9er9PRmZhZZ%P^~LpQ(k!>PU&4IYOtnu|Lf#&>AtN9Pr5)U^5R5y|fKDBN0F
zcZ}6RYw5gnme<{-tWzcF`Pl;W7fBvba+m80(l@fPsm0yIezdAR@Ju+EctD!?K=>x+
zFti*e7ZrJeAETv8>vd;tgBbO@Vx%Twx3Am!ZQJ&xZjd*ANkN{ph(_;%Z0_4$-cNCM
z&!+l|TWXviyzu^B@i6|rf}TvR9mOptYP)6^X^Tj{#_MdQ0t&>3<w?1@jT}|l+HVRc
zjC<0K5lK}`J8<?MqRt{7*(_vn--E60vF+o4ru?4FoU(`)wDPC>+OtiG&iH>;@yF7i
z4rPwoCbvWQOr)x|rAjB4awk{BTP#(>o>?RDyNosohfx;-aE^%#SG2AkXdR{6gY}&J
z$Z>;*oa0HDo)6aLNNb?3;!g8<3c((3ZW3DY>XlbXyUstl>PXx<Wm|trxmLAY8f)-)
zpR`B+;T^YW-uQ<oB*zGm&@vX7pR2tQn6vdnAyKv5_P9&*97$ScTjRDIz3ik^`6Ep2
zmcfos&uKBoyS1~lPsQhupSUOT9IGCBlG#!JSU%Cd1v)C*`TEQIIh1`|`A{w>3)H*J
zi~Oz0k}r?n+y7iHa<3g5tGgn5%eyV}ku-hOdS~-RsJG?5iK4}*4vA+yS2Gy;T5ETE
z)APboUSYCf2DI`OqXLhHqEQwthbB`qyA?$e7t}5Fi1^jR>RI`l8dp4T-B)9&Bo&<H
zeI?YTKD%E-*ZaU^9T|E-=vzkOz=dsNiKMAT8hh*{#7V-6Zha3m(;cmkh+&y_aY2y_
z6*Z1p$2a6sovBu%u+tB7XF)3$zC_>Nagf5$TZdu5kC})i(QR8B|4DzFod-cLTNk3x
zeckyMT+U1A+wq}s7p7#l?7wxGZ#%}JthW78PhNvu$)r#9yqmrcn#e<z`;&uLz=;C6
z&8?5#M$#5pefXLlc7iWHx3+jbxF_qo&0{*vAKK5V^))KZvr46yo6Z1v_h$rhD^49>
z{2Y`&ADGRX`<=4K_f3scmGFva#(c+NL+Mvyy1Mn1UbLv*rUs`2k7mb;&f#ojSoluA
zq1C*)<q_5OqU4?gogofPYT0p=m%Vqyrz!gw8#z>^hvGA7z1j|&{ae{by&vQ#4C>^O
z)V5C^K;138HMQx&*}WcOZK_AL>%ROjEI(>)p782T8DpTE?e+ZIqg^gJKAzJRF||Yu
z)>h93Cf^)Swqy)u)TZk0$*+&gn~D8WVtDDSf!Q6q=$F^KeTF=Qa>=Ra=LbAoQ6YM}
z%f&mFCz`^y%^zl1C03HJ<5U+gP@T;fCRQ&Cj`Qmx>Arg2dO6X`X+%z-di-(Uy9ClU
z(l+uobvkh}-}A&~t@gY8pUGnOFEQs_y&f4@Ng5X`D3g5uN9@QgT{VUdUp16@YjqJ(
zSVi|ry*kP_xy&2W`tYH$r`h6nZ9g}qeW9q~R?(OAH0C8`i+*P5J^f@7rJ1D?{_?7v
z=r@*06+E1jlXi_{yLNxnVkEs}NhaZ+ktoPWD*E{noxF9$eybH%^w;ceZoeQ;M&}#4
zZN_YBPk3EXO_?2T23W41q(Odb-VdA|)#Pnk+gRH44)c<|z;K$}aHJVsP2!JM=VeQg
zm+w$jyNV@Bn5z4c;&00!-)r7?`oOAO(I@TlOcJHZ1)i6K3O}51Y7KjGcfSpG+l@}1
z);@lnXu_dAz>S-hiO5Im>+<XkKIiN?w5{zlj)YINn#;dMEk}`b7q)im#l?MI0%)ty
zuBhFV{ul>xqNhAXnL(qj9;Yc1OM6vNEu1<-6ZOKDWQ^QI$sbv~sY_qC`f?0Z?0M|Q
z-7QSy@wTj=XFfZj(<=X)BI@&K<=%#QG1dVt1DB~bA(91YBCUH$YUWK+G1{D$zbT+v
z?3#l-gv3^+7^C#>P&#uyS5AHspx!wcWS|n)D~lG-_#E+UKDugDE^_4ieK0Q@6|UTl
z7=BIK!H+4PU8$)|kPQ?$f2-056+j=mrTUJY9NI<&Z7Ug2{8{>v%snRxze6W>6sftV
zZ1*ZTMDb1yb%vtQU9xcGdvCh4=go^dP;Aw$Q_UJjCS5|0V~VMy?P%m|$b>z<_=@+s
zW8NQ73Z5}$mfUvR2bFrxCNQ6JAh5%}_sUr0>`~H*YbB1W*5})9wkJyN%JNTLp7Wgc
zxukegq?~ku!ppKP1&hieeL3~*UXfLosj+@lWDfTeE_CK-g6H*Wocw}K`xPR}u*Qmt
z+wYW*^#r;{2VEk`mcy7u>@=mzQ9wP2ow=EdGdp+LP`kfQh(YVLXN{<Q!D|7<BrYYx
z$B87oVM;tj*Td_LB<ss#;>hLnmYFOccBFULhfFv}cQ{&~m-5eU(0irMvrRg(&12fo
zNnOaXH=6ulYz_$nDa}AuQvv1vu^+K*og*>x_99#3R6F_JFp#PzO$?U%?Tovi$J!Xc
zWkB{>P`T!I^ibRN`7a3_#QjTCp5B&WgVX&_gUhV4U4zPEm~-M+Z;s?vA6nc-MjGnm
zV8VCa&SEiWa)db4aPqLgYAVyPgpvoRb4_DFZHcK@tZJNyHy_Q|NR*siOsHmrcwl<Y
z{U7FMgH@urN}3Ne`Ph#<k!z6&yDDs;QqeVeQBHb^K`!i+DsFlq<;6Y0fNHd|>FN@<
z<!JgzU&WM9rtP#+mmNF|r0x-U?G|Zg!a8m_YGj>dch<jEVKhIsj@f5O+(&))qmto+
zcW(^3CI}U_Jet0@m2#|NQTKxA#CVu!#g;*4gMEjcwn%hWEFSo3VQyhv{(iUYoHHrk
zK_Z>{y9e#!3)7#@vzeSVQ%<uzCiFr_S8CdvkH`7Ba<|J3&htcUwRGo05Alf1q30gD
z@g5`+RPA^u9T?mnYJM#|v2mvo%?lUi6HOH630W>aoX(y`k`}}V-%AWcHSW=)zbrmT
z5hcUWoNq?@GTt&KkxZ_>*53Y^f@;;b6warSO5MB<QcXiIwx#h%E4VrG5Rr8)v4OQi
z_;zk$-U-o{19#HX6R1jjwq~_kv!Ux#B{T9%YA=Kvb&=}67r-1F=dwJpAhehFLjA<{
zz(8J8I&}Rt>DQTlFW69!f)4}Ms+4kE<@SM-z6>PB_fZZzhIjPDvx%ag-OcJ5y?!jO
zCt`;X8PNrvqJm;s`bZZQl=-=u2h)bzj5~RS6u6y8lYNqtTzGrv<P*L(J(>Exlhu!o
z#E|S`N%i(_ix$_xojtVjr<NZIu5PN<MKPvIJnJ>?SBgDJ7xc(o-un~Lwwd6fMhaJy
z)-AQ}19j@%r}oG2?r;w2E|X#jT#QZN2qW3*TSKCO`YbYF{G~?uZ7aDp@vzUGW?KDC
zqWyP86oWNx1uwRkHro&dbdweBT)kUlx5pcMF4kDV?eTGzUY0;oTcU2ch^iNXv<?C~
zL^^GI{TR=W9jp~7S=N4WMmaAQb2ODMPM$UCV6I1Y)eGi1j=2aFpN`*r1Jw=Ic|)m~
z#|EW26Vv9#Ml9%UO1@G3sg7iq^GGjqQ1sZLM-<V=tU6x4ZhM{5G%i!M!p8LyJLB%&
zT-$R$>J9(omjdxs#zTeD^<l39=VOO37VMXpx{`Sgk?YIa7?U~Dd*dpag?{w<jrcC>
zveDFfE<fnhJaSu0jzcA|@fL~mIjelb81mPlTFwXMi0MgIECjj2PcPDSI<hL~dFj~D
zx;sAeDBQhTJH+iagt{Yfcf5p3L-N5JiFE2(CyKTvujtQ8I+YH)9=srq{pKa+qZsOb
z=%heV(kHFre6=HAE~lIO$9<ieGw4GPKcl{UPBl+nO)O7qVmYc$cizB?M80!>&ap+Z
z3UAi*<n6~(GG@e#E^m>i)X0b#avh(m6Slxy)wAod>F;Y6oX%nRlww0<lCXK?G`i&C
z{-ss!E-T()HD_A+J?SqvmUcSwQ(9dunz5u1c=Yu2$QRq!V#f^~6J0r5UTgDpcibF%
zF5_)d7E!Y6{+D<=3$ELP3d4qNRYmX8-;5o=p;c(;GzE-=pJmCJdYPlh+ax^M-BE|e
zc2{#~*o2=PGEZfo@xkqUZ>4hsyW>XRP77;={TWBp>(tI4`gXg-bB^rgjT(|$D~Wp=
zUUzr5@1n`zCU2^Gu?5GRFmAqg=FCxMmg{e4rmYhO^<3ya`k>nMv(F!%h<|gv@2l#7
zw<A#;h;D=LaXU{$%eXjUCT=pQAM=b2sLRq|v!ANuXy%*$mQCrmiTI2{%A;%6Bd12r
z1(eC6pUiKnJm}5ZF@EX!HTA~}&V}#YRkb-n?@_LV^i~covEDtji#b~UKBq@{|HyK{
zd7^Ha&(haVHutTZd;Hat@lnxvuGi73J07p9i_8z&r_oS3ZryrrQkKd6bINtyPRUwP
z^y#~^d)#Xcw--_+?v%i8uIcSH<meH>dFe8pzI@v+cj4lGJ!+oRcjVh<QtD1m->wlw
zD`~C{w99%vV5{FpuW41>wI^*QxlCha4maigWk_2P1AX38Hx(+0`V1A+1DR(O7Q)(Q
z`YdDBC)z}27LD(DYZNBREomASovE+<K000^XzL->rq3Ih=V|G^xp@aBA$3t_fuY6x
zd-bT}(`PFB4EeWyM0jKR4qT%By5bUV6P;NuTV7zIIzoq;5>1KrJ1Z{N)}b+;Bd%+>
zleuS;o{O%N{zAqeLy)Ub0nfwjMH1ziTjO<R_S=(m$CsVF|GqvIclq4)XTqhzqX)%_
zPZZw|^R)V8>E6F+oAN1{?{Z7|;d4Y!G)z4UOh9mW?nK#0A?xA{)$mfGF}mu|`JU<;
z@}1WeqQ%%qCdl55FbGkiGet5}2FpU7N8fi__Zz#S;&^9La8FaKr=8#0rg+{h(TzRe
zOP-P=!A8+vlbUx#_AF{aGr-crvhu|N(>o5;^yu16vdNS)b<D}Z71{>F)Z$*zO0o>0
zy?e>r9($qM7~29Ajmri`XfXqytw~vOOjYC@=Pie5SYE4RQ6yH+bM1S5Vw}w8TLPM2
zJ*QWbH7(#O%JKF?Rh>KGJRPwQN8H;cSDJb@xJTmVkX1(JVH2DeCH31o=<s2K(N{Q!
zuDt_t(UZIMv{vUL!m)+HUs3x$#b@0UCDFGEUzt^C{bX<I&hCtn!qGi(xaDm5$g<+X
zK*ill)?H!(m}lo2aX!Z;N_H0>3W|8gM)RdH=~mtAW-$#VS{5pFCS9h#*ab0*Lnk~p
zbsZAtP?wB7_Tm8(CMQCX%vDBgsH=0h1}hS`v&=YXYNS7a!FHbFX{1Uw_vSe}u`^*k
z^Ga$u_71w37mhWWRnjk0Qd|<Ya=K7o92dV37dP77J}<Kz$2i%788|~j?Rva8GU#g6
zV>W?N<2I{9bcQsoGaSv*CfCD1%?-+VZIaQ*qNyFHzVuj9!%OgiOvCH~$yKx3x2+*`
zD2*c%#|(W0r=9sKV=GQa-6^`H2^^6w--j#ow?f_I_}^$4vE$fjn}>oL{K(_^1B$O^
zi^OrtZP{{{PVwT1W}f1h?8@zukNUo%*_#hJZn-slJMT!+!_aL~USQ)K!L-%6Dg^Z@
z^uZ>1cLs@PG)4_8%*+QkOYHJOYr>6p%kjVEcHtPhR^^gwZohkU(49s?!Kg?5`N#vM
zRuZEovLNA}Qe}2|49C><&Ors&0cUysHxs-p-l6rh12!*<Tu<+rQ4k~2{PB3Z%=daK
zlFp&CGvK}{+H&hxB`bY)feMjtEJTlF&5ody(%2s;HlT^54Oc6Jij384_dPyj-EG+?
zymyji@g*zTR(!|aJ^Z_N_*|5#EdTUj)OI<^r@mI_{ihpMBP>fVLEJnRLO=7d@S=$U
z=Lb)ec9Udgu+J51cCE=8iZo(LD_gTB=GoJA0+>&!!FN@U#U;}&jGvgkv77CNi+@+-
zaZ~*k%8tBY2Fz4CL*tpV?-vz|%7-!>R<hlONo`wqUvwmT>C2$+8q+-6d&B-z3Y}{_
zHNDd=k{QR7;V7-sk^y=*<@8AI%!e>wyrd$PBS^I*CzKtDG!rsOUwYl%y0~)CFRK24
zg}7;V*|xa}f8-^1Jle(Z3s%d4Yd>ayDl_F<GP|qWG^yFw^5dlPS5eh%o9eQhk_z{S
zs5Z06`|&bmKv~inp|^cq@`mknr;AZC+4Z=yP3(_KJW5e$V#5XjR1AL^YTHRVQiq|w
zYlgf<)ioECjPGN#7;f)x6hKY!9NMBOnO3&VTYG<!ZG7mq<fPTgs2Q>e8K+0#UUkO?
zjYXQCJJ>TFkaKWsG?XfM>&W$r$Xv{4w@BZG*Q677x(6Dc)$V0_P*$VpsL@;6)^$!_
z!R*WhcMD3A1}8nOs53hxn`xE8Z<l}YYNuvF-??>T4x>Q5|E{B<xEYa>4Wn&b^D%&C
znbb_OVwSXfY@ib3?lfKOD6g!jz<q+$R(#N};C9mvRM*F&C~#C}MTcI^TF9X`Fi+s>
zR2EkfP~Z+D6=bJ-HM{RC`ONksSku5#2K_ocS}P8;rJ*=CDn_oN;kJ~roC5b*(!u3O
zS+pQfmhr<x!JVYp-WccIKNwI$Y2L%O9!~e=^Jr`5l~>*6!?L)zkNYrdUb|w?eqy@E
zn#_kIFf!!iiRmFlo8izGSMG9D+^{T@y(c>U<@P=kRwwc_%Gm813xV1>RxZt=Rq_s0
z_FMDPyBx;f=aDg$cqte*e2NEx8^0~Z7wNgV(3)*OA&BkgI$JByvl3P_y>jQ4=^!qz
zQEh%~(E7)l-07Z~tgwCFvZsc-qHUL_#(T0;#(QrWP~-+Z)V%M_S6mP$6lFCNv^Udx
z(M8&dg-8ngo4Mr)KAE|XlR=(_KiU=#r1tJSb?a+|@K6SYK<%zP%c!l@^@ZWOs%&yH
z3YCkxIEJS_<IfFLYr^H6U){@=-TuR&Y?mWYR|>aflRIm6Q-fo7@0l5a3iFy)X>}jn
zUNy7&*oyjKsc+K4J;K-@X$gaB6)hj@pSwSgB@<_g<@8)QEZ@dFn^-ZOu3MqqL_ak#
zD-cl6b-b6gVeY%x^NR&PMkb>&Ge%?XTvEr)H{3}7ZkB8Jt+mMKWEAbBGcpSDk3dtE
zCi+RiuMO`$bGbZs`B1obXHd3E{rre3-;6)&oz9h#`ggakvVKkyVRh1V8c-}MVxA?#
zd>QYrS9#0jUF2U8aMJP}y1`Y&rZg!j{ItS_uOYZ?(SB1c&UP-}qVyL&J)TgtWW3E@
z7&Gp<`D}dV0dEhnA0i>&3QgO6rc@#X#(2CsZRD<em#y3pAni*RU8Uj_O|2>TeyJc%
z10}QCMsX&oIXu+y^u(*YOIMSrgU>x;J|P<69#wVjgX7uxW!}<z`Z2dQZ*>WWRwWNk
zNtF`PxHoyOM6_aFJnUI@a3e9w?cE)2=i+>>AidX`LpEquS;h-=q5f3*`Q0tw$S?Ok
zsZOEoy-<9rB9v)B=L%&9ji<$2<=gLyPX=(}GYY3X?RFNL+%zS1&N|#`Vg0eLSd#bz
z`r~uTR5HE0d(SN7a|ZM1qpFWU*BLf{6-~Z%bw{BE*}$1hk`hw|H62H)!eY^~Z@5j*
zUPaJ^(8=@Xze6#3VxKPC%rO+!-4Cz}@-gJF;_IH?{)Do()SN?!T)wDw%V*M}Q-@KT
zp3#lx-urr}nC;e;Pf^OJ?!VroPV`P6Lx*|!P@7aX{k7cSC11Kigzx+#NoQk?eNQMQ
zm?f``MrhB)J~&R2vPD<f^yUR$GOe7Gr}QSZ0_)Yn9#j?9WZRq7ZgJdvXeOH#EiOKR
zo;gRYEYLNzy=b&$lZMR~iYWHa{=46V4+k1a)xOc3j@`=p&MJXJhaztx_{7~=%q?u+
z?uXA0jo6Po*lc`lXW0C6g(YRC^i7*($0fH6jh|$bVyS)0Dcu(&`8`?0LQq{);pmb0
zk)9Y+>Dw45uWGrcM0CmB_WgVzCqwrLt!Pl3emBT9Tvj=n*){*grgKc$KL44lmm~Vs
z1uE%r(wV(gEZ-ZgUcJBm<9Gmvdky`YwB#`7*9*9$+nD5Hy3xZKW)yc0TwQt@o*k}K
zDnK-1|H$|RN~lJMtVFtWpOnO0#C|TyOSnh-l5gH+1@UM?M0jg>`zc)3xzTH_7O$5I
zw^lpxo#5J<g28O+N}I@ucVg3RvD|)0nQPM_SFfJ;V#z7xWX;!WUo~&T+LJ0q@|>k@
z_9~HYo_}2W93^FU*??*9C*{LL(+yu$=30ZrFIgAJ`jL${T@>C@JAPs3y;nJ<vUz;r
zX^JQ%wu>}zJ6O%q#j%#JKUF6;-(9w*QZbp=6%*enYwC{r;-g!6_Nht(r9hAOzEg|4
zn(EIDYE&g$F!ypkjXSQkUowvavQZoEls{x-|Mu?Gc^c;jgB-X;&S{gPY<i!qI?d@1
zR9z$o_V_!p5II(9O_!ezTyS+wy6jjjEpUevGppGd)&Jut<zq~uNzs6aMf2i;C!~Jv
z@oyA9zpBYIzL;=i-}`g;=vT$p`P$68g#*uH>fbAEXB(cgyv;9hY`jpWBz4eyj`Zd0
zd&Cl?WKLzCGAu8=+_PxRIxouVOK`Bw-*br6rEBAUdgnCmt7|%MYs=w`7?x$0<q*ET
zY2NyL+g@?<Y9!X=^LEYBCC`?Nx9l(y{qR7w^z_*amx$T9jfv57d*}A685`uh^ANmR
zwJHSYx+iaPN=h>MaXK(eeQ0bu8-C>4bLHiZRG$_;jAQVAL6%%=P0#dbyS(QWpO5#k
zvv)_>Hw1XSBN35mwI%Mydg>^=4BYHkb?g$m`*|WA-CV9TqRS^RG2c@5UaO9!F-%DD
z@KNn$e{NtQOcS+qJ%R`5;qd#{D(;R|k<EOVH^x7<doD5EJ}rH%x_97J<SBpCFUdEi
zeBhAm7Rb|T3T+14J$oaOtLUbKLN`+lZyDOPKd-1cetCNU$FfX_ysP-5;YD<ltXzxm
z@Um-f<ZP&;hht@GvjE0|CgyHYYM3(H3ojE)S5!&Rt{`#shp%zpu&)HEAG&Jjj;wNd
zG|Hl_s)VPbB1pd1Q#uRmaq4{JEq-cJEUadLa^IC84~vm29!4h?Fb={jL^@~Z*+bAt
z-{W>0?x*V(#Wd!Awy#^A8C>4(>Cn>Ze&MlU*2iTzF4=;&X}eQ2HgOlz%AY;Smw{5-
zWYT+lX^YfnSB+UArIjbj1q)7(eiYi}^BInm-I0+p6t3dAHNiPCrgBc6nx?V%nhr~+
zqEAKr@fg|)6JMj$JxpxTmlG8Cy)SW1Enrl?c7F$^^6J54iSACL2GO@VcI+<>HK@lt
zc_{PnNvY1=k)lVgg&BE5LpoRZ=VX^@m$l^S+0n`GKjjkha#JZ#JT&d~x+{BUuCLzl
zh~MF(#_1Cd<Aw5P`_q`qkHwIVrHv=kY!WP{FG~Gk`MoXyHM=_`&QAJ8MdR^HZ-5Tj
zgLu`;%4=idsohD(>q<&x8DEm9q26R~%a)N}_2j>L$8k(Y%)c&S!Bd2NHG{)EIGk!>
zX2&T?V+I4N73<oZ%^F~ag_S+&_ERv8X8D#iX~Ho&m|XWELet^$kLwXfy(Zb0DVI+a
z(MzMPHt)M-U9>3ZF}Rq{#c3!>C)?qwvB)ZFK`P;my=xXbLMFz3F0pI-qPi4`rr|WB
zyzOBMQnDF3qLHQcViVyV`9r~s3;GHSi!#;AcW)H3Dg;M|zf9JseOW^i#+ODvA7#Mr
z=oenm*YcDu`D7XAm2lkCqZckwO&MlHoWnMI4xVr;pyx#IdhNLFqGF+7q%kG$Yw3dO
z-Vy%yu`85v2dm0|$gw#x@-H4!(wU>1^MArCP1H?E6~}hj0HgbHY9Yr<((;-J<|C$t
zLHuc=RISl8TFiK#svO+~yY_HLUL~?Xl;~?aRyJ2Gcj*e>J|Q-?NBv_=W*4V?@>WHH
zwk>a7KI%p<inc1xX*eFY$${3GlOd4NC+&J~ehHO}#xm={gX*og&GN0}pJa;*=u%xY
zP*i^N7xX90w-1Qj_!ulfypSHgC^hS<im9O!fBKa=dMM+8iOVHlr+x3=3#1m%UAy*P
z09D=f<>UOto3%;rKVMDNGEd*rS$*A!P34~IY*%e&Gjp>5&l59Jj95suz7Ov6mW&;!
z&kuR+@?KPQ9CtZH6sRX9SDP+j?CVP6QdV$9*U*i3XB}P9RI5ny!I9jj-w$qg4>{O*
z!(T}6Kz<de7g#f|n8%*RWhh+YGBR{K8o2{iZDrpjVn#mVCODp=(R8FS_shh0L$-sZ
z1>Cp9iZW|tX(N=>P~akqVVLBa+a6rXiI9qpuA&9|XU2LI?ppI7>P^~Ax!g1(`B2ri
zj-Q2tx5r&aOZ1ZrzQPhc+R?R--MiuVp}8L0a;`R~QhFKm9#n^;c4a$CMlCtz)DweG
zK~K#t@E(>N)p70JdoR;&ODPqRSx^p}j{YY4C!M_EM^ZNRju)0lIWY1x-lJ;RV!0yB
zK2<Ei^)6chMOgwazl=jB<c@eBrDSr8WSvl7Mp=#ryudkxQnX36<?Q%Ijo!n3e%S7G
zx3;$t1Ka*cv&|pc3`?Y&Gh50z=%=T{Elm57J26VnM`j75aenMwmCWid#i+Drm^^&6
zJWjM*VeZTvrFyAZRh!qL2yP^h%Q9+)_YbZ$qNGYFHTm<kmWWsUoq~EN3wvb9N*5`1
zb6=ZJJASBt<vDtu6qAvVblzuMk=&&A)AzKbX~#HC^d9zg&c-%mrAmyx47o;+B5s^r
zkTcSljAbvaQuVi$4y)*U5I~uLlbGY9)YGu}=1OIggzEw!d^Z0Wy}Y7g$QR<B@<b;x
zf~j3=5)Chme5e$_j{We@yr;mI)KL9~Dox~&@EBlwR_?Mu=21PDr_M#yN37HJ(;LX6
zu5y;SJ=n@}a*J{3@z-U#Y~Ff-C%@Q)qI4$v{0z%hFqapa#E!{+-%4w{rFTkNmg`yc
z$<?eIN3Uou9bmk!(PYwchl6>Z41?C+XSd^WgFg$aRi<#?u>)HcA618GGz&E1PF99k
zKC|?<l-Nv9LuAAq*eKqE8#cyVi551|=r0RBNJ{3bf4^2TQYvY=_Uw*horbBC+fmhD
zzx=Ql^joyQr@QNIY*)#Gv`>9ofb-+XGh0var6vZRnoO}w^(sI5O&LWwlKL_0!lmwN
zmJ94T2?}}flIhf%YWMc+_pC*e^C~o7YLXy!mrgzkF48E=d_xN5?-eOJN6=5ZEwbDg
zOHLD_8GAO$HvKJru=vgKe#fE?wn<*pX>{E3>TaSYm5zrJ2S3|B$98hevCmnm?^}we
zl`kN2WXxRPYfrDtUero+ka<fY5AOYZaypX&LyA6Zy;0x9*?K+x6V~f%ZoKxLt5Wo4
zZy%;orHYiFZa+sg$aU1GDdV2chvfv^%a7D4jLX<0*<6of(yPYU;yHsH?Ec{UH=<)+
zey%xQ7gVt5I>pentw@tP8x_#7^6oJ;JJF@VbJJnyoCOe)7FOVfb0rf8$2$ijlH8_g
zitPsd?3Y{mjmK7=Z(r3e*)G+-*wlW5>e=G<o0so2Bpy1D8cCLki#68}jAg0_sC(DQ
z_iS6tkqPS7Wq3kp^X+qu7=`jpT9)T-ch0vzTDp1Ds`Tq6I+SVBJI4cdox}?gV{YxA
z9**c@(tLy?F5ci>I2ps)!^Od(+2FzIlvmiz89WqNbL?(1|K&|0iMoE{&Qb;%oM<bd
zH|DvRXIWd7G&w2`)4kwO#4yiI+<g|LK0f=vU>_NV&g^RFgU;QQ40r2SP&_r{M6Nq9
zeS<A$9Q`D@oMc!FeQU|2ZmKp!6@4K#jSBCNf6Ddb_5C6p(xN-fkD3GMg+KD4ME7)R
zyfj~RaLA>)xCxv4o<VQWH*qg5OS*qsYG#SVGb7b&3`VvQ`!fvG<9(MeW%cwFeHbsH
z?e4I*Bi85)OeN)Q*^g-_`cBkm8Qj<Itbh8uy(p0do5c?0Z!6DdzX5|3xn9|x?}R?u
zefA3d9&R38lI%}462+N4-Ax?|0a}yd=toh_;4WT2hwJ$LDAz9EE@c-KSHs5vt%JAp
zwSxwkwW+w7bwww}WW~v>)YFdM;3>LXBcT~xUGvZ&Z$C!g@A}n3cCUy-du|Lav{z2a
zM34$*5c^}<;tEX89Jbc6%Jj(E{Dgvz?Xdm$mFRt4<(KU#hOFzKjEi#DhKpPjHNSzi
zuscd+l&$;rip+~+S~d|96Kh{6baP^F_21Pq$mJ`4m;5$|R$lgKXzN)maH(~RzMoi-
z|LZ%y-F}M)O{P1T8N3wFoC-lLcAGpHs(yaICt^G*sunAeyZFU__zrFNzTVW{eT)M&
zp79N+sl$HO7jG}?zX{E!%5YY*e)~yVo36Wa6?}Vf{_J$>YvG*8Kw3<=uTI-t&Q}aw
z9^4cwBz~rfirr-Dz4`6|jj|ki9(y&8lFG-TLR)v2CijR83g#UZ$aYD2jM36C))_aM
z8Iikupubc_fW%0v6x>PqYA@ZMq0{&7ceYS8xgXP&++IF!#uV?|cI8S(n$v^I=?A2w
z=;maX3=XlBi&a#6KD^$Wbv4gRkk8wJH0}iLSbp>55c0K3*QuNNd%#C1<R$URv1j2o
zFnVP4*_%H<5Tl^r)nIbLXeAk02iltz<<h*c=h*b{scX5CJgJeon>bf@KRPB^EhUTS
z(jEn|fN#{V8Wf~tBy2yo?`T{xQdc15X3?i9YlWWx1&9*UIiQu2NhO7;JDy$N!CmV)
zxm?k`Kyz}wNbhP8IXx{IIeI(h<r5B}&hkvv(?gA>A2F`<GQwO#DUrFa+<cnu8rKe;
zVc4(UseOw@>Dh(t7&nZ-Th`Oy+al8@zCn3?O06I|f8o05*O@!UeR#%wG_`S??dnxd
zksn6Ybvs>3_$(4j?{CG>LnO}B-!mPwgUe&qzay^o`eAAb`WP<7P^_2E0RQ$+6zFWd
zC&LF%L_Q92wa)7=zEO=9dQN?&_hu_ycx2k9gL1CY7Kb?{>U@7>oqw1UG)qt9rZyxg
z5un+(;&;+A?7`3n>uw`c`B~jTl_2MSMI~#R)QeMX5f$gG=Ct=x*@z{~gvQ&Kgf`T2
zQ^cVj5A%?8-z8&;H0*sVbXr$};rkxq&u$ERj=!TOIqCWG_QLCj)>Gr|+#cjof(JP#
zRa>Y(L`)5wlCPtSttB3(a=P2;<Z`8W_UuXqxA$4~tg`W$T(^sdZqHwjdUVD91~^rx
yB{6m{>Zl2%!?}|Z-N$fqll~{NY_B5Rmf%<IshNjDIN-m_s4AaOdVARD{{I4e8EfVM
literal 0
HcmV?d00001
diff --git a/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
new file mode 100644
index 000000000..c6aa865f2
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
@@ -0,0 +1,36 @@
+// Global variable overrides. Must be declared before importing Valo.
+
+// Defines the plaintext font size, weight and family. Font size affects general component sizing.
+//$v-font-size: 16px;
+//$v-font-weight: 300;
+//$v-font-family: "Open Sans", sans-serif;
+
+// Defines the border used by all components.
+//$v-border: 1px solid (v-shade 0.7);
+//$v-border-radius: 4px;
+
+// Affects the color of some component elements, e.g Button, Panel title, etc
+//$v-background-color: hsl(210, 0%, 98%);
+// Affects the color of content areas, e.g Panel and Window content, TextField input etc
+//$v-app-background-color: $v-background-color;
+
+// Affects the visual appearance of all components
+//$v-gradient: v-linear 8%;
+//$v-bevel-depth: 30%;
+//$v-shadow-opacity: 5%;
+
+// Defines colors for indicating status (focus, success, failure)
+//$v-focus-color: valo-focus-color(); // Calculates a suitable color automatically
+//$v-friendly-color: #2c9720;
+//$v-error-indicator-color: #ed473b;
+
+// For more information, see: https://vaadin.com/book/-/page/themes.valo.html
+// Example variants can be copy/pasted from https://vaadin.com/wiki/-/wiki/Main/Valo+Examples
+
+@import "../valo/valo.scss";
+
+@mixin mytheme {
+ @include valo;
+
+ // Insert your own theme rules here
+}
diff --git a/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/styles.scss b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/styles.scss
new file mode 100644
index 000000000..bba1d493c
--- /dev/null
+++ b/P/Sda1/InsertGui/V4/src/main/webapp/VAADIN/themes/mytheme/styles.scss
@@ -0,0 +1,11 @@
+@import "mytheme.scss";
+@import "addons.scss";
+
+// This file prefixes all rules with the theme name to avoid causing conflicts with other themes.
+// The actual styles should be defined in mytheme.scss
+
+.mytheme {
+ @include addons;
+ @include mytheme;
+
+}
diff --git a/P/pom.xml b/P/pom.xml
index 5c2bdc652..2f8402e93 100644
--- a/P/pom.xml
+++ b/P/pom.xml
@@ -115,6 +115,9 @@
<module>Sda1/catalog2rdbms</module>
<module>Sda1/catalog2rdbmsPrepare</module>
+ <module>Sda1/InsertGui/V2</module>
+ <module>Sda1/InsertGui/V4</module>
+
<module>Sda1/Jpa/HibernateStandalone</module>
<module>Sda1/NoCast</module>
--
GitLab