Revision: 6705 Author: [email protected] Date: Thu Nov 5 11:28:20 2009 Log: Merge tr...@6514 into this branch Code cleanup forCompositeTreeLogger, AbstractTreeLogger svn merge --ignore-ancestry -c 6514 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=6705 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/dev/CompileTaskRunner.java /releases/2.0/dev/core/src/com/google/gwt/dev/ModulePanel.java /releases/2.0/dev/core/src/com/google/gwt/dev/shell/ShellMainWindow.java /releases/2.0/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java /releases/2.0/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java /releases/2.0/dev/core/src/com/google/gwt/dev/util/log/CompositeTreeLogger.java ======================================= --- /releases/2.0/branch-info.txt Thu Nov 5 11:16:57 2009 +++ /releases/2.0/branch-info.txt Thu Nov 5 11:28:20 2009 @@ -349,9 +349,12 @@ tr...@6483 was merged into this branch Use 'devMode' instead of 'hosted' in the ant files for the samples - svn merge --ignore-ancestry -c r6483 https://google-web-toolkit.googlecode.com/svn/trunk . + svn merge --ignore-ancestry -c 6483 https://google-web-toolkit.googlecode.com/svn/trunk . tr...@6460 was merged into this branch Prevent parallel javac compiles when running tests in parallel. svn merge --ignore-ancestry -c r6460 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@6514 was merged into this branch + Code cleanup forCompositeTreeLogger, AbstractTreeLogger + svn merge --ignore-ancestry -c 6514 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/CompileTaskRunner.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/CompileTaskRunner.java Thu Nov 5 11:28:20 2009 @@ -18,7 +18,6 @@ import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.dev.shell.log.SwingLoggerPanel; -import com.google.gwt.dev.util.log.AbstractTreeLogger; import com.google.gwt.dev.util.log.PrintWriterTreeLogger; /** @@ -52,8 +51,7 @@ // Eager AWT initialization for OS X to ensure safe coexistence with SWT. BootStrapPlatform.initGui(); - final AbstractTreeLogger logger = loggerWindow.getLogger(); - logger.setMaxDetail(options.getLogLevel()); + final TreeLogger logger = loggerWindow.getLogger(); final boolean[] success = new boolean[1]; // Compiler will be spawned onto a second thread, UI thread for tree ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/ModulePanel.java Fri Oct 16 20:54:44 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/ModulePanel.java Thu Nov 5 11:28:20 2009 @@ -15,11 +15,11 @@ */ package com.google.gwt.dev; +import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.TreeLogger.Type; import com.google.gwt.dev.ModuleTabPanel.Session; import com.google.gwt.dev.shell.log.SwingLoggerPanel; import com.google.gwt.dev.shell.log.SwingLoggerPanel.CloseHandler; -import com.google.gwt.dev.util.log.AbstractTreeLogger; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -70,7 +70,7 @@ setDisconnected(); } - public AbstractTreeLogger getLogger() { + public TreeLogger getLogger() { return loggerPanel.getLogger(); } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/ShellMainWindow.java Fri Oct 16 20:54:44 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/ShellMainWindow.java Thu Nov 5 11:28:20 2009 @@ -17,7 +17,6 @@ import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.dev.shell.log.SwingLoggerPanel; -import com.google.gwt.dev.util.log.AbstractTreeLogger; import java.awt.BorderLayout; import java.awt.GridLayout; @@ -57,7 +56,7 @@ /** * @return TreeLogger instance */ - public AbstractTreeLogger getLogger() { + public TreeLogger getLogger() { return logWindow.getLogger(); } } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java Thu Nov 5 08:47:31 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/log/SwingLoggerPanel.java Thu Nov 5 11:28:20 2009 @@ -252,7 +252,7 @@ private final JEditorPane details; - private final AbstractTreeLogger logger; + private final TreeLogger logger; private DefaultMutableTreeNode root; @@ -386,19 +386,18 @@ add(splitter); AbstractTreeLogger uiLogger = new SwingTreeLogger(this); - AbstractTreeLogger bestLogger = uiLogger; + uiLogger.setMaxDetail(maxLevel); + TreeLogger bestLogger = uiLogger; if (logFile != null) { try { PrintWriterTreeLogger fileLogger = new PrintWriterTreeLogger(logFile); - bestLogger = new CompositeTreeLogger(bestLogger, fileLogger); fileLogger.setMaxDetail(maxLevel); - uiLogger.setMaxDetail(maxLevel); + bestLogger = new CompositeTreeLogger(bestLogger, fileLogger); } catch (IOException ex) { bestLogger.log(TreeLogger.ERROR, "Can't log to file " + logFile.getAbsolutePath(), ex); } } - bestLogger.setMaxDetail(maxLevel); logger = bestLogger; KeyStroke key = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_DOWN_MASK); @@ -474,7 +473,7 @@ /** * @return the TreeLogger for this panel */ - public AbstractTreeLogger getLogger() { + public TreeLogger getLogger() { return logger; } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java Wed Nov 4 06:59:39 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/util/log/AbstractTreeLogger.java Thu Nov 5 11:28:20 2009 @@ -84,12 +84,12 @@ return e.getClass().getSimpleName(); } - public int indexWithinMyParent; - protected TreeLogger.Type logLevel = TreeLogger.ALL; protected AbstractTreeLogger parent; + private int indexWithinMyParent; + private int nextChildIndex; private final Object nextChildIndexLock = new Object(); @@ -220,7 +220,7 @@ } logLevel = type; } - + @Override public String toString() { return getLoggerId(); @@ -245,12 +245,12 @@ // Commit the parent first. // parent.commitMyBranchEntryInMyParentLogger(); - + // Let the subclass do its thing to commit this branch. // parent.doCommitBranch(this, uncommitted.type, uncommitted.message, uncommitted.caught, uncommitted.helpInfo); - + // Release the uncommitted state. // uncommitted = null; @@ -267,7 +267,7 @@ * @deprecated This method has been deprecated; override * {...@link #doCommitBranch(AbstractTreeLogger, com.google.gwt.core.ext.TreeLogger.Type, String, Throwable, com.google.gwt.core.ext.TreeLogger.HelpInfo)} * instead. - * + * * @param childBeingCommitted * @param type * @param msg @@ -290,7 +290,7 @@ * @deprecated This method has been deprecated; override * {...@link #branch(com.google.gwt.core.ext.TreeLogger.Type, String, Throwable, com.google.gwt.core.ext.TreeLogger.HelpInfo) * instead. - * + * * @param indexOfLogEntryWithinParentLogger * @param type * @param msg ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/util/log/CompositeTreeLogger.java Mon Nov 2 12:44:54 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/util/log/CompositeTreeLogger.java Thu Nov 5 11:28:20 2009 @@ -15,46 +15,44 @@ */ package com.google.gwt.dev.util.log; +import com.google.gwt.core.ext.TreeLogger; + /** - * Forks logging over two child loggers. This provides the graphics + file + * Forks logging over two child loggers. This provides the graphics + file * logging of HostedModeBase's -logfile option. */ -public class CompositeTreeLogger extends AbstractTreeLogger { - - private AbstractTreeLogger[] loggers; - - public CompositeTreeLogger(AbstractTreeLogger... loggers) { +public class CompositeTreeLogger extends TreeLogger { + + private TreeLogger[] loggers; + + public CompositeTreeLogger(TreeLogger... loggers) { this.loggers = loggers; } @Override - protected AbstractTreeLogger doBranch() { - AbstractTreeLogger children[] = new AbstractTreeLogger[loggers.length]; + public TreeLogger branch(Type type, String msg, Throwable caught, + HelpInfo helpInfo) { + TreeLogger children[] = new TreeLogger[loggers.length]; for (int i = 0; i < loggers.length; i++) { - children[i] = loggers[i].doBranch(); - children[i].indexWithinMyParent = loggers[i].allocateNextChildIndex(); - children[i].parent = loggers[i]; - children[i].logLevel = loggers[i].logLevel; + children[i] = loggers[i].branch(type, msg, caught, helpInfo); } return new CompositeTreeLogger(children); } @Override - protected void doCommitBranch(AbstractTreeLogger childBeingCommitted, - Type type, String msg, Throwable caught, HelpInfo helpInfo) { - CompositeTreeLogger child = (CompositeTreeLogger) childBeingCommitted; - assert loggers.length == child.loggers.length; - for (int i = 0; i < loggers.length; i++) { - loggers[i].doCommitBranch(child.loggers[i], type, msg, caught, helpInfo); - } + public boolean isLoggable(Type type) { + for (TreeLogger logger : loggers) { + if (logger.isLoggable(type)) { + return true; + } + } + return false; } @Override - protected void doLog(int indexOfLogEntryWithinParentLogger, Type type, - String msg, Throwable caught, HelpInfo helpInfo) { - for (AbstractTreeLogger logger : loggers) { - logger.doLog(indexOfLogEntryWithinParentLogger, type, msg, caught, - helpInfo); + public void log(Type type, String msg, Throwable caught, HelpInfo helpInfo) { + for (TreeLogger logger : loggers) { + logger.log(type, msg, caught, helpInfo); } } } --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
