Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils: [547] trunk/openutils-log4j/src/main/java/it/ openutils/log4j
|
From: <fg...@us...> - 2008-01-26 18:12:56
|
Revision: 547
http://openutils.svn.sourceforge.net/openutils/?rev=547&view=rev
Author: fgiust
Date: 2008-01-26 10:13:01 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
generics
Modified Paths:
--------------
trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java
trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java 2008-01-26 18:05:51 UTC (rev 546)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java 2008-01-26 18:13:01 UTC (rev 547)
@@ -129,6 +129,7 @@
return datePattern;
}
+ @Override
public void activateOptions()
{
super.activateOptions();
@@ -302,6 +303,7 @@
* Before actually logging, this method will check whether it is time to do a rollover. If it is, it will schedule
* the next rollover time and then rollover.
*/
+ @Override
protected void subAppend(LoggingEvent event)
{
long n = System.currentTimeMillis();
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java 2008-01-26 18:05:51 UTC (rev 546)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java 2008-01-26 18:13:01 UTC (rev 547)
@@ -46,14 +46,14 @@
{
/**
- * Holds the list of filtered frames.
+ * Line separator for stacktrace frames.
*/
- private Set filteredFrames = new HashSet();
+ private static String lineSeparator = "\n";
/**
- * Line separator for stacktrace frames.
+ * Holds the list of filtered frames.
*/
- private static String lineSeparator = "\n";
+ private Set<String> filteredFrames = new HashSet<String>();
static
{
@@ -68,16 +68,18 @@
}
/**
- * @see org.apache.log4j.Layout#ignoresThrowable()
+ * {@inheritDoc}
*/
+ @Override
public boolean ignoresThrowable()
{
return false;
}
/**
- * @see org.apache.log4j.PatternLayout#format(org.apache.log4j.spi.LoggingEvent)
+ * {@inheritDoc}
*/
+ @Override
public String format(LoggingEvent event)
{
@@ -130,10 +132,10 @@
*/
private boolean startsWithAFilteredPAttern(String string)
{
- Iterator iterator = filteredFrames.iterator();
+ Iterator<String> iterator = filteredFrames.iterator();
while (iterator.hasNext())
{
- if (string.trim().startsWith((String) iterator.next()))
+ if (string.trim().startsWith(iterator.next()))
{
return true;
}
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java 2008-01-26 18:05:51 UTC (rev 546)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java 2008-01-26 18:13:01 UTC (rev 547)
@@ -121,7 +121,7 @@
Level.WARN.toString(),
Level.INFO.toString(),
Level.DEBUG.toString(),
- Level.ALL.toString()};
+ Level.ALL.toString() };
/**
* Don't include html head.
@@ -135,13 +135,21 @@
* @exception ServletException if an error occurs
* @exception IOException if an error occurs
*/
+ @Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
+ String className = request.getParameter(PARAM_CLASS);
+ String level = request.getParameter(PARAM_LEVEL);
+ if (className != null && level != null)
+ {
+ setClass(className, level);
+ }
+
String sortByLevelParam = request.getParameter(PARAM_SORTBYLEVEL);
boolean sortByLevel = ("true".equalsIgnoreCase(sortByLevelParam) || "yes".equalsIgnoreCase(sortByLevelParam));
- List loggers = getSortedLoggers(sortByLevel);
+ List<Logger> loggers = getSortedLoggers(sortByLevel);
int loggerNum = 0;
PrintWriter out = response.getWriter();
@@ -175,11 +183,11 @@
displayLogger(out, Logger.getRootLogger(), loggerNum++, request);
// print the rest of the loggers
- Iterator iterator = loggers.iterator();
+ Iterator<Logger> iterator = loggers.iterator();
while (iterator.hasNext())
{
- displayLogger(out, (Logger) iterator.next(), loggerNum++, request);
+ displayLogger(out, iterator.next(), loggerNum++, request);
}
out.println("</tbody>");
@@ -201,16 +209,9 @@
* @exception ServletException if an error occurs
* @exception IOException if an error occurs
*/
+ @Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
- String className = request.getParameter(PARAM_CLASS);
- String level = request.getParameter(PARAM_LEVEL);
-
- if (className != null)
- {
- setClass(className, level);
- }
-
doGet(request, response);
}
@@ -284,12 +285,13 @@
* @param sortByLevel if <code>true</code> sort loggers by level instead of name.
* @return List the list of sorted loggers.
*/
- private List getSortedLoggers(boolean sortByLevel)
+ @SuppressWarnings("unchecked")
+ private List<Logger> getSortedLoggers(boolean sortByLevel)
{
- Enumeration enm = LogManager.getCurrentLoggers();
- Comparator comp = new LoggerComparator(sortByLevel);
- List list = new ArrayList();
+ Enumeration<Logger> enm = LogManager.getCurrentLoggers();
+ List<Logger> list = new ArrayList<Logger>();
+
// Add all current loggers to the list
while (enm.hasMoreElements())
{
@@ -297,7 +299,7 @@
}
// sort the loggers
- Collections.sort(list, comp);
+ Collections.sort(list, new LoggerComparator(sortByLevel));
return list;
}
@@ -354,7 +356,7 @@
/**
* Compare the names of two <code>Logger</code>s. Used for sorting.
*/
- private class LoggerComparator implements Comparator
+ private class LoggerComparator implements Comparator<Logger>
{
/**
@@ -377,11 +379,8 @@
* @param object2 an <code>Object</code> value
* @return an <code>int</code> value
*/
- public int compare(Object object1, Object object2)
+ public int compare(Logger logger1, Logger logger2)
{
- Logger logger1 = (Logger) object1;
- Logger logger2 = (Logger) object2;
-
if (!sortByLevel)
{
return logger1.getName().compareTo(logger2.getName());
@@ -394,6 +393,7 @@
* @param object an <code>Object</code> value
* @return a <code>boolean</code> value
*/
+ @Override
public boolean equals(Object object)
{
if (!(object instanceof LoggerComparator))
@@ -406,6 +406,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return super.hashCode();
@@ -413,8 +414,9 @@
}
/**
- * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+ * {@inheritDoc}
*/
+ @Override
public void init(ServletConfig config) throws ServletException
{
String fragmentParam = config.getInitParameter(CONFIG_FRAGMENT);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
