-/*\r
-@VaadinApache2LicenseForJavaFiles@\r
- */\r
-package com.vaadin.tools;\r
-\r
-import java.lang.reflect.Method;\r
-import java.util.logging.Level;\r
-import java.util.logging.Logger;\r
-\r
-import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder;\r
-\r
-/**\r
- * A wrapper for the GWT 1.6 compiler that runs the compiler in a new thread.\r
- * \r
- * This allows circumventing a J2SE 5.0 bug (6316197) that prevents setting the\r
- * stack size for the main thread. Thus, larger widgetsets can be compiled.\r
- * \r
- * This class takes the same command line arguments as the\r
- * com.google.gwt.dev.GWTCompiler class. The old and deprecated compiler is used\r
- * for compatibility with GWT 1.5.\r
- * \r
- * A typical invocation would use e.g. the following arguments\r
- * \r
- * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet"\r
- * \r
- * In addition, larger memory usage settings for the VM should be used, e.g.\r
- * \r
- * "-Xms256M -Xmx512M -Xss8M"\r
- * \r
- * The source directory containing widgetset and related classes must be\r
- * included in the classpath, as well as the gwt-dev-[platform].jar and other\r
- * relevant JARs.\r
- * \r
- * @deprecated with Java 6, can use com.google.gwt.dev.Compiler directly (also\r
- * in Eclipse plug-in etc.)\r
- */\r
-@Deprecated\r
-public class WidgetsetCompiler {\r
-\r
- /**\r
- * @param args\r
- * same arguments as for com.google.gwt.dev.Compiler\r
- */\r
- public static void main(final String[] args) {\r
- try {\r
- // run the compiler in a different thread to enable using the\r
- // user-set stack size\r
-\r
- // on Windows, the default stack size is too small for the main\r
- // thread and cannot be changed in JRE 1.5 (see\r
- // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197)\r
-\r
- Runnable runCompiler = new Runnable() {\r
- @Override\r
- public void run() {\r
- try {\r
- // GWTCompiler.main(args);\r
- // avoid warnings\r
-\r
- String wsname = args[args.length - 1];\r
-\r
- // TODO expecting this is launched via eclipse WTP\r
- // project\r
- System.out\r
- .println("Updating GWT module description file...");\r
- WidgetSetBuilder.updateWidgetSet(wsname);\r
- System.out.println("Done.");\r
-\r
- System.out.println("Starting GWT compiler");\r
- System.setProperty("gwt.nowarn.legacy.tools", "true");\r
- Class<?> compilerClass = Class\r
- .forName("com.google.gwt.dev.GWTCompiler");\r
- Method method = compilerClass.getDeclaredMethod("main",\r
- String[].class);\r
- method.invoke(null, new Object[] { args });\r
- } catch (Throwable thr) {\r
- getLogger().log(Level.SEVERE,\r
- "Widgetset compilation failed", thr);\r
- }\r
- }\r
- };\r
- Thread runThread = new Thread(runCompiler);\r
- runThread.start();\r
- runThread.join();\r
- System.out.println("Widgetset compilation finished");\r
- } catch (Throwable thr) {\r
- getLogger().log(Level.SEVERE, "Widgetset compilation failed", thr);\r
- }\r
- }\r
-\r
- private static final Logger getLogger() {\r
- return Logger.getLogger(WidgetsetCompiler.class.getName());\r
- }\r
-}\r
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.tools;
+
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder;
+
+/**
+ * A wrapper for the GWT 1.6 compiler that runs the compiler in a new thread.
+ *
+ * This allows circumventing a J2SE 5.0 bug (6316197) that prevents setting the
+ * stack size for the main thread. Thus, larger widgetsets can be compiled.
+ *
+ * This class takes the same command line arguments as the
+ * com.google.gwt.dev.GWTCompiler class. The old and deprecated compiler is used
+ * for compatibility with GWT 1.5.
+ *
+ * A typical invocation would use e.g. the following arguments
+ *
+ * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet"
+ *
+ * In addition, larger memory usage settings for the VM should be used, e.g.
+ *
+ * "-Xms256M -Xmx512M -Xss8M"
+ *
+ * The source directory containing widgetset and related classes must be
+ * included in the classpath, as well as the gwt-dev-[platform].jar and other
+ * relevant JARs.
+ *
+ * @deprecated with Java 6, can use com.google.gwt.dev.Compiler directly (also
+ * in Eclipse plug-in etc.)
+ */
+@Deprecated
+public class WidgetsetCompiler {
+
+ /**
+ * @param args
+ * same arguments as for com.google.gwt.dev.Compiler
+ */
+ public static void main(final String[] args) {
+ try {
+ // run the compiler in a different thread to enable using the
+ // user-set stack size
+
+ // on Windows, the default stack size is too small for the main
+ // thread and cannot be changed in JRE 1.5 (see
+ // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197)
+
+ Runnable runCompiler = new Runnable() {
+ @Override
+ public void run() {
+ try {
+ // GWTCompiler.main(args);
+ // avoid warnings
+
+ String wsname = args[args.length - 1];
+
+ // TODO expecting this is launched via eclipse WTP
+ // project
+ System.out
+ .println("Updating GWT module description file...");
+ WidgetSetBuilder.updateWidgetSet(wsname);
+ System.out.println("Done.");
+
+ System.out.println("Starting GWT compiler");
+ System.setProperty("gwt.nowarn.legacy.tools", "true");
+ Class<?> compilerClass = Class
+ .forName("com.google.gwt.dev.GWTCompiler");
+ Method method = compilerClass.getDeclaredMethod("main",
+ String[].class);
+ method.invoke(null, new Object[] { args });
+ } catch (Throwable thr) {
+ getLogger().log(Level.SEVERE,
+ "Widgetset compilation failed", thr);
+ }
+ }
+ };
+ Thread runThread = new Thread(runCompiler);
+ runThread.start();
+ runThread.join();
+ System.out.println("Widgetset compilation finished");
+ } catch (Throwable thr) {
+ getLogger().log(Level.SEVERE, "Widgetset compilation failed", thr);
+ }
+ }
+
+ private static final Logger getLogger() {
+ return Logger.getLogger(WidgetsetCompiler.class.getName());
+ }
+}
-package com.vaadin.terminal.gwt.client;\r
-\r
-import java.util.Calendar;\r
-import java.util.Date;\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-\r
-import junit.framework.TestCase;\r
-\r
-import com.vaadin.terminal.gwt.client.DateTimeService;\r
-\r
-public class DateTimeServiceTest extends TestCase {\r
-\r
- final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;\r
-\r
- static Map<Date, Integer> isoWeekNumbers = new HashMap<Date, Integer>();\r
- static {\r
- isoWeekNumbers.put(getDate(2005, 02, 02), 5);\r
-\r
- isoWeekNumbers.put(getDate(2005, 1, 1), 53);\r
- isoWeekNumbers.put(getDate(2005, 1, 2), 53);\r
- isoWeekNumbers.put(getDate(2005, 1, 3), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 4), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 5), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 6), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 7), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 8), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 9), 1);\r
- isoWeekNumbers.put(getDate(2005, 1, 10), 2);\r
- isoWeekNumbers.put(getDate(2005, 12, 31), 52);\r
- isoWeekNumbers.put(getDate(2005, 12, 30), 52);\r
- isoWeekNumbers.put(getDate(2005, 12, 29), 52);\r
- isoWeekNumbers.put(getDate(2005, 12, 28), 52);\r
- isoWeekNumbers.put(getDate(2005, 12, 27), 52);\r
- isoWeekNumbers.put(getDate(2005, 12, 26), 52);\r
- isoWeekNumbers.put(getDate(2005, 12, 25), 51);\r
- isoWeekNumbers.put(getDate(2007, 1, 1), 1);\r
- isoWeekNumbers.put(getDate(2007, 12, 30), 52);\r
- isoWeekNumbers.put(getDate(2007, 12, 31), 1);\r
- isoWeekNumbers.put(getDate(2008, 1, 1), 1);\r
- isoWeekNumbers.put(getDate(2008, 12, 28), 52);\r
- isoWeekNumbers.put(getDate(2008, 12, 29), 1);\r
- isoWeekNumbers.put(getDate(2008, 12, 30), 1);\r
- isoWeekNumbers.put(getDate(2008, 12, 31), 1);\r
- isoWeekNumbers.put(getDate(2009, 1, 1), 1);\r
- isoWeekNumbers.put(getDate(2009, 12, 31), 53);\r
- isoWeekNumbers.put(getDate(2010, 1, 1), 53);\r
- isoWeekNumbers.put(getDate(2010, 1, 2), 53);\r
- isoWeekNumbers.put(getDate(2010, 1, 3), 53);\r
- isoWeekNumbers.put(getDate(2010, 1, 4), 1);\r
- isoWeekNumbers.put(getDate(2010, 1, 5), 1);\r
- isoWeekNumbers.put(getDate(2010, 10, 10), 40);\r
-\r
- }\r
-\r
- /**\r
- * Test all dates from 1990-1992 + some more and see that {@link Calendar}\r
- * calculates the ISO week number like we do.\r
- * \r
- */\r
- public void testISOWeekNumbers() {\r
- Calendar c = Calendar.getInstance();\r
- c.set(1990, 1, 1);\r
- long start = c.getTimeInMillis();\r
-\r
- for (int i = 0; i < 1000; i++) {\r
- Date d = new Date(start + i * MILLISECONDS_PER_DAY);\r
- int expected = getCalendarISOWeekNr(d);\r
- int calculated = DateTimeService.getISOWeekNumber(d);\r
- assertEquals(d + " should be week " + expected, expected,\r
- calculated);\r
-\r
- }\r
- }\r
-\r
- /**\r
- * Verify that special cases are handled correctly by us (and\r
- * {@link Calendar}).\r
- * \r
- */\r
- public void testSampleISOWeekNumbers() {\r
- for (Date d : isoWeekNumbers.keySet()) {\r
- // System.out.println("Sample: " + d);\r
- int expected = isoWeekNumbers.get(d);\r
- int calculated = DateTimeService.getISOWeekNumber(d);\r
- assertEquals(d + " should be week " + expected\r
- + " (Java Calendar is wrong?)", expected,\r
- getCalendarISOWeekNr(d));\r
- assertEquals(d + " should be week " + expected, expected,\r
- calculated);\r
-\r
- }\r
- }\r
-\r
- private int getCalendarISOWeekNr(Date d) {\r
- Calendar c = Calendar.getInstance();\r
- c.setFirstDayOfWeek(Calendar.MONDAY);\r
- c.setMinimalDaysInFirstWeek(4);\r
- c.setTime(d);\r
-\r
- return c.get(Calendar.WEEK_OF_YEAR);\r
- }\r
-\r
- private static Date getDate(int year, int month, int date) {\r
- Calendar c = Calendar.getInstance();\r
- c.clear();\r
- c.set(year, month - 1, date);\r
- return c.getTime();\r
- }\r
-\r
-}\r
+package com.vaadin.terminal.gwt.client;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import com.vaadin.terminal.gwt.client.DateTimeService;
+
+public class DateTimeServiceTest extends TestCase {
+
+ final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
+
+ static Map<Date, Integer> isoWeekNumbers = new HashMap<Date, Integer>();
+ static {
+ isoWeekNumbers.put(getDate(2005, 02, 02), 5);
+
+ isoWeekNumbers.put(getDate(2005, 1, 1), 53);
+ isoWeekNumbers.put(getDate(2005, 1, 2), 53);
+ isoWeekNumbers.put(getDate(2005, 1, 3), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 4), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 5), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 6), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 7), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 8), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 9), 1);
+ isoWeekNumbers.put(getDate(2005, 1, 10), 2);
+ isoWeekNumbers.put(getDate(2005, 12, 31), 52);
+ isoWeekNumbers.put(getDate(2005, 12, 30), 52);
+ isoWeekNumbers.put(getDate(2005, 12, 29), 52);
+ isoWeekNumbers.put(getDate(2005, 12, 28), 52);
+ isoWeekNumbers.put(getDate(2005, 12, 27), 52);
+ isoWeekNumbers.put(getDate(2005, 12, 26), 52);
+ isoWeekNumbers.put(getDate(2005, 12, 25), 51);
+ isoWeekNumbers.put(getDate(2007, 1, 1), 1);
+ isoWeekNumbers.put(getDate(2007, 12, 30), 52);
+ isoWeekNumbers.put(getDate(2007, 12, 31), 1);
+ isoWeekNumbers.put(getDate(2008, 1, 1), 1);
+ isoWeekNumbers.put(getDate(2008, 12, 28), 52);
+ isoWeekNumbers.put(getDate(2008, 12, 29), 1);
+ isoWeekNumbers.put(getDate(2008, 12, 30), 1);
+ isoWeekNumbers.put(getDate(2008, 12, 31), 1);
+ isoWeekNumbers.put(getDate(2009, 1, 1), 1);
+ isoWeekNumbers.put(getDate(2009, 12, 31), 53);
+ isoWeekNumbers.put(getDate(2010, 1, 1), 53);
+ isoWeekNumbers.put(getDate(2010, 1, 2), 53);
+ isoWeekNumbers.put(getDate(2010, 1, 3), 53);
+ isoWeekNumbers.put(getDate(2010, 1, 4), 1);
+ isoWeekNumbers.put(getDate(2010, 1, 5), 1);
+ isoWeekNumbers.put(getDate(2010, 10, 10), 40);
+
+ }
+
+ /**
+ * Test all dates from 1990-1992 + some more and see that {@link Calendar}
+ * calculates the ISO week number like we do.
+ *
+ */
+ public void testISOWeekNumbers() {
+ Calendar c = Calendar.getInstance();
+ c.set(1990, 1, 1);
+ long start = c.getTimeInMillis();
+
+ for (int i = 0; i < 1000; i++) {
+ Date d = new Date(start + i * MILLISECONDS_PER_DAY);
+ int expected = getCalendarISOWeekNr(d);
+ int calculated = DateTimeService.getISOWeekNumber(d);
+ assertEquals(d + " should be week " + expected, expected,
+ calculated);
+
+ }
+ }
+
+ /**
+ * Verify that special cases are handled correctly by us (and
+ * {@link Calendar}).
+ *
+ */
+ public void testSampleISOWeekNumbers() {
+ for (Date d : isoWeekNumbers.keySet()) {
+ // System.out.println("Sample: " + d);
+ int expected = isoWeekNumbers.get(d);
+ int calculated = DateTimeService.getISOWeekNumber(d);
+ assertEquals(d + " should be week " + expected
+ + " (Java Calendar is wrong?)", expected,
+ getCalendarISOWeekNr(d));
+ assertEquals(d + " should be week " + expected, expected,
+ calculated);
+
+ }
+ }
+
+ private int getCalendarISOWeekNr(Date d) {
+ Calendar c = Calendar.getInstance();
+ c.setFirstDayOfWeek(Calendar.MONDAY);
+ c.setMinimalDaysInFirstWeek(4);
+ c.setTime(d);
+
+ return c.get(Calendar.WEEK_OF_YEAR);
+ }
+
+ private static Date getDate(int year, int month, int date) {
+ Calendar c = Calendar.getInstance();
+ c.clear();
+ c.set(year, month - 1, date);
+ return c.getTime();
+ }
+
+}
projects / vaadin-framework.git / commitdiff