Author: jflesch
Date: 2007-08-05 03:28:31 +0000 (Sun, 05 Aug 2007)
New Revision: 14483
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessageParser.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Fix the date format in miniFrost + Fix a deadlock in the queueWatcher plugin
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-08-04 01:51:10 UTC (rev 14482)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-08-05 03:28:31 UTC (rev 14483)
@@ -205,6 +205,7 @@
super(new BorderLayout(5,5));
+
this.retracted=retracted;
this.msg = msg;
@@ -214,7 +215,7 @@
/* header */
JPanel headPanel = new JPanel(new BorderLayout(40, 40));
- JLabel dateLabel = new JLabel(msg.getDate().toString());
+ JLabel dateLabel = new
JLabel(java.text.DateFormat.getDateTimeInstance().format(msg.getDate()));
AuthorPanel authorLabel = new
AuthorPanel(msg.getAuthor());
//authorLabel.setPreferredSize(new
java.awt.Dimension(400, 15));
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-04 01:51:10 UTC (rev 14482)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-05 03:28:31 UTC (rev 14483)
@@ -573,6 +573,10 @@
value =
I18n.getMessage("thaw.plugin.signature.trustLevel.none");
}
+ if (value instanceof java.util.Date) {
+ value =
java.text.DateFormat.getDateTimeInstance().format((java.util.Date)value);
+ }
+
if (author != null && author.getIdentity() != null)
color =
author.getIdentity().getTrustLevelColor();
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessageParser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessageParser.java
2007-08-04 01:51:10 UTC (rev 14482)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessageParser.java
2007-08-05 03:28:31 UTC (rev 14483)
@@ -171,9 +171,10 @@
if (dateUtil != null) {
long dateDiff =
KSKBoard.getMidnight(dateUtil).getTime() -
KSKBoard.getMidnight(boardDate).getTime();
- /* we accept between -24h before and +24h after */
+ /* we accept between X days before and X days after */
- if (dateDiff < (-1)*48*60*60*1000 || dateDiff >
48*60*60*1000)
+ if (dateDiff <
(KSKBoard.MAX_DAYS_IN_THE_PAST+1)*(-1)*28*60*60*1000
+ || dateDiff >
(KSKBoard.MAX_DAYS_IN_THE_FUTURE+1)*24*60*60*1000)
dateUtil = null;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-08-04 01:51:10 UTC (rev 14482)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-08-05 03:28:31 UTC (rev 14483)
@@ -163,13 +163,15 @@
/**
* Don't call notifyObservers !
*/
- public synchronized void resetTable() {
+ public void resetTable() {
if(queries != null) {
- for(final Iterator it = queries.iterator();
- it.hasNext();) {
- final Observable query = (Observable)it.next();
- query.deleteObserver(this);
+ synchronized(queries) {
+ for(final Iterator it = queries.iterator();
+ it.hasNext();) {
+ final Observable query =
(Observable)it.next();
+ query.deleteObserver(this);
+ }
}
}
@@ -177,7 +179,7 @@
}
- public synchronized void reloadQueue() {
+ public void reloadQueue() {
resetTable();
addQueries(queueManager.getRunningQueue());
@@ -188,7 +190,7 @@
addQueries(pendings[i]);
}
- public synchronized void addQueries(final Vector queries) {
+ public void addQueries(final Vector queries) {
synchronized(queries) {
for(final Iterator it = queries.iterator();
@@ -205,7 +207,7 @@
}
}
- public synchronized void addQuery(final FCPTransferQuery query) {
+ public void addQuery(final FCPTransferQuery query) {
if(queries.contains(query)) {
Logger.debug(this, "addQuery() : Already known");
return;
@@ -213,7 +215,9 @@
((Observable)query).addObserver(this);
- queries.add(query);
+ synchronized(queries) {
+ queries.add(query);
+ }
sortTable();
@@ -222,14 +226,16 @@
this.notifyObservers(new TableModelEvent(this, changedRow,
changedRow, TableModelEvent.ALL_COLUMNS, TableModelEvent.INSERT));
}
- public synchronized void removeQuery(final FCPTransferQuery query) {
+ public void removeQuery(final FCPTransferQuery query) {
((Observable)query).deleteObserver(this);
sortTable();
final int changedRow = queries.indexOf(query);
- queries.remove(query);
+ synchronized(queries) {
+ queries.remove(query);
+ }
if(changedRow >= 0) {
this.notifyObservers(new TableModelEvent(this,
changedRow, changedRow, TableModelEvent.ALL_COLUMNS, TableModelEvent.DELETE));
@@ -238,7 +244,7 @@
}
- public synchronized FCPTransferQuery getQuery(final int row) {
+ public FCPTransferQuery getQuery(final int row) {
try {
return (FCPTransferQuery)queries.get(row);
} catch(final java.lang.ArrayIndexOutOfBoundsException e) {
@@ -250,12 +256,14 @@
/**
* returns a *copy*
*/
- public synchronized Vector getQueries() {
+ public Vector getQueries() {
final Vector newVect = new Vector();
- for(final Iterator queryIt = queries.iterator() ;
- queryIt.hasNext();) {
- newVect.add(queryIt.next());
+ synchronized(queries) {
+ for(final Iterator queryIt = queries.iterator() ;
+ queryIt.hasNext();) {
+ newVect.add(queryIt.next());
+ }
}
return newVect;
@@ -285,7 +293,7 @@
*/
}
- public synchronized void update(final Observable o, final Object arg) {
+ public void update(final Observable o, final Object arg) {
int oldPos = -1;
int i = 0;
@@ -339,7 +347,9 @@
if((sortedColumn < 0) || (queries.size() <= 0))
return false;
- Collections.sort(queries, new QueryComparator(isSortedAsc,
sortedColumn, isForInsertions));
+ synchronized(queries) {
+ Collections.sort(queries, new
QueryComparator(isSortedAsc, sortedColumn, isForInsertions));
+ }
return true;
}
