Author: [email protected]
Date: Wed Mar 18 21:26:24 2009
New Revision: 5046
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/GWTShell.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/WriteJsoImpl.java
changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/shell/PlatformSpecific.java
changes/jat/ihm/user/test/com/google/gwt/dev/util/UtilSuite.java
Log:
Checkstyle cleanups.
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
Wed Mar 18 21:26:24 2009
@@ -230,10 +230,9 @@
*
* @return <code>null</code> if the type is not found
*/
- public JClassType findType(String name) {
+ public JClassType findType(SourceName name) {
// TODO(jat): type-safe changes
- Name.sourceName(name); // check assertions
- return allTypes.get(name);
+ return allTypes.get(name.toString());
}
/**
@@ -245,9 +244,10 @@
*
* @return <code>null</code> if the type is not found
*/
- public JClassType findType(SourceName name) {
+ public JClassType findType(String name) {
// TODO(jat): type-safe changes
- return allTypes.get(name.toString());
+ Name.sourceName(name); // check assertions
+ return allTypes.get(name);
}
/**
@@ -457,21 +457,6 @@
}
/**
- * Finds a type given its fully qualified name. For nested classes, use
its
- * source name rather than its binary name (that is, use a "." rather
than a
- * "$").
- *
- * @return the specified type
- */
- public JClassType getType(SourceName name) throws NotFoundException {
- JClassType type = findType(name);
- if (type == null) {
- throw new NotFoundException(name.toString());
- }
- return type;
- }
-
- /**
* Returns the single implementation type for an interface returned via
* {...@link #getSingleJsoImplInterfaces()} or <code>null</code> if no JSO
* implementation is defined.
@@ -487,6 +472,21 @@
*/
public Set<JClassType> getSingleJsoImplInterfaces() {
return Collections.unmodifiableSet(jsoSingleImpls.keySet());
+ }
+
+ /**
+ * Finds a type given its fully qualified name. For nested classes, use
its
+ * source name rather than its binary name (that is, use a "." rather
than a
+ * "$").
+ *
+ * @return the specified type
+ */
+ public JClassType getType(SourceName name) throws NotFoundException {
+ JClassType type = findType(name);
+ if (type == null) {
+ throw new NotFoundException(name.toString());
+ }
+ return type;
}
/**
Modified: changes/jat/ihm/dev/core/src/com/google/gwt/dev/GWTShell.java
==============================================================================
--- changes/jat/ihm/dev/core/src/com/google/gwt/dev/GWTShell.java
(original)
+++ changes/jat/ihm/dev/core/src/com/google/gwt/dev/GWTShell.java Wed Mar
18 21:26:24 2009
@@ -164,6 +164,10 @@
return new GWTCompilerOptionsImpl(options);
}
+ public WebServerRestart hasWebServer() {
+ return WebServerRestart.NONE;
+ }
+
/**
* @throws UnableToCompleteException
*/
@@ -249,10 +253,6 @@
@Override
protected String getTitleText() {
return "Google Web Toolkit Development Shell";
- }
-
- public WebServerRestart hasWebServer() {
- return WebServerRestart.NONE;
}
@Override
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
==============================================================================
--- changes/jat/ihm/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
(original)
+++ changes/jat/ihm/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
Wed Mar 18 21:26:24 2009
@@ -110,7 +110,7 @@
soycEnabled = enabled;
}
- public void setWorkDir(File workDir){
+ public void setWorkDir(File workDir) {
this.workDir = workDir;
}
}
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
Wed Mar 18 21:26:24 2009
@@ -211,7 +211,6 @@
if (jsoImplDescs.contains(desc)) {
v = WriteJsoImpl.create(v, desc, jsoIntfDescs, mapper,
mangledNamesToImplementations);
-
}
v = new RewriteJsniMethods(v, anonymousClassMap);
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/WriteJsoImpl.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/WriteJsoImpl.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/rewrite/WriteJsoImpl.java
Wed Mar 18 21:26:24 2009
@@ -201,7 +201,6 @@
}
}
-
/**
* Creates a ClassVisitor to implement a JavaScriptObject subtype. This
will
* select between a simple implementation for user-defined JSO subtypes
and
@@ -266,6 +265,14 @@
return "<init>".equals(name);
}
+ /**
+ * Allows access to an unmodified visitMethod call.
+ */
+ protected MethodVisitor visitMethodNoRewrite(int access, String name,
+ String desc, String signature, String[] exceptions) {
+ return super.visitMethod(access, name, desc, signature, exceptions);
+ }
+
private boolean isObjectMethod(String signature) {
return "java/lang/Object".equals(mapper.findOriginalDeclaringClass(
originalName, signature).toString());
@@ -273,13 +280,5 @@
private boolean isStatic(int access) {
return (access & Opcodes.ACC_STATIC) != 0;
- }
-
- /**
- * Allows access to an unmodified visitMethod call.
- */
- protected MethodVisitor visitMethodNoRewrite(int access, String name,
- String desc, String signature, String[] exceptions) {
- return super.visitMethod(access, name, desc, signature, exceptions);
}
}
Modified: changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
==============================================================================
--- changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
(original)
+++ changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java Wed
Mar 18 21:26:24 2009
@@ -442,6 +442,10 @@
return false;
}
+ public WebServerRestart hasWebServer() {
+ return WebServerRestart.NONE;
+ }
+
/**
* Launch the arguments as Urls in separate windows.
*/
@@ -589,10 +593,6 @@
return -1;
}
return EmbeddedTomcatServer.getPort();
- }
-
- public WebServerRestart hasWebServer() {
- return WebServerRestart.NONE;
}
@Override
Modified:
changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/shell/PlatformSpecific.java
==============================================================================
---
changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/shell/PlatformSpecific.java
(original)
+++
changes/jat/ihm/dev/oophm/overlay/com/google/gwt/dev/shell/PlatformSpecific.java
Wed Mar 18 21:26:24 2009
@@ -15,10 +15,6 @@
*/
package com.google.gwt.dev.shell;
-import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.core.ext.TreeLogger.HelpInfo;
-import com.google.gwt.dev.shell.CheckForUpdates.UpdateResult;
-
import java.lang.reflect.Constructor;
/**
Modified: changes/jat/ihm/user/test/com/google/gwt/dev/util/UtilSuite.java
==============================================================================
--- changes/jat/ihm/user/test/com/google/gwt/dev/util/UtilSuite.java
(original)
+++ changes/jat/ihm/user/test/com/google/gwt/dev/util/UtilSuite.java Wed
Mar 18 21:26:24 2009
@@ -1,5 +1,18 @@
-// Copyright 2009 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+ * use this file except in compliance with the License. You may obtain a
copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
package com.google.gwt.dev.util;
import junit.framework.Test;
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
