better sample data for simple reserver (only 6, office related)

svn changeset:4264/svn branch:trunk

diff --git a/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java b/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java
index 6b011e2b67c09ff26ef7d58bd9c0f1fec50e03bb..86428dba56b80e7da8d68db4b6949013ff0343ac 100644 (file)
--- a/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java
+++ b/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java
@@ -400,82 +400,19 @@ public class SampleDB {
 
         final Object[][] resources = {
 
-                // TODO change cars to rooms, projectors and other office
-                // resources
-
-                // Turku
-                { "01", "01 Ford Mondeo", "w/ company logo", "Turku",
-                        new Double(60.510857), new Double(22.275424) },
-                { "02", "02 Citroen Jumper",
-                        "w/ company logo. 12m3 storage space.", "Turku",
-                        new Double(60.452171), new Double(22.2995) },
-                { "03", "03 Saab 93", "Cabriolet. Keys from the rental desk.",
-                        "Turku", new Double(60.4507), new Double(22.295551) },
-                { "04", "04 Volvo S60", "Key from the rental desk.", "Turku",
+                { "01", "Portable Video projector 1", "Small,XGA resolution",
+                        "Turku", new Double(60.510857), new Double(22.275424) },
+                { "02", "Auditorio", "", "Turku", new Double(60.452171),
+                        new Double(22.2995) },
+                { "03", "Meeting room 1", "Projector, WiFi", "Turku",
+                        new Double(60.4507), new Double(22.295551) },
+                { "04", "Meeting room 2", "WiFi, Blackboard", "Turku",
+                        new Double(60.434722), new Double(22.224398) },
+                { "05", "AV Room", "Cabrio. Keys from infodesk.", "Turku",
+                        new Double(60.508970), new Double(22.264790) },
+                { "06", "Video projector",
+                        "Rather heavy, good luminance, WXGA", "Turku",
                         new Double(60.434722), new Double(22.224398) },
-                { "05", "05 Smart fourtwo", "Cabrio. Keys from infodesk.",
-                        "Turku", new Double(60.508970), new Double(22.264790) },
-                // Helsinki
-                { "06", "06 Smart fourtwo", "Cabrio. Keys from infodesk.",
-                        "Helsinki", new Double(60.17175), new Double(24.939029) },
-                { "07", "07 Smart fourtwo", "Cabrio. Keys from infodesk.",
-                        "Helsinki", new Double(60.17175), new Double(24.939029) },
-                { "08", "08 Smart fourtwo", "Cabrio. Keys from infodesk.",
-                        "Helsinki", new Double(60.166579),
-                        new Double(24.953899) },
-                { "09", "09 Volvo S60", "Keys from infodesk.", "Helsinki",
-                        new Double(60.317832), new Double(24.967289) },
-                { "10", "10 Saab 93", "Keys from infodesk.", "Helsinki",
-                        new Double(60.249193), new Double(25.045921) },
-                // Silicon Valley
-                { "11", "11 Ford Mustang", "Keys from Acme clerk.",
-                        "Silicon Valley", new Double(37.615853),
-                        new Double(-122.386384) },
-                { "12", "12 Ford Fusion", "Keys from infodesk.",
-                        "Silicon Valley", new Double(37.365028),
-                        new Double(-121.922654) },
-                { "13", "13 Land Rover", "Keys from infodesk.",
-                        "Silicon Valley", new Double(37.365028),
-                        new Double(-121.922654) },
-                { "14", "14 Land Rover", "Keys from infodesk.",
-                        "Silicon Valley", new Double(37.365028),
-                        new Double(-121.922654) },
-                { "15", "15 Ford Mustang", "GT Cal Special. Keys from guard.",
-                        "Silicon Valley", new Double(37.403812),
-                        new Double(-121.977425) },
-                { "16", "16 Ford Focus", "Keys from guard.", "Silicon Valley",
-                        new Double(37.403812), new Double(-121.977425) },
-                // Paris
-                { "17", "17 Peugeot 308", "Keys from infodesk.", "Paris",
-                        new Double(48.844756), new Double(2.372784) },
-                { "18", "18 Citroen C6", "Keys from rental desk.", "Paris",
-                        new Double(49.007253), new Double(2.545025) },
-                { "19", "19 Citroen C6", "Keys from infodesk.", "Paris",
-                        new Double(48.729061), new Double(2.368087) },
-                { "20", "20 Peugeot 308", "Keys from ticket sales.", "Paris",
-                        new Double(48.880931), new Double(2.356988) },
-                { "21", "21 Peugeot 308", "Keys from ticket sales.", "Paris",
-                        new Double(48.876479), new Double(2.358161) },
-                // STHLM
-                { "22", "22 Volvo S60", "Keys from infodesk.", "Stockholm",
-                        new Double(59.350414), new Double(18.106574) },
-                { "23", "23 Saab 93", "Keys from infodesk.", "Stockholm",
-                        new Double(59.355905), new Double(17.946784) },
-                { "24", "24 Smart fourtwo", "Keys from infodesk.", "Stockholm",
-                        new Double(59.315939), new Double(18.095904) },
-                { "25", "25 Smart fourtwo", "Keys from infodesk.", "Stockholm",
-                        new Double(59.330716), new Double(18.058702) },
-        // Boston
-        /*
-         * { "26", "26 Ford Mustang", "Keys from infodesk.", "Boston", new
-         * Double(42.366588), new Double(-71.020955) }, { "27", "27 Smart
-         * fourtwo", "Keys from infodesk.", "Boston", new Double(42.365419), new
-         * Double(-71.061748) }, { "28", "28 Volvo S60", "Keys from Seaport
-         * Hotel reception.", "Boston", new Double(42.34811), new
-         * Double(-71.041127) }, { "29", "29 Smart fourtwo", "Keys from Seaport
-         * Hotel reception.", "Boston", new Double(42.348072), new
-         * Double(-71.041315) },
-         */
 
         };