Revision: 8033
Author: [email protected]
Date: Mon May 3 17:00:59 2010
Log: GWT code must be compatible with JDK 1.5, which did not allow
@Override on interface method implementations.
http://code.google.com/p/google-web-toolkit/source/detail?r=8033
Modified:
/branches/2.1/user/src/com/google/gwt/logging/client/DefaultLevel.java
/branches/2.1/user/src/com/google/gwt/logging/client/NullLoggingPopup.java
/branches/2.1/user/src/com/google/gwt/logging/impl/LevelImplNull.java
/branches/2.1/user/src/com/google/gwt/logging/impl/LevelImplRegular.java
=======================================
--- /branches/2.1/user/src/com/google/gwt/logging/client/DefaultLevel.java
Mon May 3 15:52:00 2010
+++ /branches/2.1/user/src/com/google/gwt/logging/client/DefaultLevel.java
Mon May 3 17:00:59 2010
@@ -24,11 +24,11 @@
* gwt.xml file.
*/
public interface DefaultLevel {
- /**
+ /**
* Returns Level.ALL as the default level
*/
public class All implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.ALL;
}
}
@@ -37,16 +37,16 @@
* Returns Level.CONFIG as the default level
*/
public class Config implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.CONFIG;
}
}
-
+
/**
* Returns Level.FINE as the default level
*/
public class Fine implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.FINE;
}
}
@@ -55,7 +55,7 @@
* Returns Level.FINER as the default level
*/
public class Finer implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.FINER;
}
}
@@ -64,7 +64,7 @@
* Returns Level.FINEST as the default level
*/
public class Finest implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.FINEST;
}
}
@@ -73,7 +73,7 @@
* Returns Level.INFO as the default level
*/
public class Info implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.INFO;
}
}
@@ -82,7 +82,7 @@
* Returns Level.SEVERE as the default level
*/
public class Severe implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.SEVERE;
}
}
@@ -91,7 +91,7 @@
* Returns Level.WARNING as the default level
*/
public class Warning implements DefaultLevel {
- @Override public Level getLevel() {
+ public Level getLevel() {
return Level.WARNING;
}
}
=======================================
---
/branches/2.1/user/src/com/google/gwt/logging/client/NullLoggingPopup.java
Mon May 3 15:52:00 2010
+++
/branches/2.1/user/src/com/google/gwt/logging/client/NullLoggingPopup.java
Mon May 3 17:00:59 2010
@@ -27,18 +27,14 @@
*/
public class NullLoggingPopup implements HasWidgets {
- @Override
public void add(Widget w) { }
- @Override
public void clear() { }
- @Override
public Iterator<Widget> iterator() {
return null;
}
- @Override
public boolean remove(Widget w) {
return false;
}
=======================================
--- /branches/2.1/user/src/com/google/gwt/logging/impl/LevelImplNull.java
Mon May 3 15:52:00 2010
+++ /branches/2.1/user/src/com/google/gwt/logging/impl/LevelImplNull.java
Mon May 3 17:00:59 2010
@@ -24,65 +24,52 @@
*/
public class LevelImplNull implements LevelImpl {
- @Override
public Level all() {
return null;
}
- @Override
public Level config() {
return null;
}
- @Override
public Level fine() {
return null;
}
- @Override
public Level finer() {
return null;
}
- @Override
public Level finest() {
return null;
}
- @Override
public String getName() {
return null;
}
- @Override
public Level info() {
return null;
}
- @Override
public int intValue() {
return 0;
}
- @Override
public Level off() {
return null;
}
- @Override
public void setName(String newName) {
}
- @Override
public void setValue(int newValue) {
}
- @Override
public Level severe() {
return null;
}
- @Override
public Level warning() {
return null;
}
=======================================
---
/branches/2.1/user/src/com/google/gwt/logging/impl/LevelImplRegular.java
Mon May 3 15:52:00 2010
+++
/branches/2.1/user/src/com/google/gwt/logging/impl/LevelImplRegular.java
Mon May 3 17:00:59 2010
@@ -58,27 +58,22 @@
public LevelImplRegular() { }
- @Override
public Level all() {
return LevelImplRegular.ALL;
}
- @Override
public Level config() {
return LevelImplRegular.CONFIG;
}
- @Override
public Level fine() {
return LevelImplRegular.FINE;
}
- @Override
public Level finer() {
return LevelImplRegular.FINER;
}
- @Override
public Level finest() {
return LevelImplRegular.FINEST;
}
@@ -87,7 +82,6 @@
return name;
}
- @Override
public Level info() {
return LevelImplRegular.INFO;
}
@@ -96,7 +90,6 @@
return value;
}
- @Override
public Level off() {
return LevelImplRegular.OFF;
}
@@ -109,17 +102,14 @@
value = newValue;
}
- @Override
public Level severe() {
return LevelImplRegular.SEVERE;
}
- @Override
public String toString() {
return getName();
}
- @Override
public Level warning() {
return LevelImplRegular.WARNING;
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors