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 ps...@apache.org on 2003/05/01 04:37:24 UTC
cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw ChainsawConstants.java LogUI.java
psmith 2003/04/30 19:37:24
Modified: src/java/org/apache/log4j/chainsaw LogUI.java
Added: src/java/org/apache/log4j/chainsaw ChainsawConstants.java
Log:
Moved all String based constants to a package private constants class
ChainsawConstants, and added that new file to the repository.
Revision Changes Path
1.10 +69 -102 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LogUI.java 30 Apr 2003 23:26:42 -0000 1.9
+++ LogUI.java 1 May 2003 02:37:24 -0000 1.10
@@ -125,40 +125,7 @@
*
*/
public class LogUI extends JFrame implements ChainsawViewer {
- private static final String MAIN_PANEL = "panel";
- private static final String LOWER_PANEL = "lower";
- private static final String UPPER_PANEL = "upper";
- private static final String EMPTY_STRING = "";
- private static final String SETTINGS_EXTENSION = ".settings";
-
- //COLUMN NAMES
- private static final String LOGGER_COL_NAME = "Logger";
- private static final String TIMESTAMP_COL_NAME = "Timestamp";
- private static final String LEVEL_COL_NAME = "Level";
- private static final String THREAD_COL_NAME = "Thread";
- private static final String MESSAGE_COL_NAME = "Message";
- private static final String NDC_COL_NAME = "NDC";
- private static final String MDC_COL_NAME = "MDC";
- private static final String THROWABLE_COL_NAME = "Throwable";
- private static final String CLASS_COL_NAME = "Class";
- private static final String METHOD_COL_NAME = "Method";
- private static final String FILE_COL_NAME = "File";
- private static final String LINE_COL_NAME = "Line";
- private static final String PROPERTIES_COL_NAME = "Properties";
- private static final String ID_COL_NAME = "ID";
-
- //none is not a real column name, but is used by filters as a way to apply no filter for colors or display
- private static final String NONE_COL_NAME = "None";
- private static final String DEBUG_LEVEL = "DEBUG";
- private static final String INFO_LEVEL = "INFO";
- private static final String WARN_LEVEL = "WARN";
- private static final String ERROR_LEVEL = "ERROR";
- private static final String FATAL_LEVEL = "FATAL";
- private static final String LOG4J_APP_KEY = "log4japp";
- static final String LOG4J_MACHINE_KEY = "log4jmachinename";
- private static final String UNKNOWN_TAB_NAME = "Unknown";
- private static final String GLOBAL_MATCH = "*";
- private static final String DETAIL_CONTENT_TYPE = "text/html";
+
private JTabbedPane tabbedPane;
private final Map tableModelMap = new HashMap();
private final Map tableMap = new HashMap();
@@ -188,7 +155,7 @@
JMenuItem menuItemUseRightMouse=new JMenuItem("Other options available via panel's right mouse button popup menu");
menuItemUseRightMouse.setEnabled(false);
menuItemClose.addActionListener(
- new AbstractAction() {
+ new AbstractAction() {
public void actionPerformed(ActionEvent e) {
JPanel somepanel = (JPanel) tabbedPane.getSelectedComponent();
@@ -243,38 +210,38 @@
setSize(new Dimension(500, 500));
setLocation(500, 150);
- names.add(LOGGER_COL_NAME);
- names.add(TIMESTAMP_COL_NAME);
- names.add(LEVEL_COL_NAME);
- names.add(THREAD_COL_NAME);
- names.add(MESSAGE_COL_NAME);
- names.add(NDC_COL_NAME);
- names.add(MDC_COL_NAME);
- names.add(THROWABLE_COL_NAME);
- names.add(CLASS_COL_NAME);
- names.add(METHOD_COL_NAME);
- names.add(FILE_COL_NAME);
- names.add(LINE_COL_NAME);
- names.add(PROPERTIES_COL_NAME);
+ names.add(ChainsawConstants.LOGGER_COL_NAME);
+ names.add(ChainsawConstants.TIMESTAMP_COL_NAME);
+ names.add(ChainsawConstants.LEVEL_COL_NAME);
+ names.add(ChainsawConstants.THREAD_COL_NAME);
+ names.add(ChainsawConstants.MESSAGE_COL_NAME);
+ names.add(ChainsawConstants.NDC_COL_NAME);
+ names.add(ChainsawConstants.MDC_COL_NAME);
+ names.add(ChainsawConstants.THROWABLE_COL_NAME);
+ names.add(ChainsawConstants.CLASS_COL_NAME);
+ names.add(ChainsawConstants.METHOD_COL_NAME);
+ names.add(ChainsawConstants.FILE_COL_NAME);
+ names.add(ChainsawConstants.LINE_COL_NAME);
+ names.add(ChainsawConstants.PROPERTIES_COL_NAME);
//NOTE: ID must ALWAYS be last field because the model adds this value itself as an identifier to the end of the consructed vector
- names.add(ID_COL_NAME);
+ names.add(ChainsawConstants.ID_COL_NAME);
- levelList.add(DEBUG_LEVEL);
- levelList.add(INFO_LEVEL);
- levelList.add(WARN_LEVEL);
- levelList.add(ERROR_LEVEL);
- levelList.add(FATAL_LEVEL);
-
- filterableColumns.add(LEVEL_COL_NAME);
- filterableColumns.add(LOGGER_COL_NAME);
- filterableColumns.add(THREAD_COL_NAME);
- filterableColumns.add(NDC_COL_NAME);
- filterableColumns.add(MDC_COL_NAME);
- filterableColumns.add(CLASS_COL_NAME);
- filterableColumns.add(METHOD_COL_NAME);
- filterableColumns.add(FILE_COL_NAME);
- filterableColumns.add(NONE_COL_NAME);
+ levelList.add(ChainsawConstants.DEBUG_LEVEL);
+ levelList.add(ChainsawConstants.INFO_LEVEL);
+ levelList.add(ChainsawConstants.WARN_LEVEL);
+ levelList.add(ChainsawConstants.ERROR_LEVEL);
+ levelList.add(ChainsawConstants.FATAL_LEVEL);
+
+ filterableColumns.add(ChainsawConstants.LEVEL_COL_NAME);
+ filterableColumns.add(ChainsawConstants.LOGGER_COL_NAME);
+ filterableColumns.add(ChainsawConstants.THREAD_COL_NAME);
+ filterableColumns.add(ChainsawConstants.NDC_COL_NAME);
+ filterableColumns.add(ChainsawConstants.MDC_COL_NAME);
+ filterableColumns.add(ChainsawConstants.CLASS_COL_NAME);
+ filterableColumns.add(ChainsawConstants.METHOD_COL_NAME);
+ filterableColumns.add(ChainsawConstants.FILE_COL_NAME);
+ filterableColumns.add(ChainsawConstants.NONE_COL_NAME);
JPanel panePanel = new JPanel();
panePanel.setLayout(new BorderLayout());
@@ -311,10 +278,10 @@
* @return
*/
private String getTabIdentifier(Vector v) {
- int fieldIndex = names.indexOf(PROPERTIES_COL_NAME);
+ int fieldIndex = names.indexOf(ChainsawConstants.PROPERTIES_COL_NAME);
String properties = (String) v.get(fieldIndex);
- String machinekey = LOG4J_MACHINE_KEY + "=";
+ String machinekey = ChainsawConstants.LOG4J_MACHINE_KEY + "=";
String machinename = null;
int machineposition = properties.indexOf(machinekey) + machinekey.length();
int machinelength = properties.indexOf(",", machineposition);
@@ -343,7 +310,7 @@
}
}
- String appkey = LOG4J_APP_KEY + "=";
+ String appkey = ChainsawConstants.LOG4J_APP_KEY + "=";
String appname = null;
int appposition = properties.indexOf(appkey) + appkey.length();
@@ -369,7 +336,7 @@
}
if (ident.length() == 0) {
- ident.append(UNKNOWN_TAB_NAME);
+ ident.append(ChainsawConstants.UNKNOWN_TAB_NAME);
}
return ident.toString();
@@ -396,7 +363,7 @@
private Vector formatFields(Vector v) {
for (int i = 0; i < v.size(); i++) {
if (v.get(i) == null) {
- v.set(i, EMPTY_STRING);
+ v.set(i, ChainsawConstants.EMPTY_STRING);
}
}
@@ -416,7 +383,7 @@
try {
s = new ObjectInputStream(
new BufferedInputStream(
- new FileInputStream(new File(ident + SETTINGS_EXTENSION))));
+ new FileInputStream(new File(ident + ChainsawConstants.SETTINGS_EXTENSION))));
d = (DisplayFilter) s.readObject();
} catch (IOException ioe) {
} catch (ClassNotFoundException cnfe) {
@@ -465,20 +432,20 @@
System.out.println("Creating tab " + ident);
}
- ((HashSet) map.get(LOGGER_COL_NAME)).add(
- v.get(names.indexOf(LOGGER_COL_NAME)));
- ((HashSet) map.get(LEVEL_COL_NAME)).add(
- v.get(names.indexOf(LEVEL_COL_NAME)));
- ((HashSet) map.get(THREAD_COL_NAME)).add(
- v.get(names.indexOf(THREAD_COL_NAME)));
- ((HashSet) map.get(NDC_COL_NAME)).add(v.get(names.indexOf(NDC_COL_NAME)));
- ((HashSet) map.get(MDC_COL_NAME)).add(v.get(names.indexOf(MDC_COL_NAME)));
- ((HashSet) map.get(CLASS_COL_NAME)).add(
- v.get(names.indexOf(CLASS_COL_NAME)));
- ((HashSet) map.get(METHOD_COL_NAME)).add(
- v.get(names.indexOf(METHOD_COL_NAME)));
- ((HashSet) map.get(FILE_COL_NAME)).add(
- v.get(names.indexOf(FILE_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.LOGGER_COL_NAME)).add(
+ v.get(names.indexOf(ChainsawConstants.LOGGER_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.LEVEL_COL_NAME)).add(
+ v.get(names.indexOf(ChainsawConstants.LEVEL_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.THREAD_COL_NAME)).add(
+ v.get(names.indexOf(ChainsawConstants.THREAD_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.NDC_COL_NAME)).add(v.get(names.indexOf(ChainsawConstants.NDC_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.MDC_COL_NAME)).add(v.get(names.indexOf(ChainsawConstants.MDC_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.CLASS_COL_NAME)).add(
+ v.get(names.indexOf(ChainsawConstants.CLASS_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.METHOD_COL_NAME)).add(
+ v.get(names.indexOf(ChainsawConstants.METHOD_COL_NAME)));
+ ((HashSet) map.get(ChainsawConstants.FILE_COL_NAME)).add(
+ v.get(names.indexOf(ChainsawConstants.FILE_COL_NAME)));
table.getSelectionModel().setValueIsAdjusting(true);
@@ -568,17 +535,17 @@
final String ident, final DefaultSortTableModel tableModel,
final JSortTable table, final ScrollToBottom scrollToBottom,
final Map map) {
- map.put(LEVEL_COL_NAME, levelSet);
+ map.put(ChainsawConstants.LEVEL_COL_NAME, levelSet);
levelSet.addAll(levelList);
- map.put(LOGGER_COL_NAME, loggerSet);
- map.put(THREAD_COL_NAME, threadSet);
- map.put(NDC_COL_NAME, NDCSet);
- map.put(MDC_COL_NAME, MDCSet);
- map.put(CLASS_COL_NAME, classSet);
- map.put(METHOD_COL_NAME, methodSet);
- map.put(FILE_COL_NAME, fileSet);
- map.put(NONE_COL_NAME, noneSet);
+ map.put(ChainsawConstants.LOGGER_COL_NAME, loggerSet);
+ map.put(ChainsawConstants.THREAD_COL_NAME, threadSet);
+ map.put(ChainsawConstants.NDC_COL_NAME, NDCSet);
+ map.put(ChainsawConstants.MDC_COL_NAME, MDCSet);
+ map.put(ChainsawConstants.CLASS_COL_NAME, classSet);
+ map.put(ChainsawConstants.METHOD_COL_NAME, methodSet);
+ map.put(ChainsawConstants.FILE_COL_NAME, fileSet);
+ map.put(ChainsawConstants.NONE_COL_NAME, noneSet);
setLayout(new BorderLayout());
displayFilter = loadDisplayFilter(ident);
@@ -743,7 +710,7 @@
col.setPreferredWidth(300);
}
- final JEditorPane detail = new JEditorPane(DETAIL_CONTENT_TYPE, "");
+ final JEditorPane detail = new JEditorPane(ChainsawConstants.DETAIL_CONTENT_TYPE, "");
detail.setEditable(false);
final DetailThread detailThread = new DetailThread(detail, tableModel);
@@ -818,7 +785,7 @@
displayFilter.setCustomFilter(
new DisplayFilterEntry(
(String) customFilterList.getSelectedItem(),
- filterText.getText(), GLOBAL_MATCH, Boolean.TRUE));
+ filterText.getText(), ChainsawConstants.GLOBAL_MATCH, Boolean.TRUE));
}
}
});
@@ -1040,9 +1007,9 @@
new WindowAdapter() {
public void windowClosing(WindowEvent event) {
HashMap m = new HashMap();
- m.put(MAIN_PANEL, LogPanel.this);
- m.put(UPPER_PANEL, upperPanel);
- m.put(LOWER_PANEL, lowerPanel);
+ m.put(ChainsawConstants.MAIN_PANEL, LogPanel.this);
+ m.put(ChainsawConstants.UPPER_PANEL, upperPanel);
+ m.put(ChainsawConstants.LOWER_PANEL, lowerPanel);
lostMap.put(ident, m);
}
});
@@ -1121,7 +1088,7 @@
String colName = tableModel.getColumnName(column);
String value = "";
- if (colName.equalsIgnoreCase(TIMESTAMP_COL_NAME)) {
+ if (colName.equalsIgnoreCase(ChainsawConstants.TIMESTAMP_COL_NAME)) {
JComponent comp =
(JComponent) table.getCellRenderer(row, column);
@@ -1176,9 +1143,9 @@
Map.Entry m = (Map.Entry) iter.next();
String title = (String) m.getKey();
HashMap map = (HashMap) m.getValue();
- JSplitPane lower = (JSplitPane) map.get(LOWER_PANEL);
- JPanel upper = (JPanel) map.get(UPPER_PANEL);
- DockablePanel thisPanel = (DockablePanel) map.get(MAIN_PANEL);
+ JSplitPane lower = (JSplitPane) map.get(ChainsawConstants.LOWER_PANEL);
+ JPanel upper = (JPanel) map.get(ChainsawConstants.UPPER_PANEL);
+ DockablePanel thisPanel = (DockablePanel) map.get(ChainsawConstants.MAIN_PANEL);
thisPanel.add(upper, BorderLayout.NORTH);
thisPanel.add(lower, BorderLayout.CENTER);
panelMap.put(title, thisPanel);
1.1 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawConstants.java
Index: ChainsawConstants.java
===================================================================
/*
* @author Paul Smith <ps...@apache.org>
*
*/
package org.apache.log4j.chainsaw;
/**
* @author Paul Smith <ps...@apache.org>
*
*/
class ChainsawConstants {
private ChainsawConstants(){}
static final String MAIN_PANEL = "panel";
static final String LOWER_PANEL = "lower";
static final String UPPER_PANEL = "upper";
static final String EMPTY_STRING = "";
static final String SETTINGS_EXTENSION = ".settings";
//COLUMN NAMES
static final String LOGGER_COL_NAME = "Logger";
static final String TIMESTAMP_COL_NAME = "Timestamp";
static final String LEVEL_COL_NAME = "Level";
static final String THREAD_COL_NAME = "Thread";
static final String MESSAGE_COL_NAME = "Message";
static final String NDC_COL_NAME = "NDC";
static final String MDC_COL_NAME = "MDC";
static final String THROWABLE_COL_NAME = "Throwable";
static final String CLASS_COL_NAME = "Class";
static final String METHOD_COL_NAME = "Method";
static final String FILE_COL_NAME = "File";
static final String LINE_COL_NAME = "Line";
static final String PROPERTIES_COL_NAME = "Properties";
static final String ID_COL_NAME = "ID";
//none is not a real column name, but is used by filters as a way to apply no filter for colors or display
static final String NONE_COL_NAME = "None";
static final String DEBUG_LEVEL = "DEBUG";
static final String INFO_LEVEL = "INFO";
static final String WARN_LEVEL = "WARN";
static final String ERROR_LEVEL = "ERROR";
static final String FATAL_LEVEL = "FATAL";
static final String LOG4J_APP_KEY = "log4japp";
static final String LOG4J_MACHINE_KEY = "log4jmachinename";
static final String UNKNOWN_TAB_NAME = "Unknown";
static final String GLOBAL_MATCH = "*";
static final String DETAIL_CONTENT_TYPE = "text/html";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org