From d38c421cbc4cd57eb2a95a96d8fea761e5582284 Mon Sep 17 00:00:00 2001 From: Steve Hannah Date: Sat, 11 Apr 2015 11:01:54 -0700 Subject: [PATCH] Removed extra spaces and updated Copyright --- .../java/org/teavm/classlib/java/util/TCalendar.java | 2 -- .../teavm/classlib/java/util/TSimpleTimeZone.java | 12 +----------- .../java/org/teavm/classlib/java/util/TTimeZone.java | 5 +---- .../org/teavm/classlib/java/util/CalendarTest.java | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java index a1283e958..daca6e80e 100644 --- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java +++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCalendar.java @@ -397,8 +397,6 @@ public abstract class TCalendar implements TSerializable, TCloneable, TComparabl } } - - public final void set(int year, int month, int day) { set(YEAR, year); set(MONTH, month); diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSimpleTimeZone.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSimpleTimeZone.java index cd1844c37..0da96ba23 100644 --- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSimpleTimeZone.java +++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSimpleTimeZone.java @@ -30,8 +30,7 @@ package org.teavm.classlib.java.util; * @see TimeZone */ public class TSimpleTimeZone extends TTimeZone { - - + private int rawOffset; private int startYear, startMonth, startDay, startDayOfWeek, startTime; @@ -66,7 +65,6 @@ public class TSimpleTimeZone extends TTimeZone { private int dstSavings = 3600000; - private static final int MILLIS_PER_SECOND = 1000; private static final int MILLIS_PER_MINUTE = 60*MILLIS_PER_SECOND; private static final int MILLIS_PER_HOUR = 60*MILLIS_PER_MINUTE; @@ -96,13 +94,6 @@ public class TSimpleTimeZone extends TTimeZone { return MONTH_LENGTH[month + (isLeapYear(year) ? 12 : 0)]; } - - // BEGIN android-removed - // private final transient com.ibm.icu.util.TimeZone icuTZ; - // - // private final transient boolean isSimple; - // END android-removed - /** * Constructs a {@code SimpleTimeZone} with the given base time zone offset from GMT * and time zone ID. Timezone IDs can be obtained from @@ -118,7 +109,6 @@ public class TSimpleTimeZone extends TTimeZone { public TSimpleTimeZone(int offset, final String name) { setID(name); rawOffset = offset; - } /** diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java index 015d163f0..69a2ad0cf 100644 --- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java +++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java @@ -370,7 +370,6 @@ public abstract class TTimeZone { } else { return ""; } - } /** @@ -450,6 +449,4 @@ public abstract class TTimeZone { * Queries if this time zone uses Daylight Savings Time. */ public abstract boolean useDaylightTime(); -} - - +} \ No newline at end of file diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java b/teavm-tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java index 6bd02412e..fc5b5a1b4 100644 --- a/teavm-tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java +++ b/teavm-tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 shannah. + * Copyright 2015 Steve Hannah. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.