cvs commit: jakarta-log4j/src/java/org/apache/log4j/lf5/viewer LogBrokerMonitor.java

bradm       2002/06/26 09:15:16

  Modified:    src/java/org/apache/log4j/lf5/viewer Tag: v1_2-branch
                        LogBrokerMonitor.java
  Log:
  fixed bootstrap loader bug, removed About Dialog box, fixed link to
  channelexplorer_new.gif
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +4 -25     jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/LogBrokerMonitor.java
  
  Index: LogBrokerMonitor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/lf5/viewer/LogBrokerMonitor.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- LogBrokerMonitor.java	26 Apr 2002 15:48:43 -0000	1.1
  +++ LogBrokerMonitor.java	26 Jun 2002 16:15:15 -0000	1.1.2.1
  @@ -12,7 +12,6 @@
   import org.apache.log4j.lf5.LogRecordFilter;
   import org.apache.log4j.lf5.util.DateFormatManager;
   import org.apache.log4j.lf5.util.LogFileParser;
  -import org.apache.log4j.lf5.util.ProductProperties;
   import org.apache.log4j.lf5.util.StreamUtils;
   import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryExplorerTree;
   import org.apache.log4j.lf5.viewer.categoryexplorer.CategoryPath;
  @@ -475,8 +474,6 @@
       //
       // Configure the Frame.
       //
  -    ProductProperties props = ProductProperties.getInstance();
  -
       _logMonitorFrame = new JFrame("LogFactor5");
   
       _logMonitorFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
  @@ -1070,8 +1067,6 @@
       JMenu helpMenu = new JMenu("Help");
       helpMenu.setMnemonic('h');
       helpMenu.add(createHelpProperties());
  -    helpMenu.addSeparator();
  -    helpMenu.add(createHelpAbout());
       return helpMenu;
     }
   
  @@ -1096,25 +1091,6 @@
       );
     }
   
  -  protected JMenuItem createHelpAbout() {
  -    JMenuItem aboutMI = new JMenuItem("About LogFactor5...");
  -    aboutMI.setMnemonic('a');
  -    //aboutMI.setAccelerator( KeyStroke.getKeyStroke("control A") );
  -
  -    aboutMI.addActionListener(
  -        new ActionListener() {
  -          protected LogFactor5AboutDialog dialog =
  -              new LogFactor5AboutDialog(_logMonitorFrame);
  -
  -          public void actionPerformed(ActionEvent e) {
  -            dialog.show();
  -          }
  -        }
  -
  -    );
  -    return aboutMI;
  -  }
  -
     protected JMenu createEditMenu() {
       JMenu editMenu = new JMenu("Edit");
       editMenu.setMnemonic('e');
  @@ -1216,7 +1192,10 @@
       _fontSizeCombo = fontSizeCombo;
   
       ClassLoader cl = this.getClass().getClassLoader();
  -    URL newIconURL = cl.getResource("org/apache/log4j/viewer/" +
  +    if(cl == null) {
  +        cl = ClassLoader.getSystemClassLoader();
  +    }
  +    URL newIconURL = cl.getResource("org/apache/log4j/lf5/viewer/" +
           "images/channelexplorer_new.gif");
   
       ImageIcon newIcon = null;