You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by sd...@apache.org on 2004/01/17 00:49:03 UTC
cvs commit: logging-log4j/src/java/org/apache/log4j/net MulticastAppender.java XMLSocketReceiver.java
sdeboy 2004/01/16 15:49:03
Modified: src/java/org/apache/log4j/rule ExpressionRule.java
ExpressionRuleContext.java
src/java/org/apache/log4j/chainsaw LogPanel.java
TableColorizingRenderer.java LogUI.java
JSortTable.java
src/java/org/apache/log4j/chainsaw/filter
EventTypeEntryContainer.java
src/java/org/apache/log4j/net MulticastAppender.java
XMLSocketReceiver.java
Log:
Minor changes - removed unneeded casts, referencing swing constants by their originating classes
Revision Changes Path
1.4 +1 -1 logging-log4j/src/java/org/apache/log4j/rule/ExpressionRule.java
Index: ExpressionRule.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/rule/ExpressionRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExpressionRule.java 15 Jan 2004 07:04:51 -0000 1.3
+++ ExpressionRule.java 16 Jan 2004 23:49:03 -0000 1.4
@@ -137,7 +137,7 @@
//if a symbol is found, pop 2 off the stack, evaluate and push the result
if (factory.isRule(token)) {
- Rule r = (Rule) factory.getRule(token, stack);
+ Rule r = factory.getRule(token, stack);
stack.push(r);
} else {
//variables or constants are pushed onto the stack
1.4 +2 -1 logging-log4j/src/java/org/apache/log4j/rule/ExpressionRuleContext.java
Index: ExpressionRuleContext.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/rule/ExpressionRuleContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExpressionRuleContext.java 8 Jan 2004 07:08:59 -0000 1.3
+++ ExpressionRuleContext.java 16 Jan 2004 23:49:03 -0000 1.4
@@ -53,6 +53,7 @@
import org.apache.log4j.spi.LoggingEventFieldResolver;
import java.awt.Point;
+import java.awt.event.InputEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
@@ -162,7 +163,7 @@
public void keyPressed(KeyEvent e) {
if (
(e.getKeyCode() == KeyEvent.VK_SPACE)
- && (e.getModifiers() == KeyEvent.CTRL_MASK)) {
+ && (e.getModifiers() == InputEvent.CTRL_MASK)) {
displayContext();
}
}
1.49 +6 -4 logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java
Index: LogPanel.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- LogPanel.java 15 Jan 2004 07:04:50 -0000 1.48
+++ LogPanel.java 16 Jan 2004 23:49:03 -0000 1.49
@@ -124,7 +124,9 @@
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@@ -519,7 +521,7 @@
detail.setEditable(false);
detailPaneUpdater = new DetailPaneUpdater(this, detail,
- (EventContainer) tableModel);
+ tableModel);
addPropertyChangeListener("detailPaneConversionPattern",
detailPaneUpdater);
@@ -599,7 +601,7 @@
detailPanel.add(detailPane, BorderLayout.CENTER);
- final JToolBar detailToolbar = new JToolBar(JToolBar.HORIZONTAL);
+ final JToolBar detailToolbar = new JToolBar(SwingConstants.HORIZONTAL);
detailToolbar.setFloatable(false);
final LayoutEditorPane layoutEditorPane = new LayoutEditorPane();
@@ -781,7 +783,7 @@
final JMenuItem menuItemToggleDock = new JMenuItem("Undock/dock");
undockedFrame = new JFrame(ident);
- undockedFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+ undockedFrame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
if (ChainsawIcons.UNDOCKED_ICON != null) {
undockedFrame.setIconImage(new ImageIcon(
@@ -1430,7 +1432,7 @@
int index = 0;
for (Iterator iter = set.iterator(); iter.hasNext(); )
{
- Object logger = (Object) iter.next();
+ Object logger = iter.next();
event.saveSetting("Logger.Ignore." + index++, logger.toString() );
}
saveColumnSettings();
1.13 +3 -2 logging-log4j/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
Index: TableColorizingRenderer.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TableColorizingRenderer.java 8 Jan 2004 07:08:59 -0000 1.12
+++ TableColorizingRenderer.java 16 Jan 2004 23:49:03 -0000 1.13
@@ -67,6 +67,7 @@
import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JTable;
+import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
@@ -99,11 +100,11 @@
this.colorizer = colorizer;
idComponent.setBorder(BorderFactory.createRaisedBevelBorder());
idComponent.setBackground(Color.gray);
- idComponent.setHorizontalAlignment(JLabel.CENTER);
+ idComponent.setHorizontalAlignment(SwingConstants.CENTER);
idComponent.setOpaque(true);
levelComponent.setOpaque(true);
- levelComponent.setHorizontalAlignment(JLabel.CENTER);
+ levelComponent.setHorizontalAlignment(SwingConstants.CENTER);
levelComponent.setText("");
}
1.74 +2 -1 logging-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- LogUI.java 14 Jan 2004 23:15:38 -0000 1.73
+++ LogUI.java 16 Jan 2004 23:49:03 -0000 1.74
@@ -101,6 +101,7 @@
import javax.swing.SwingUtilities;
import javax.swing.ToolTipManager;
import javax.swing.UIManager;
+import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
@@ -1086,7 +1087,7 @@
public void run() {
final JDialog dialog = new JDialog(LogUI.this, true);
dialog.setTitle("Warning: You have no Receivers defined...");
- dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
+ dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
dialog.setResizable(false);
1.7 +2 -2 logging-log4j/src/java/org/apache/log4j/chainsaw/JSortTable.java
Index: JSortTable.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/JSortTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JSortTable.java 31 Dec 2003 09:54:40 -0000 1.6
+++ JSortTable.java 16 Jan 2004 23:49:03 -0000 1.7
@@ -49,6 +49,7 @@
package org.apache.log4j.chainsaw;
+import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
@@ -151,7 +152,6 @@
}
//ignore..out of bounds
}
- ;
});
}
@@ -163,7 +163,7 @@
if(event.getClickCount()<2 || event.isPopupTrigger()){
return;
- }else if(event.getClickCount()>1 && ((event.getModifiers() & MouseEvent.BUTTON2_MASK)>0)){
+ }else if(event.getClickCount()>1 && ((event.getModifiers() & InputEvent.BUTTON2_MASK)>0)){
return;
}
1.4 +1 -1 logging-log4j/src/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
Index: EventTypeEntryContainer.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventTypeEntryContainer.java 30 Oct 2003 07:04:27 -0000 1.3
+++ EventTypeEntryContainer.java 16 Jan 2004 23:49:03 -0000 1.4
@@ -172,7 +172,7 @@
void addMDCKeys(Set keySet) {
if (MDCKeys.addAll(keySet)) {
for (Iterator iter = keySet.iterator(); iter.hasNext();) {
- Object element = (Object) iter.next();
+ Object element = iter.next();
mdcListModel.addElement(element);
}
}
1.4 +4 -7 logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java
Index: MulticastAppender.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MulticastAppender.java 10 Dec 2003 21:35:06 -0000 1.3
+++ MulticastAppender.java 16 Jan 2004 23:49:03 -0000 1.4
@@ -121,17 +121,14 @@
this.address = address;
this.remoteHost = address.getHostName();
this.port = port;
- connect(address, port);
+ connect();
}
/**
Sends multicast packets to the <code>address</code> and <code>port</code>.
*/
public MulticastAppender(String host, int port) {
- this.port = port;
- this.address = getAddressByName(host);
- this.remoteHost = host;
- connect(address, port);
+ this(getAddressByName(host), port);
}
/**
@@ -157,7 +154,7 @@
}
}
- connect(address, port);
+ connect();
}
/**
@@ -190,7 +187,7 @@
}
}
- void connect(InetAddress address, int port) {
+ void connect() {
if (this.address == null) {
return;
}
1.6 +1 -12 logging-log4j/src/java/org/apache/log4j/net/XMLSocketReceiver.java
Index: XMLSocketReceiver.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/XMLSocketReceiver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLSocketReceiver.java 9 Nov 2003 09:59:27 -0000 1.5
+++ XMLSocketReceiver.java 16 Jan 2004 23:49:03 -0000 1.6
@@ -80,7 +80,6 @@
protected int port;
protected boolean active = false;
private boolean paused;
- private boolean shutdown;
//default to log4j xml decoder
protected String decoder = "org.apache.log4j.xml.XMLDecoder";
private ServerSocket serverSocket;
@@ -199,18 +198,8 @@
// close all of the accepted sockets
closeAllAcceptedSockets();
-
- setShutdown(true);
- }
-
- /**
- * @param b
- */
- private void setShutdown(boolean b) {
- shutdown = b;
}
-
/**
* Closes the server socket, if created.
*/
@@ -264,7 +253,7 @@
"error starting SocketReceiver (" + this.getName()
+ "), receiver did not start", e);
active = false;
- setShutdown(true);
+ doShutdown();
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org