Author: jflesch
Date: 2007-08-17 23:57:11 +0000 (Fri, 17 Aug 2007)
New Revision: 14778
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
Log:
Fix the getNextUnreadMessage() when used on archived messages
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-17 23:40:00 UTC (rev 14777)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-17 23:57:11 UTC (rev 14778)
@@ -1034,6 +1034,7 @@
}
Message newMsg =
targetBoard.getNextUnreadMessage(seeUnsigned.isSelected(),
+
seeArchived.isSelected(),
minTrustLevelInt);
if (newMsg != null) {
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
2007-08-17 23:40:00 UTC (rev 14777)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/SentMessages.java
2007-08-17 23:57:11 UTC (rev 14778)
@@ -61,7 +61,7 @@
/**
* @return null if none
*/
- public Message getNextUnreadMessage(boolean unsigned, int
minTrustLevel) {
+ public Message getNextUnreadMessage(boolean unsigned, boolean archived,
int minTrustLevel) {
return null;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-08-17 23:40:00 UTC (rev 14777)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-08-17 23:57:11 UTC (rev 14778)
@@ -240,6 +240,7 @@
public Message getNextUnreadMessage(boolean unsigned,
+ boolean archived,
int minTrustLevel) {
String trustLvlStr;
@@ -250,7 +251,12 @@
else
trustLvlStr = " AND signatures.trustLevel >=
"+Integer.toString(minTrustLevel)+" ";
+ String archivedStr = "";
+ if (!archived)
+ archivedStr = " AND frostKSKMessages.archived = FALSE ";
+
+
try {
Hsqldb db = factory.getDb();
@@ -273,8 +279,9 @@
" signatures.trustLevel AS
sigTrustLevel "+
"FROM frostKSKMessages LEFT OUTER JOIN
signatures "+
" ON frostKSKMessages.sigId =
signatures.id "+
- "WHERE frostKSKMessages.boardId = ? AND
"+
- "frostKSKMessages.archived = FALSE AND
frostKSKMessages.read = FALSE "+
+ "WHERE frostKSKMessages.boardId = ? "+
+ "AND frostKSKMessages.read = FALSE "+
+ archivedStr+
trustLvlStr+
"ORDER BY frostKSKMessages.date LIMIT
1";
@@ -316,7 +323,7 @@
}
} catch(SQLException e) {
- Logger.error(this, "Can't get message list because :
"+e.toString());
+ Logger.error(this, "Can't get the next unread message
because : "+e.toString());
}
return null;
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
2007-08-17 23:40:00 UTC (rev 14777)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
2007-08-17 23:57:11 UTC (rev 14778)
@@ -34,7 +34,7 @@
/**
* @return null if none
*/
- public Message getNextUnreadMessage(boolean unsigned, int
minTrustLevel);
+ public Message getNextUnreadMessage(boolean unsigned, boolean archived,
int minTrustLevel);
/**
