sdeboy 2003/06/10 12:38:19
Modified: src/java/org/apache/log4j/chainsaw
AbstractChainsawTableModel.java
ChainsawCyclicBufferTableModel.java
ColorDisplaySelector.java LogUI.java
WelcomePanel.java
Log:
- removed unneeded imports
- add null check during hide of splash window
- reset the row ID generation in the model if the model is cleared
Revision Changes Path
1.8 +0 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/AbstractChainsawTableModel.java
Index: AbstractChainsawTableModel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/AbstractChainsawTableModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractChainsawTableModel.java 9 Jun 2003 03:23:26 -0000 1.7
+++ AbstractChainsawTableModel.java 10 Jun 2003 19:38:19 -0000 1.8
@@ -54,7 +54,6 @@
import java.util.Vector;
import javax.swing.SwingUtilities;
-import javax.swing.event.TableModelEvent;
import javax.swing.table.AbstractTableModel;
1.13 +1 -0
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
Index: ChainsawCyclicBufferTableModel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChainsawCyclicBufferTableModel.java 10 Jun 2003 04:45:51 -0000 1.12
+++ ChainsawCyclicBufferTableModel.java 10 Jun 2003 19:38:19 -0000 1.13
@@ -122,6 +122,7 @@
synchronized (syncLock) {
unfilteredList.clear();
filteredList.clear();
+ uniqueRow = 0;
}
fireTableDataChanged();
notifyCountListeners();
1.5 +0 -4
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ColorDisplaySelector.java
Index: ColorDisplaySelector.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ColorDisplaySelector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ColorDisplaySelector.java 3 Jun 2003 06:32:58 -0000 1.4
+++ ColorDisplaySelector.java 10 Jun 2003 19:38:19 -0000 1.5
@@ -59,9 +59,6 @@
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -84,7 +81,6 @@
import java.util.Set;
import java.util.Vector;
-import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.ButtonGroup;
1.91 +4 -6
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- LogUI.java 9 Jun 2003 03:23:25 -0000 1.90
+++ LogUI.java 10 Jun 2003 19:38:19 -0000 1.91
@@ -55,8 +55,6 @@
import org.apache.log4j.UtilLoggingLevel;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
-import org.apache.log4j.chainsaw.prefs.ProfileManager;
-import org.apache.log4j.chainsaw.prefs.Profileable;
import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SettingsListener;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
@@ -140,7 +138,6 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.event.TableColumnModelEvent;
import javax.swing.event.TableColumnModelListener;
-import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
@@ -234,9 +231,10 @@
}
private static final void removeSplash() {
- splash.setVisible(false);
-
- splash.dispose();
+ if (splash != null) {
+ splash.setVisible(false);
+ splash.dispose();
+ }
}
/**
1.4 +0 -2
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/WelcomePanel.java
Index: WelcomePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/WelcomePanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WelcomePanel.java 2 Jun 2003 04:23:07 -0000 1.3
+++ WelcomePanel.java 10 Jun 2003 19:38:19 -0000 1.4
@@ -51,7 +51,6 @@
import java.awt.Color;
import java.awt.Dimension;
-import java.io.IOException;
import java.net.URL;
import javax.swing.BorderFactory;
@@ -59,7 +58,6 @@
import javax.swing.JEditorPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
