From general-return-1609-apmail-logging-general-archive=logging.apache.org@logging.apache.org Mon Nov 15 07:18:03 2010 Return-Path: Delivered-To: apmail-logging-general-archive@www.apache.org Received: (qmail 56176 invoked from network); 15 Nov 2010 07:18:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Nov 2010 07:18:03 -0000 Received: (qmail 3411 invoked by uid 500); 15 Nov 2010 07:18:34 -0000 Delivered-To: apmail-logging-general-archive@logging.apache.org Received: (qmail 3263 invoked by uid 500); 15 Nov 2010 07:18:32 -0000 Mailing-List: contact general-help@logging.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Logging General" List-Id: Delivered-To: mailing list general@logging.apache.org Received: (qmail 3255 invoked by uid 99); 15 Nov 2010 07:18:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 07:18:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 07:18:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A54C52388994; Mon, 15 Nov 2010 07:17:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1035160 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: ./ color/ dnd/ favourites/ help/ icons/ layout/ prefs/ receivers/ zeroconf/ Date: Mon, 15 Nov 2010 07:17:15 -0000 To: general@logging.apache.org From: sdeboy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101115071715.A54C52388994@eris.apache.org> Author: sdeboy Date: Mon Nov 15 07:17:14 2010 New Revision: 1035160 URL: http://svn.apache.org/viewvc?rev=1035160&view=rev Log: PMD cleanup and removing unused favourites package & classes Removed: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/favourites/ Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/WelcomePanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java 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=1035160&r1=1035159&r2=1035160&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 15 07:17:14 2010 @@ -17,7 +17,6 @@ package org.apache.log4j.chainsaw; -import java.awt.EventQueue; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java Mon Nov 15 07:17:14 2010 @@ -251,7 +251,7 @@ class ChainsawToolBarAndMenus implements new AbstractAction("Scroll to top") { public void actionPerformed(ActionEvent e) { if (logui.getCurrentLogPanel() != null) { - logui.getCurrentLogPanel().scrollToTop();; + logui.getCurrentLogPanel().scrollToTop(); } } }; Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java Mon Nov 15 07:17:14 2010 @@ -28,7 +28,6 @@ import javax.swing.DefaultListModel; import javax.swing.JList; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; -import javax.swing.JTextField; import javax.swing.ListModel; import javax.swing.text.JTextComponent; Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java Mon Nov 15 07:17:14 2010 @@ -133,7 +133,7 @@ public class LogFilePatternLayoutBuilder } else if (converter instanceof FileLocationPatternConverter) { buffer.append("FILE"); } else if (converter instanceof PropertiesPatternConverter) { - PropertiesPatternConverter propertiesConverter = (PropertiesPatternConverter) converter; +// PropertiesPatternConverter propertiesConverter = (PropertiesPatternConverter) converter; // String option = propertiesConverter.getOption(); // if (option != null && option.length() > 0) { // buffer.append("PROP(" + option + ")"); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java Mon Nov 15 07:17:14 2010 @@ -3851,7 +3851,7 @@ public class LogPanel extends DockablePa private class EventTimeDeltaMatchThumbnail extends AbstractEventMatchThumbnail { public EventTimeDeltaMatchThumbnail() { - super("timedelta"); + super(); initializeLists(); } @@ -3931,7 +3931,7 @@ public class LogPanel extends DockablePa //a listener receiving color updates needs to call configureColors on this class private class ColorizedEventAndSearchMatchThumbnail extends AbstractEventMatchThumbnail { public ColorizedEventAndSearchMatchThumbnail() { - super("colors"); + super(); configureColors(); } @@ -4042,7 +4042,7 @@ public class LogPanel extends DockablePa protected List secondaryList = new ArrayList(); protected final int maxEventHeight = 6; - AbstractEventMatchThumbnail(final String name) { + AbstractEventMatchThumbnail() { super(); addMouseMotionListener(new MouseMotionAdapter() { public void mouseMoved(MouseEvent e) { Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java Mon Nov 15 07:17:14 2010 @@ -33,7 +33,6 @@ import javax.swing.tree.MutableTreeNode; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import org.apache.log4j.chainsaw.helper.SwingHelper; /** @@ -186,10 +185,6 @@ outerFor: public int compare(Object o1, Object o2) { return o1.toString().compareToIgnoreCase(o2.toString()); } - - public boolean equals(Object obj) { - return false; - } }; private LogPanelTreeNode(String logName) { Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java Mon Nov 15 07:17:14 2010 @@ -33,8 +33,6 @@ import java.util.Properties; import javax.swing.table.TableColumn; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; import org.apache.log4j.chainsaw.prefs.SettingsManager; import org.apache.log4j.helpers.Constants; @@ -46,7 +44,6 @@ import org.apache.log4j.helpers.Constant public class LogPanelPreferenceModel implements Serializable{ public static final String ISO8601 = "ISO8601"; public static final Collection DATE_FORMATS; - private static final Logger logger = LogManager.getLogger(LogPanelPreferenceModel.class); private static final long serialVersionUID = 7526472295622776147L; static { Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java Mon Nov 15 07:17:14 2010 @@ -84,7 +84,6 @@ import javax.swing.event.ChangeListener; import javax.swing.event.EventListenerList; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; -import javax.xml.parsers.ParserConfigurationException; import org.apache.log4j.Appender; import org.apache.log4j.AppenderSkeleton; @@ -127,7 +126,6 @@ import org.apache.log4j.spi.LoggingEvent import org.apache.log4j.spi.RepositorySelector; import org.apache.log4j.xml.DOMConfigurator; import org.apache.log4j.xml.XMLDecoder; -import org.xml.sax.SAXException; /** @@ -1815,8 +1813,6 @@ public class LogUI extends JFrame implem if (selectedTab instanceof LogPanel) { return (LogPanel) selectedTab; - } else { - // System.out.println(selectedTab); } return null; @@ -1856,33 +1852,6 @@ public class LogUI extends JFrame implem } /** - * Changes the currently used Look And Feel of the App - * - * @param lookAndFeelClassName - * The FQN of the LookANdFeel - */ - private static void applyLookAndFeel(String lookAndFeelClassName) { - UIManager.put("swing.boldMetal", Boolean.FALSE); - if ( - UIManager.getLookAndFeel().getClass().getName().equals( - lookAndFeelClassName)) { - return; - } - - if ( - (lookAndFeelClassName == null) || lookAndFeelClassName.trim().equals("")) { - lookAndFeelClassName = UIManager.getSystemLookAndFeelClassName(); - } - - try { - UIManager.setLookAndFeel(lookAndFeelClassName); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** * Causes the Welcome Panel to become visible, and shows the URL specified as * it's contents * Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java Mon Nov 15 07:17:14 2010 @@ -159,7 +159,6 @@ final class LoggerNameTreePanel extends private final LogPanel logPanel; private final RuleColorizer colorizer; private Rule ignoreExpressionRule; - private FilterModel filterModel; private boolean expandRootLatch = false; private String currentlySelectedLoggerName; @@ -177,7 +176,6 @@ final class LoggerNameTreePanel extends this.preferenceModel = preferenceModel; this.logPanel = logPanel; this.colorizer = colorizer; - this.filterModel = filterModel; setLayout(new BorderLayout()); ignoreExpressionEntryField.setPreferredSize(new Dimension(300, 150)); @@ -1831,11 +1829,6 @@ final class LoggerNameTreePanel extends { super.firePropertyChange(propertyName, oldVal, newVal); } - - public void firePropertyChange(PropertyChangeEvent evt) - { - super.firePropertyChange(evt); - } } } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java Mon Nov 15 07:17:14 2010 @@ -18,7 +18,6 @@ package org.apache.log4j.chainsaw; import java.awt.Color; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -67,10 +66,8 @@ public class LoggingEventWrapper { public void setProperty(String propName, String propValue) { loggingEvent.setProperty(propName, propValue); - if (id == 0) { - if (propName.equals(Constants.LOG4J_ID_KEY)) { - id = Integer.parseInt(propValue); - } + if (id == 0 && propName.equals(Constants.LOG4J_ID_KEY)) { + id = Integer.parseInt(propValue); } if (syncWrapper != null && !propName.equals(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE)) { syncWrapper.getLoggingEvent().setProperty(propName, propValue); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java Mon Nov 15 07:17:14 2010 @@ -22,11 +22,6 @@ import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Toolkit; -import java.awt.font.FontRenderContext; -import java.awt.font.LineBreakMeasurer; -import java.awt.font.TextLayout; -import java.text.AttributedCharacterIterator; -import java.text.AttributedString; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -443,11 +438,9 @@ public class TableColorizingRenderer ext /** * Colourize background based on row striping if the event still has default foreground and background color */ - if (background.equals(ChainsawConstants.COLOR_DEFAULT_BACKGROUND) && foreground.equals(ChainsawConstants.COLOR_DEFAULT_FOREGROUND)) { - if ((row % 2) != 0) { - background = applicationPreferenceModel.getAlternatingColorBackgroundColor(); - foreground = applicationPreferenceModel.getAlternatingColorForegroundColor(); - } + if (background.equals(ChainsawConstants.COLOR_DEFAULT_BACKGROUND) && foreground.equals(ChainsawConstants.COLOR_DEFAULT_FOREGROUND) && (row % 2) != 0) { + background = applicationPreferenceModel.getAlternatingColorBackgroundColor(); + foreground = applicationPreferenceModel.getAlternatingColorForegroundColor(); } component.setBackground(background); @@ -630,6 +623,7 @@ public class TableColorizingRenderer ext useRelativeTimesToPrevious = false; } + /* private int calculateHeight(String string, int width, Map paramMap) { if (string.trim().length() == 0) { return ChainsawConstants.DEFAULT_ROW_HEIGHT; @@ -646,6 +640,7 @@ public class TableColorizingRenderer ext } return Math.max(ChainsawConstants.DEFAULT_ROW_HEIGHT, (int) height); } + */ private void setHighlightAttributesInternal(Object matchSet, StyledDocument styledDocument) { if (!highlightSearchMatchText) { Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/WelcomePanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/WelcomePanel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/WelcomePanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/WelcomePanel.java Mon Nov 15 07:17:14 2010 @@ -20,7 +20,6 @@ package org.apache.log4j.chainsaw; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.Font; import java.awt.event.ActionEvent; import java.io.IOException; import java.net.URL; @@ -36,7 +35,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JToolBar; import javax.swing.SwingUtilities; -import javax.swing.UIManager; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; @@ -64,7 +62,6 @@ public class WelcomePanel extends JPanel if (helpURL != null) { textInfo.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); - Font font = UIManager.getFont("Label.font"); JScrollPane pane = new JScrollPane(textInfo); pane.setBorder(null); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java Mon Nov 15 07:17:14 2010 @@ -309,10 +309,8 @@ public class ColorPanel extends JPanel } for (Iterator iter = allLogPanelColorizers.entrySet().iterator();iter.hasNext();) { Map.Entry entry = (Map.Entry)iter.next(); - if (!entry.getValue().equals(currentLogPanelColorizer)) { - if (logPanelColorizersModel.getIndexOf(entry.getKey()) == -1) { - logPanelColorizersModel.addElement(entry.getKey()); - } + if (!entry.getValue().equals(currentLogPanelColorizer) && (logPanelColorizersModel.getIndexOf(entry.getKey()) == -1)) { + logPanelColorizersModel.addElement(entry.getKey()); } } //update search and alternating colors, since they may have changed from another color panel Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java Mon Nov 15 07:17:14 2010 @@ -55,7 +55,6 @@ public class FileDnDTarget implements Dr protected int acceptableActions = DnDConstants.ACTION_COPY; - private DropTarget dropTarget; private List fileList; private JComponent guiTarget; @@ -68,7 +67,6 @@ public class FileDnDTarget implements Dr */ public FileDnDTarget(JComponent c) { this.guiTarget = c; - dropTarget = new DropTarget(this.guiTarget, this); } public void addDropTargetToComponent(JComponent c){ Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java Mon Nov 15 07:17:14 2010 @@ -74,14 +74,6 @@ public final class HelpManager { } /** - * @return URL - */ - public final URL getHelpURL() { - - return helpURL; - } - - /** * The current Help URL that should be displayed, and is * a PropertyChangeListener supported property. * @@ -90,7 +82,7 @@ public final class HelpManager { * of the event will be null) * @param helpURL */ - public final void setHelpURL(URL helpURL) { + public void setHelpURL(URL helpURL) { this.helpURL = helpURL; firePropertyChange("helpURL", null, this.helpURL); } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java Mon Nov 15 07:17:14 2010 @@ -48,7 +48,7 @@ public final class LineIconFactory { private LineIconFactory() { } - public static final Icon createExpandIcon() { + public static Icon createExpandIcon() { int size = 8; int xOffSet = 0; int yOffSet = 0; @@ -80,7 +80,7 @@ public final class LineIconFactory { return null; } - public static final Icon createCollapseIcon() { + public static Icon createCollapseIcon() { int size = 8; int xOffSet = 0; int yOffSet = 0; @@ -109,11 +109,11 @@ public final class LineIconFactory { return null; } - public static final Icon createCloseIcon() { + public static Icon createCloseIcon() { return new CloseIcon(8, 0, 0); } - public static final Icon createBlankIcon() { + public static Icon createBlankIcon() { return new BlankIcon(16); } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java Mon Nov 15 07:17:14 2010 @@ -177,7 +177,6 @@ public class EventDetailLayout extends L * @return new LoggingEvent */ private static LoggingEvent copyForHTML(LoggingEvent event) { - String fqnCategory = escape(event.getFQNOfLoggerClass()); Logger logger = Logger.getLogger(event.getLoggerName()); String threadName = event.getThreadName(); Object msg = escape(event.getMessage().toString()); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java Mon Nov 15 07:17:14 2010 @@ -33,7 +33,6 @@ import com.thoughtworks.xstream.io.xml.D public class MRUFileList{ private static MRUFileList log4jList = new MRUFileList(); - private static MRUFileList jdk14List = new MRUFileList(); private static final int DEFAULT_MRU_SIZE = 5; private List fileList = new ArrayList(); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java Mon Nov 15 07:17:14 2010 @@ -79,7 +79,7 @@ public final class SettingsManager { * Returns the singleton instance of the SettingsManager * @return settings manager */ - public static final SettingsManager getInstance() { + public static SettingsManager getInstance() { return instance; } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java Mon Nov 15 07:17:14 2010 @@ -18,7 +18,6 @@ package org.apache.log4j.chainsaw.receiv import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.BeanInfo; Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java Mon Nov 15 07:17:14 2010 @@ -23,11 +23,8 @@ import java.util.List; import javax.jmdns.ServiceEvent; import javax.jmdns.ServiceInfo; import javax.jmdns.ServiceListener; -import javax.swing.ImageIcon; import javax.swing.table.AbstractTableModel; -import org.apache.log4j.chainsaw.icons.ChainsawIcons; - public class ZeroConfDeviceModel extends AbstractTableModel implements ServiceListener { private List deviceList = new ArrayList(); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java Mon Nov 15 07:17:14 2010 @@ -18,7 +18,6 @@ package org.apache.log4j.chainsaw.zeroco import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Container; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -36,7 +35,6 @@ import javax.jmdns.ServiceEvent; import javax.jmdns.ServiceInfo; import javax.jmdns.ServiceListener; import javax.swing.AbstractAction; -import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JMenu; @@ -44,7 +42,6 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; -import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JToolBar; import javax.swing.SwingUtilities; @@ -93,8 +90,6 @@ public class ZeroConfPlugin extends GUIP private static final Logger LOG = Logger.getLogger(ZeroConfPlugin.class); - private static final Icon DEVICE_DISCOVERED_ICON = new ImageIcon(ChainsawIcons.ANIM_RADIO_TOWER); - private ZeroConfDeviceModel discoveredDevices = new ZeroConfDeviceModel(); private JTable deviceTable = new JTable(discoveredDevices); @@ -226,21 +221,6 @@ public class ZeroConfPlugin extends GUIP } /** - * Sets the icon of this parent container (a JTabbedPane, we hope - * - */ - private void setIconIfNeeded() { - Container container = this.getParent(); - if(container instanceof JTabbedPane) { - JTabbedPane tabbedPane = (JTabbedPane) container; - Icon icon = discoveredDevices.getRowCount()==0?null:DEVICE_DISCOVERED_ICON; - tabbedPane.setIconAt(tabbedPane.indexOfTab(getName()), icon); - }else { - LOG.warn("Parent is not a TabbedPane, not setting icon: " + container.getClass().getName()); - } - } - - /** * Attempts to find a JFrame container as a parent,and addse a "Connect to" menu * */ Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java?rev=1035160&r1=1035159&r2=1035160&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java Mon Nov 15 07:17:14 2010 @@ -16,7 +16,6 @@ */ package org.apache.log4j.chainsaw.zeroconf; -import java.beans.PropertyChangeSupport; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -27,7 +26,6 @@ public class ZeroConfPreferenceModel { private List monitoredZones = new ArrayList(); private Set autoConnectDevices = new HashSet(); - private transient PropertyChangeSupport propertySupport = new PropertyChangeSupport(this); // TODO expose addPropertyChangeListener public void addAutoConnectDevice(String deviceName) {