[gwt-contrib] [google-web-toolkit] r9516 committed - Follow-up to tobyr feedback on r9509....

[codesite-noreply]

Revision: 9516
Author: sco...@google.com
Date: Fri Jan  7 11:13:03 2011
Log: Follow-up to tobyr feedback on r9509.
http://gwt-code-reviews.appspot.com/1264801/show

Review by: to...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=9516

Modified:
 /trunk/dev/core/src/com/google/gwt/dev/DevMode.java
 /trunk/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
 /trunk/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java

=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/DevMode.java	Fri Jan  7 10:27:37  
2011
+++ /trunk/dev/core/src/com/google/gwt/dev/DevMode.java	Fri Jan  7 11:13:03  
2011
@@ -402,7 +402,7 @@
     // Background scan the classpath to warm the cache.
     Thread scanThread = new Thread(new Runnable() {
       public void run() {
-        ResourceOracleImpl.preload(getTopLogger());
+        ResourceOracleImpl.preload(TreeLogger.NULL);
       }
     });
     scanThread.setDaemon(true);
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java	Fri Jan  7  
06:41:55 2011
+++ /trunk/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java	Fri Jan  7  
11:13:03 2011
@@ -243,7 +243,7 @@
   }

   public synchronized Resource findPublicFile(String partialPath) {
-    doRefresh(TreeLogger.NULL);
+    doRefresh();
     return lazyPublicOracle.getResourceMap().get(partialPath);
   }

@@ -275,7 +275,7 @@
    * @return the resource for the requested source file
    */
   public synchronized Resource findSourceFile(String partialPath) {
-    doRefresh(TreeLogger.NULL);
+    doRefresh();
     return lazySourceOracle.getResourceMap().get(partialPath);
   }

@@ -298,7 +298,7 @@
   }

   public String[] getAllPublicFiles() {
-    doRefresh(TreeLogger.NULL);
+    doRefresh();
     return lazyPublicOracle.getPathNames().toArray(Empty.STRINGS);
   }

@@ -307,7 +307,7 @@
    * oracle has been initialized.
    */
   public String[] getAllSourceFiles() {
-    doRefresh(TreeLogger.NULL);
+    doRefresh();
     return lazySourceOracle.getPathNames().toArray(Empty.STRINGS);
   }

@@ -321,7 +321,7 @@

   public synchronized CompilationState getCompilationState(TreeLogger  
logger)
       throws UnableToCompleteException {
-    doRefresh(TreeLogger.NULL);
+    doRefresh();
     CompilationState compilationState = CompilationStateBuilder.buildFrom(
         logger, lazySourceOracle.getResources());
     checkForSeedTypes(logger, compilationState);
@@ -368,7 +368,7 @@
       lazyResourcesOracle.setPathPrefixes(newPathPrefixes);
       ResourceOracleImpl.refresh(TreeLogger.NULL, lazyResourcesOracle);
     } else {
-      doRefresh(TreeLogger.NULL);
+      doRefresh();
     }
     return lazyResourcesOracle;
   }
@@ -424,7 +424,7 @@
     servletClassNamesByPath.put(path, servletClassName);
   }

-  public synchronized void refresh(TreeLogger logger) {
+  public synchronized void refresh() {
     needsRefresh = true;
   }

@@ -519,21 +519,19 @@
     }
   }

-  private synchronized void doRefresh(TreeLogger logger) {
+  private synchronized void doRefresh() {
     if (!needsRefresh) {
       return;
     }
     Event moduleDefEvent = SpeedTracerLogger.start(
         CompilerEventType.MODULE_DEF, "phase", "refresh", "module",  
getName());
-    logger = logger.branch(TreeLogger.DEBUG, "Refreshing module '" +  
getName()
-        + "'");
-
     // Refresh resource oracles.
     if (lazyResourcesOracle == null) {
-      ResourceOracleImpl.refresh(logger, lazyPublicOracle,  
lazySourceOracle);
+      ResourceOracleImpl.refresh(TreeLogger.NULL, lazyPublicOracle,
+          lazySourceOracle);
     } else {
-      ResourceOracleImpl.refresh(logger, lazyPublicOracle,  
lazySourceOracle,
-          lazyResourcesOracle);
+      ResourceOracleImpl.refresh(TreeLogger.NULL, lazyPublicOracle,
+          lazySourceOracle, lazyResourcesOracle);
     }
     moduleDefEvent.end();
     needsRefresh = false;
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java	Wed Aug  
25 08:20:08 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java	Fri  
Jan  7 11:13:03 2011
@@ -90,7 +90,7 @@
   public static ModuleDef createSyntheticModule(TreeLogger logger,
       String moduleName, String[] inherits, boolean refresh)
       throws UnableToCompleteException {
-    ModuleDef moduleDef = tryGetLoadedModule(logger, moduleName, refresh);
+    ModuleDef moduleDef = tryGetLoadedModule(moduleName, refresh);
     if (moduleDef != null) {
       return moduleDef;
     }
@@ -139,7 +139,7 @@
       if (physicalName != null) {
         moduleName = physicalName;
       }
-      ModuleDef moduleDef = tryGetLoadedModule(logger, moduleName,  
refresh);
+      ModuleDef moduleDef = tryGetLoadedModule(moduleName, refresh);
       if (moduleDef != null) {
         return moduleDef;
       }
@@ -150,13 +150,12 @@
     }
   }

-  private static ModuleDef tryGetLoadedModule(TreeLogger logger,
-      String moduleName, boolean refresh) {
+  private static ModuleDef tryGetLoadedModule(String moduleName, boolean  
refresh) {
     ModuleDef moduleDef = loadedModules.get(moduleName);
     if (moduleDef == null || moduleDef.isGwtXmlFileStale()) {
       return null;
     } else if (refresh) {
-      moduleDef.refresh(logger);
+      moduleDef.refresh();
     }
     return moduleDef;
   }

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