[gwt-contrib] [google-web-toolkit] r5997 committed - Unbreak build by making parallel changes in Win/Mac that were made in ...

[codesite-noreply]

Revision: 5997
Author: j...@google.com
Date: Sat Aug 22 16:42:14 2009
Log: Unbreak build by making parallel changes in Win/Mac that were made in  
Linux.

Patch by: jat
Review by: rjrjr (TBR)

http://code.google.com/p/google-web-toolkit/source/detail?r=5997

Modified:
  /trunk/dev/mac/src/com/google/gwt/dev/shell/mac/BrowserWidgetSaf.java
  /trunk/dev/windows/src/com/google/gwt/dev/shell/ie/BrowserWidgetIE6.java

=======================================
--- /trunk/dev/mac/src/com/google/gwt/dev/shell/mac/BrowserWidgetSaf.java       
 
Wed Mar  4 10:40:25 2009
+++ /trunk/dev/mac/src/com/google/gwt/dev/shell/mac/BrowserWidgetSaf.java       
 
Sat Aug 22 16:42:14 2009
@@ -18,6 +18,7 @@
  import com.google.gwt.core.ext.TreeLogger;
  import com.google.gwt.dev.shell.BrowserWidget;
  import com.google.gwt.dev.shell.BrowserWidgetHost;
+import com.google.gwt.dev.shell.HostedHtmlVersion;
  import com.google.gwt.dev.shell.ModuleSpace;
  import com.google.gwt.dev.shell.ModuleSpaceHost;
  import com.google.gwt.dev.shell.mac.LowLevelSaf.DispatchMethod;
@@ -60,7 +61,7 @@
        TreeLogger logger = getHost().getLogger().branch(TreeLogger.DEBUG,
            "Loading an instance of module '" + moduleName + "'");
        try {
-        if (!validHostedHtmlVersion(version)) {
+        if (!HostedHtmlVersion.validHostedHtmlVersion(logger, version)) {
            return false;
          }

=======================================
---  
/trunk/dev/windows/src/com/google/gwt/dev/shell/ie/BrowserWidgetIE6.java        
 
Wed Mar  4 10:40:25 2009
+++  
/trunk/dev/windows/src/com/google/gwt/dev/shell/ie/BrowserWidgetIE6.java        
 
Sat Aug 22 16:42:14 2009
@@ -18,6 +18,7 @@
  import com.google.gwt.core.ext.TreeLogger;
  import com.google.gwt.dev.shell.BrowserWidget;
  import com.google.gwt.dev.shell.BrowserWidgetHost;
+import com.google.gwt.dev.shell.HostedHtmlVersion;
  import com.google.gwt.dev.shell.MethodAdaptor;
  import com.google.gwt.dev.shell.ModuleSpaceHost;

@@ -59,7 +60,7 @@
        TreeLogger logger = getHost().getLogger().branch(TreeLogger.DEBUG,
            "Loading an instance of module '" + moduleName + "'");
        try {
-        if (!validHostedHtmlVersion(version)) {
+        if (!HostedHtmlVersion.validHostedHtmlVersion(logger, version)) {
            throw new HResultException(COM.E_INVALIDARG);
          }


--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---