logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From psm...@apache.org
Subject cvs commit: jakarta-log4j/src/java/org/apache/log4j/chainsaw/color ColorPanel.java
Date Tue, 16 Dec 2003 00:45:26 GMT
psmith      2003/12/15 16:45:26

  Modified:    src/java/org/apache/log4j/chainsaw LoggerNameTreePanel.java
                        LogPanelPreferencePanel.java JSortTable.java
                        FileLoadAction.java ApplicationPreferenceModel.java
                        ApplicationPreferenceModelPanel.java
               src/java/org/apache/log4j/chainsaw/color ColorPanel.java
  Log:
  addressed some compatibility issues with JDK 1.3.1.
  
  Thanks to Raymond DeCampo for keeping us in check.
  
  Revision  Changes    Path
  1.20      +9 -1      jakarta-log4j/src/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
  
  Index: LoggerNameTreePanel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- LoggerNameTreePanel.java	14 Dec 2003 20:35:09 -0000	1.19
  +++ LoggerNameTreePanel.java	16 Dec 2003 00:45:26 -0000	1.20
  @@ -1031,7 +1031,15 @@
           //        component.setEnabled(true);
         }
   
  -      component.setFont(originalFont.deriveFont(style));
  +      if (originalFont!=null)
  +      {
  +        Font font2 = originalFont.deriveFont(style);
  +        if (font2 != null)
  +        {
  +          component.setFont(font2);
  +        }
  +        
  +      }
   
         return component;
       }
  
  
  
  1.13      +2 -1      jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
  
  Index: LogPanelPreferencePanel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- LogPanelPreferencePanel.java	12 Dec 2003 10:31:37 -0000	1.12
  +++ LogPanelPreferencePanel.java	16 Dec 2003 00:45:26 -0000	1.13
  @@ -314,7 +314,8 @@
         bgDateFormat.add(rdCustom);
   
         Box customBox = Box.createHorizontalBox();
  -      customBox.setAlignmentX(0);
  +//      Following does not work in JDK 1.3.1
  +//      customBox.setAlignmentX(0);
         customBox.add(rdCustom);
         customBox.add(customFormatText);
         customBox.add(Box.createHorizontalGlue());
  
  
  
  1.5       +1 -1      jakarta-log4j/src/java/org/apache/log4j/chainsaw/JSortTable.java
  
  Index: JSortTable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/JSortTable.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JSortTable.java	4 Dec 2003 08:53:02 -0000	1.4
  +++ JSortTable.java	16 Dec 2003 00:45:26 -0000	1.5
  @@ -164,7 +164,7 @@
     	
     	if(event.getClickCount()<2 || event.isPopupTrigger()){
     		return;
  -  	}else if(event.getClickCount()>1 && event.getButton() == MouseEvent.BUTTON2_MASK){
  +  	}else if(event.getClickCount()>1 && ((event.getModifiers() & MouseEvent.BUTTON2_MASK)>0)){
     		return;
     	}
     	
  
  
  
  1.6       +1 -2      jakarta-log4j/src/java/org/apache/log4j/chainsaw/FileLoadAction.java
  
  Index: FileLoadAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/FileLoadAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileLoadAction.java	10 Dec 2003 21:35:06 -0000	1.5
  +++ FileLoadAction.java	16 Dec 2003 00:45:26 -0000	1.6
  @@ -171,8 +171,7 @@
         String urltext =
           JOptionPane.showInputDialog(
             parent,
  -          "<html>Please type in the <b>complete</b> URL to the remote
XML source.</html>",
  -          "file://");
  +          "<html>Please type in the <b>complete</b> URL to the remote
XML source.</html>");
   
         if (urltext != null) {
           try {
  
  
  
  1.7       +0 -17     jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
  
  Index: ApplicationPreferenceModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationPreferenceModel.java	14 Dec 2003 21:27:38 -0000	1.6
  +++ ApplicationPreferenceModel.java	16 Dec 2003 00:45:26 -0000	1.7
  @@ -134,23 +134,6 @@
       }
   
       /**
  -     * @return
  -     */
  -    public PropertyChangeListener[] getPropertyChangeListeners() {
  -
  -        return propertySupport.getPropertyChangeListeners();
  -    }
  -
  -    /**
  -     * @param propertyName
  -     * @return
  -     */
  -    public PropertyChangeListener[] getPropertyChangeListeners(
  -        String propertyName) {
  -        return propertySupport.getPropertyChangeListeners(propertyName);
  -    }
  -
  -    /**
        * @param propertyName
        * @return
        */
  
  
  
  1.6       +2 -1      jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
  
  Index: ApplicationPreferenceModelPanel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ApplicationPreferenceModelPanel.java	14 Dec 2003 21:27:38 -0000	1.5
  +++ ApplicationPreferenceModelPanel.java	16 Dec 2003 00:45:26 -0000	1.6
  @@ -259,7 +259,8 @@
           
           
           
  -        Box tabPlacementBox = new Box(BoxLayout.Y_AXIS);
  +        JPanel tabPlacementBox = new JPanel();
  +        tabPlacementBox.setLayout(new BoxLayout(tabPlacementBox, BoxLayout.Y_AXIS));
           
           tabPlacementBox.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
"Tab Placement"));
          
  
  
  
  1.11      +2 -1      jakarta-log4j/src/java/org/apache/log4j/chainsaw/color/ColorPanel.java
  
  Index: ColorPanel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/color/ColorPanel.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ColorPanel.java	14 Dec 2003 20:35:09 -0000	1.10
  +++ ColorPanel.java	16 Dec 2003 00:45:26 -0000	1.11
  @@ -205,7 +205,8 @@
           }
         });
   
  -    f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
  +//    Following does not compile on JDK 1.3.1
  +//    f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
       f.getContentPane().add(p);
       f.pack();
       f.setVisible(true);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org


Mime
View raw message