Author: slotia
Date: 2009-08-13 06:18:28 -0700 (Thu, 13 Aug 2009)
New Revision: 17810
Added:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedQueueAppender.java
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/SimpleQueueAppender.java
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarQueueAppender.java
Removed:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
Modified:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedLogViewer.java
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Split QueueAppender into three separate Appenders
Modified:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedLogViewer.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedLogViewer.java
2009-08-13 11:39:53 UTC (rev 17809)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedLogViewer.java
2009-08-13 13:18:28 UTC (rev 17810)
@@ -128,10 +128,16 @@
if (logEventMatches(event,
filterTargetComboBox.getSelectedIndex(), getSelectedLog()))
{
solicitedLogEvents.add(event);
- logViewer.append(event[2].toUpperCase(), event[4],
String.format("%s [%s] %s %s", event[0], event[3], event[2], event[1]));
+ logViewer.append(event[2].toUpperCase(), event[4],
formatEvent(event));
}
}
+ String formatEvent(String[] event)
+ {
+ //return String.format("%s, <b>Level:</b> %s, <b>Log:</b> %s,
<b>Thread:</b> %s", event[0], event[2], event[1], event[3]);
+ return String.format("%s, Level: %s, Log: %s, Thread: %s",
event[0], event[2], event[1], event[3]);
+ }
+
/**
* Gets the selected log
* @return The currently selected fully-qualified log name, or
<code>null</code> if the root is selected.
@@ -229,7 +235,7 @@
if (logEventMatches(event, target,
selectedPath))
{
solicitedLogEvents.add(event);
-
logViewer.append(event[2].toUpperCase(), event[4], String.format("%s <b>%s</b>
[%s] %s", event[0], event[1], event[3], event[2]));
+
logViewer.append(event[2].toUpperCase(), event[4], formatEvent(event));
}
}
}
Copied:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedQueueAppender.java
(from rev 17769,
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java)
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedQueueAppender.java
(rev 0)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/AdvancedQueueAppender.java
2009-08-13 13:18:28 UTC (rev 17810)
@@ -0,0 +1,24 @@
+package org.cytoscape.log.internal;
+
+import java.util.concurrent.BlockingQueue;
+
+import org.ops4j.pax.logging.spi.PaxAppender;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+
+/**
+ * @author Pasteur
+ */
+public class AdvancedQueueAppender implements PaxAppender
+{
+ final BlockingQueue<PaxLoggingEvent> queue;
+
+ public AdvancedQueueAppender(BlockingQueue<PaxLoggingEvent> queue)
+ {
+ this.queue = queue;
+ }
+
+ public void doAppend(PaxLoggingEvent event)
+ {
+ queue.offer(event);
+ }
+}
Deleted:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
2009-08-13 11:39:53 UTC (rev 17809)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
2009-08-13 13:18:28 UTC (rev 17810)
@@ -1,36 +0,0 @@
-package org.cytoscape.log.internal;
-
-import java.util.Queue;
-
-import org.ops4j.pax.logging.spi.PaxAppender;
-import org.ops4j.pax.logging.spi.PaxLoggingEvent;
-
-/**
- * @author Pasteur
- */
-public class QueueAppender implements PaxAppender
-{
- final Queue<PaxLoggingEvent> userLogQueue;
- final Queue<PaxLoggingEvent> statusBarQueue;
- final Queue<PaxLoggingEvent> developerLogQueue;
-
- public QueueAppender(Queue<PaxLoggingEvent> userLogQueue,
Queue<PaxLoggingEvent> statusBarQueue, Queue<PaxLoggingEvent> developerLogQueue)
- {
- this.userLogQueue = userLogQueue;
- this.statusBarQueue = statusBarQueue;
- this.developerLogQueue = developerLogQueue;
- }
-
- public void doAppend(PaxLoggingEvent event)
- {
- System.out.println(String.format("PaxLoggingEvent (%d - %s):
%s", event.getLevel().toInt(), event.getLevel().toString(),
event.getMessage()));
- //if ( event.getLevel().equals(Level.INFO) ||
- //event.getLevel().equals(Level.WARN))
- //{
- userLogQueue.offer(event);
- statusBarQueue.offer(event);
- //}
-
- developerLogQueue.offer(event);
- }
-}
Added:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/SimpleQueueAppender.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/SimpleQueueAppender.java
(rev 0)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/SimpleQueueAppender.java
2009-08-13 13:18:28 UTC (rev 17810)
@@ -0,0 +1,27 @@
+package org.cytoscape.log.internal;
+
+import java.util.Queue;
+
+import org.ops4j.pax.logging.spi.PaxAppender;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+
+/**
+ * @author Pasteur
+ */
+public class SimpleQueueAppender implements PaxAppender
+{
+ final Queue<PaxLoggingEvent> queue;
+
+ public SimpleQueueAppender(Queue<PaxLoggingEvent> queue)
+ {
+ this.queue = queue;
+ }
+
+ public void doAppend(PaxLoggingEvent event)
+ {
+ if (
!event.getLoggerName().startsWith("org.springframework") &&
+
(event.getLevel().toString().compareToIgnoreCase("info") == 0 ||
+
event.getLevel().toString().compareToIgnoreCase("warn") == 0))
+ queue.offer(event);
+ }
+}
Added:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarQueueAppender.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarQueueAppender.java
(rev 0)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarQueueAppender.java
2009-08-13 13:18:28 UTC (rev 17810)
@@ -0,0 +1,27 @@
+package org.cytoscape.log.internal;
+
+import java.util.Queue;
+
+import org.ops4j.pax.logging.spi.PaxAppender;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+
+/**
+ * @author Pasteur
+ */
+public class StatusBarQueueAppender implements PaxAppender
+{
+ final Queue<PaxLoggingEvent> queue;
+
+ public StatusBarQueueAppender(Queue<PaxLoggingEvent> queue)
+ {
+ this.queue = queue;
+ }
+
+ public void doAppend(PaxLoggingEvent event)
+ {
+ if (
!event.getLoggerName().startsWith("org.springframework") &&
+
(event.getLevel().toString().compareToIgnoreCase("info") == 0 ||
+
event.getLevel().toString().compareToIgnoreCase("warn") == 0))
+ queue.offer(event);
+ }
+}
Modified:
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-13 11:39:53 UTC (rev 17809)
+++
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-13 13:18:28 UTC (rev 17810)
@@ -5,12 +5,24 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
- <osgi:service id="rootAppenderService" ref="rootAppender"
interface="org.ops4j.pax.logging.spi.PaxAppender">
+ <osgi:service id="advancedAppenderService" ref="advancedAppender"
interface="org.ops4j.pax.logging.spi.PaxAppender">
<osgi:service-properties>
- <entry key="org.ops4j.pax.logging.appender.name"
value="org.cytoscape.log-swing.main-appender"/>
+ <entry key="org.ops4j.pax.logging.appender.name"
value="OrgCytoscapeLogSwingAdvancedAppender"/>
</osgi:service-properties>
</osgi:service>
+ <osgi:service id="simpleAppenderService" ref="simpleAppender"
interface="org.ops4j.pax.logging.spi.PaxAppender">
+ <osgi:service-properties>
+ <entry key="org.ops4j.pax.logging.appender.name"
value="OrgCytoscapeLogSwingSimpleAppender"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="statusBarAppenderService" ref="statusBarAppender"
interface="org.ops4j.pax.logging.spi.PaxAppender">
+ <osgi:service-properties>
+ <entry key="org.ops4j.pax.logging.appender.name"
value="OrgCytoscapeLogSwingStatusBarAppender"/>
+ </osgi:service-properties>
+ </osgi:service>
+
<osgi:service id="consoleTaskFactoryService" ref="consoleTaskFactory"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
Modified:
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-13 11:39:53 UTC (rev 17809)
+++ core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-13 13:18:28 UTC (rev 17810)
@@ -75,10 +75,16 @@
<bean id="advancedQueue"
class="java.util.concurrent.LinkedBlockingQueue" />
<bean id="statusBarQueue"
class="java.util.concurrent.LinkedBlockingQueue" />
- <bean id="rootAppender"
class="org.cytoscape.log.internal.QueueAppender">
+ <bean id="advancedAppender"
class="org.cytoscape.log.internal.AdvancedQueueAppender">
+ <constructor-arg ref="advancedQueue" />
+ </bean>
+
+ <bean id="simpleAppender"
class="org.cytoscape.log.internal.SimpleQueueAppender">
<constructor-arg ref="simpleQueue" />
+ </bean>
+
+ <bean id="statusBarAppender"
class="org.cytoscape.log.internal.StatusBarQueueAppender">
<constructor-arg ref="statusBarQueue" />
- <constructor-arg ref="advancedQueue" />
</bean>
<bean id="statusBarUpdater"
class="org.cytoscape.log.internal.StatusBarUpdater"
factory-method="executeStatusBarUpdater">
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
