Author: sdeboy
Date: Mon Nov 16 06:51:00 2009
New Revision: 880629
URL: http://svn.apache.org/viewvc?rev=880629&view=rev
Log:
Minor changes to give more room to auto config URL field
Prevent/log situations that were triggering uncaught exceptions
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java?rev=880629&r1=880628&r2=880629&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
(original)
+++
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
Mon Nov 16 06:51:00 2009
@@ -419,7 +419,7 @@
configurationURL = new JComboBox(new
DefaultComboBoxModel(committedPreferenceModel.getConfigurationURLs()));
configurationURL.setEditable(true);
configurationURL.setPrototypeDisplayValue("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
- configurationURL.setPreferredSize(new Dimension(375, 15));
+ configurationURL.setPreferredSize(new Dimension(375, 13));
identifierExpression = new JTextField(30);
toolTipDisplayMillis = new JTextField(8);
@@ -480,7 +480,7 @@
Box p6 = new Box(BoxLayout.Y_AXIS);
Box configURLPanel = new Box(BoxLayout.X_AXIS);
- JLabel configLabel = new JLabel("Automatic Configuration URL");
+ JLabel configLabel = new JLabel("Auto Config URL");
configURLPanel.add(configLabel);
configURLPanel.add(Box.createHorizontalStrut(5));
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java?rev=880629&r1=880628&r2=880629&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
(original)
+++
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
Mon Nov 16 06:51:00 2009
@@ -626,6 +626,10 @@
case ChainsawColumns.INDEX_THROWABLE_COL_NAME:
return true;
}
+
+ if (columnIndex >= columnNames.size()) {
+ return false;
+ }
String columnName = getColumnName(columnIndex);
if
(columnName.toLowerCase().equals(ChainsawConstants.MARKER_PROPERTY_NAME)) {
return true;
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java?rev=880629&r1=880628&r2=880629&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
(original)
+++
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
Mon Nov 16 06:51:00 2009
@@ -52,7 +52,10 @@
URL url = this.getClass().getClassLoader().getResource(
this.getClass().getPackage().getName().replace('.','/') +
"/known.receivers");
-
+ if (url == null) {
+ logger.warn("Failed to locate known.receivers file");
+ return;
+ }
LineNumberReader stream = null;
try {
