Merged:

Fixed #3397 - Change reservr to use in-memory hsqldb
Fixed #3391 - Reservr reservation table (tab 2) should be full screen
Fixed #3390 - Reservr top-right car graphic is cut

svn changeset:8921/svn branch:6.2

diff --git a/WebContent/VAADIN/themes/reservr/styles.css b/WebContent/VAADIN/themes/reservr/styles.css
index 9bcb6d961fbf87e757082d2e2a09890e205dd1c9..380df0059107dc4451817e822241e9b25b93ad63 100644 (file)
--- a/WebContent/VAADIN/themes/reservr/styles.css
+++ b/WebContent/VAADIN/themes/reservr/styles.css
@@ -11,7 +11,8 @@
 .v-app-ReservationApplication .v-label-logo {
        font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
        padding-left: 13px;
-       padding-bottom: 10px;\r
+       padding-bottom: 10px;
+       padding-top: 10px;
        color: #F14C1A;\r
        font-size: 22px;\r
        letter-spacing: -0.03em;\r

diff --git a/src/com/vaadin/demo/reservation/ReservationApplication.java b/src/com/vaadin/demo/reservation/ReservationApplication.java
index 631233cdf3db17ce32e3f5aa2b3c10d168b07cf0..1b9777dcb26b698532422744d224644633aeaf5a 100644 (file)
--- a/src/com/vaadin/demo/reservation/ReservationApplication.java
+++ b/src/com/vaadin/demo/reservation/ReservationApplication.java
@@ -60,21 +60,26 @@ public class ReservationApplication extends Application {
         //\r
         db = new SampleDB(getProperty("jdbcUrl"));\r
 \r
-        final Window mainWindow = new Window("Reservr ");\r
+        VerticalLayout mainLayout = new VerticalLayout();\r
+        mainLayout.setSizeFull();\r
+        mainLayout.setMargin(true);\r
+\r
+        final Window mainWindow = new Window("Reservr ", mainLayout);\r
         setMainWindow(mainWindow);\r
         setTheme("reservr");\r
-        mainWindow.getContent().setWidth("100%");\r
 \r
         Label logo = new Label("Reservr");\r
         logo.setStyleName("logo");\r
-        mainWindow.addComponent(logo);\r
+        mainLayout.addComponent(logo);\r
 \r
         Label slogan = new Label("Representational vehicles on-the-road");\r
         slogan.setStyleName("slogan");\r
-        mainWindow.addComponent(slogan);\r
+        mainLayout.addComponent(slogan);\r
 \r
         final TabSheet mainTabs = new TabSheet();\r
-        mainWindow.addComponent(mainTabs);\r
+        mainTabs.setSizeFull();\r
+        mainLayout.addComponent(mainTabs);\r
+        mainLayout.setExpandRatio(mainTabs, 1);\r
 \r
         final VerticalLayout reservationTab = new VerticalLayout();\r
         reservationTab.setWidth("100%");\r
@@ -184,8 +189,7 @@ public class ReservationApplication extends Application {
         });\r
 \r
         allTable = new Table();\r
-        allTable.setWidth("100%");\r
-        allTable.setHeight("450px");\r
+        allTable.setSizeFull();\r
         allTable.setColumnCollapsingAllowed(true);\r
         allTable.setColumnReorderingAllowed(true);\r
         mainTabs.addTab(allTable, "All reservations", null);\r

diff --git a/src/com/vaadin/demo/reservation/SampleDB.java b/src/com/vaadin/demo/reservation/SampleDB.java
index 9be151c9e02f1de77e8747684527beadaa7df597..59eb7ef0109ef5ad8970e00844724fbd999ecddc 100644 (file)
--- a/src/com/vaadin/demo/reservation/SampleDB.java
+++ b/src/com/vaadin/demo/reservation/SampleDB.java
@@ -60,7 +60,7 @@ public class SampleDB {
                 + "_RESERVED_TO";
     }
 
-    private static final String DEFAULT_JDBC_URL = "jdbc:hsqldb:file:reservation.db";
+    private static final String DEFAULT_JDBC_URL = "jdbc:hsqldb:mem:reservation.db";
     private static Object dbMutex = new Object();
 
     private static final String CREATE_TABLE_USER = "CREATE TABLE "