psmith      2003/12/30 23:05:33

  Modified:    src/java/org/apache/log4j/chainsaw LogUI.java
  Log:
  mangled a merge, this fixes it.
  
  Revision  Changes    Path
  1.67      +3 -3      jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java
  
  Index: LogUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- LogUI.java        31 Dec 2003 07:03:34 -0000      1.66
  +++ LogUI.java        31 Dec 2003 07:05:33 -0000      1.67
  @@ -277,7 +277,7 @@
       
       applyLookAndFeel(model.getLookAndFeelClassName());
       
  -    createChainsawGUI(model, true, null);
  +    createChainsawGUI(model, null);
     }
   
     /**
  @@ -290,10 +290,10 @@
      *                    DOCUMENT ME!
      */
     public static void createChainsawGUI(ApplicationPreferenceModel model,
  -    boolean showSplash, Action shutdownAction) {
  +    Action shutdownAction) {
       LogUI logUI = new LogUI();
   
  -    if (showSplash) {
  +    if (model.isShowSplash()) {
         showSplash(logUI);
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to