checkstyle passes. git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@84 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/windows/src/com/google/gwt/dev/shell/ie/IDispatchImpl.java b/dev/windows/src/com/google/gwt/dev/shell/ie/IDispatchImpl.java index 6cc4b81..6b4abb4 100644 --- a/dev/windows/src/com/google/gwt/dev/shell/ie/IDispatchImpl.java +++ b/dev/windows/src/com/google/gwt/dev/shell/ie/IDispatchImpl.java
@@ -42,17 +42,17 @@ * An exception for wrapping bad HR's. */ protected static class HResultException extends Exception { - private int fHR; + private int hr; - private String fSource; + private String source; /** * Constructs a standard bad HR exception. */ public HResultException(int hr) { super(Integer.toString(hr)); - fHR = hr; - fSource = "Java"; + this.hr = hr; + source = "Java"; } /** @@ -60,8 +60,8 @@ */ public HResultException(String message) { super(message); - fHR = COM.DISP_E_EXCEPTION; - fSource = "Java"; + hr = COM.DISP_E_EXCEPTION; + source = "Java"; } /** @@ -69,8 +69,8 @@ */ public HResultException(Throwable e) { super(AbstractTreeLogger.getStackTraceAsString(e), e); - fHR = COM.DISP_E_EXCEPTION; - fSource = "Java"; + hr = COM.DISP_E_EXCEPTION; + source = "Java"; } /** @@ -78,8 +78,8 @@ * structure. Otherwise, it does nothing. */ public void fillExcepInfo(int pExcepInfo) { - if (fHR == COM.DISP_E_EXCEPTION) { - SwtOleGlue.setEXCEPINFO(pExcepInfo, fHR, fSource, getMessage(), 0); + if (hr == COM.DISP_E_EXCEPTION) { + SwtOleGlue.setEXCEPINFO(pExcepInfo, hr, source, getMessage(), 0); } } @@ -87,7 +87,7 @@ * Gets the HR. */ public int getHResult() { - return fHR; + return hr; } }
diff --git a/dev/windows/src/com/google/gwt/dev/shell/ie/MethodDispatch.java b/dev/windows/src/com/google/gwt/dev/shell/ie/MethodDispatch.java index d4ab64e..d84aaa8 100644 --- a/dev/windows/src/com/google/gwt/dev/shell/ie/MethodDispatch.java +++ b/dev/windows/src/com/google/gwt/dev/shell/ie/MethodDispatch.java
@@ -1,4 +1,18 @@ -// Copyright 2006 Google Inc. All Rights Reserved. +/* + * Copyright 2006 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.shell.ie; import com.google.gwt.dev.shell.CompilingClassLoader;
diff --git a/dev/windows/src/com/google/gwt/dev/shell/ie/ModuleSpaceIE6.java b/dev/windows/src/com/google/gwt/dev/shell/ie/ModuleSpaceIE6.java index 3638eb4..984e8b0 100644 --- a/dev/windows/src/com/google/gwt/dev/shell/ie/ModuleSpaceIE6.java +++ b/dev/windows/src/com/google/gwt/dev/shell/ie/ModuleSpaceIE6.java
@@ -39,11 +39,11 @@ } // CHECKSTYLE_ON - private Variant fStaticDispatch; + private Variant staticDispatch; - private IDispatchProxy fStaticDispatchProxy; + private IDispatchProxy staticDispatchProxy; - private final OleAutomation fWindow; + private final OleAutomation window; /** * Constructs a browser interface for use with an IE6 'window' automation @@ -52,7 +52,7 @@ public ModuleSpaceIE6(ModuleSpaceHost host, IDispatch scriptFrameWindow) { super(host); - fWindow = SwtOleGlue.wrapIDispatch(scriptFrameWindow); + window = SwtOleGlue.wrapIDispatch(scriptFrameWindow); } public void createNative(String file, int line, String jsniSignature, @@ -63,7 +63,7 @@ String newScript = createNativeMethodInjector(jsniSignature, paramNames, js); try { // TODO: somehow insert file/line info into the script - Variant result = execute(fWindow, newScript); + Variant result = execute(window, newScript); if (result != null) { result.dispose(); } @@ -84,15 +84,15 @@ * is done cleaning up. We then dispose() the static dispatcher only if it * has not already been disposed(). */ - if (fStaticDispatch != null) { - final Variant staticDispatchToDispose = fStaticDispatch; - fStaticDispatch = null; + if (staticDispatch != null) { + final Variant staticDispatchToDispose = staticDispatch; + staticDispatch = null; Display.getCurrent().asyncExec(new Runnable() { public void run() { // If the proxy has already been disposed, don't try to do so again, // as this will attempt to call through a null vtable. - if (!fStaticDispatchProxy.isDisposed()) { + if (!staticDispatchProxy.isDisposed()) { staticDispatchToDispose.dispose(); } } @@ -100,8 +100,8 @@ } // Dispose everything else. - if (fWindow != null) { - fWindow.dispose(); + if (window != null) { + window.dispose(); } super.dispose(); } @@ -326,17 +326,17 @@ } protected void initializeStaticDispatcher() { - fStaticDispatchProxy = new IDispatchProxy(getIsolatedClassLoader()); - IDispatch staticDispatch = new IDispatch(fStaticDispatchProxy.getAddress()); - staticDispatch.AddRef(); - fStaticDispatch = new Variant(staticDispatch); + staticDispatchProxy = new IDispatchProxy(getIsolatedClassLoader()); + IDispatch staticDisp = new IDispatch(staticDispatchProxy.getAddress()); + staticDisp.AddRef(); + this.staticDispatch = new Variant(staticDisp); // Define the static dispatcher for use by JavaScript. // createNative("initializeStaticDispatcher", 0, "__defineStatic", new String[] {"__arg0"}, "window.__static = __arg0;"); invokeNativeVoid("__defineStatic", null, new Class[] {Variant.class}, - new Object[] {fStaticDispatch}); + new Object[] {this.staticDispatch}); } private Variant execute(OleAutomation window, String code) { @@ -387,13 +387,13 @@ // Get the function object and its 'call' method. // - int[] ids = fWindow.getIDsOfNames(new String[] {name}); + int[] ids = window.getIDsOfNames(new String[] {name}); if (ids == null) { throw new RuntimeException( "Could not find a native method with the signature '" + name + "'"); } int functionId = ids[0]; - funcObjVar = fWindow.getProperty(functionId); + funcObjVar = window.getProperty(functionId); funcObj = funcObjVar.getAutomation(); int callDispId = funcObj.getIDsOfNames(new String[] {"call"})[0];