Author: jflesch
Date: 2007-07-23 17:37:57 +0000 (Mon, 23 Jul 2007)
New Revision: 14282
Modified:
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
Log:
Make it possible to see the archived messages
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-23
16:50:29 UTC (rev 14281)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-23
17:37:57 UTC (rev 14282)
@@ -542,3 +542,5 @@
thaw.plugin.miniFrost.markAsNonRead=Marquer comme non-lu
thaw.plugin.miniFrost.onAllBoards=Sur toutes les boards
+
+thaw.plugin.miniFrost.seeArchived=Voir les messages archiv?s
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-23 16:50:29 UTC
(rev 14281)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-23 17:37:57 UTC
(rev 14282)
@@ -558,3 +558,5 @@
thaw.plugin.miniFrost.markAsNonRead=Mark as non-read
thaw.plugin.miniFrost.onAllBoards=On all boards
+
+thaw.plugin.miniFrost.seeArchived=See archived messages
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-07-23 16:50:29 UTC (rev 14281)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-07-23 17:37:57 UTC (rev 14282)
@@ -97,8 +97,11 @@
private JButton searchButton;
private JButton nextUnread;
+ private JCheckBox seeArchived;
+
private JComboBox actions;
+ private String[] keywords;
private int orderBy;
private boolean desc;
@@ -174,6 +177,19 @@
panel.add(northPanel, BorderLayout.NORTH);
panel.add(new JScrollPane(table), BorderLayout.CENTER);
+
+ /* some filters */
+
+ seeArchived = new
JCheckBox(I18n.getMessage("thaw.plugin.miniFrost.seeArchived"));
+ seeArchived.setSelected(false);
+ seeArchived.addActionListener(this);
+
+ JPanel southPanel = new JPanel(new BorderLayout(5, 5));
+ southPanel.add(new JLabel(""), BorderLayout.CENTER);
+ southPanel.add(seeArchived, BorderLayout.EAST);
+
+ panel.add(southPanel, BorderLayout.SOUTH);
+
mainPanel.getBoardTree().addObserver(this);
}
@@ -339,6 +355,7 @@
searchField.setText("");
everywhereBox.setSelected(false);
+ keywords = null;
}
public Board getBoard() {
@@ -346,14 +363,15 @@
}
public void refresh() {
- refresh(null, Board.ORDER_DATE, true, false);
+ refresh(keywords, orderBy, desc, everywhereBox.isSelected());
}
public void refresh(String[] keywords, int orderBy, boolean desc,
boolean allBoards) {
Vector msgs = null;
if ((!allBoards) && targetBoard != null) {
- msgs = targetBoard.getMessages(keywords, orderBy, desc);
+ msgs = targetBoard.getMessages(keywords, orderBy,
+ desc,
seeArchived.isSelected());
}
if (allBoards) {
@@ -362,7 +380,8 @@
BoardFactory[] factories =
mainPanel.getPluginCore().getFactories();
for (int i = 0 ; i < factories.length ; i++) {
- Vector boardMsgs =
factories[i].getAllMessages(keywords, orderBy, desc);
+ Vector boardMsgs =
factories[i].getAllMessages(keywords, orderBy, desc,
+
seeArchived.isSelected());
msgs.addAll(boardMsgs);
}
}
@@ -392,10 +411,14 @@
public void actionPerformed(ActionEvent e) {
- if (e.getSource() == searchButton
+ if (e.getSource() == seeArchived) {
+
+ refresh();
+
+ } else if (e.getSource() == searchButton
|| e.getSource() == searchField) {
- String[] keywords = searchField.getText().split(" ");
+ keywords = searchField.getText().split(" ");
Logger.info(this, "Searching ...");
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-07-23 16:50:29 UTC (rev 14281)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-07-23 17:37:57 UTC (rev 14282)
@@ -65,8 +65,9 @@
public Vector getMessages(String[] keywords,
int orderBy,
- boolean desc) {
- return getMessages(id, factory, this, keywords, orderBy, desc,
false);
+ boolean desc,
+ boolean archived) {
+ return getMessages(id, factory, this, keywords, orderBy, desc,
archived, false);
}
@@ -76,6 +77,7 @@
String[] keywords,
int orderBy,
boolean desc,
+ boolean archived,
boolean allBoards) {
String orderColumn;
@@ -96,6 +98,13 @@
whereBase = "WHERE boardId = ? AND ";
}
+
+ String archivedStr = " true ";
+
+ if (!archived)
+ archivedStr = "archived = FALSE ";
+
+
String keywordsStr = "";
if (keywords != null) {
@@ -124,7 +133,7 @@
"
boardId "+
"FROM
frostKSKMessages "+
whereBase+
-
"archived = FALSE "+
+
archivedStr+
keywordsStr+
"ORDER
BY "+orderColumn);
int i = 1;
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
2007-07-23 16:50:29 UTC (rev 14281)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
2007-07-23 17:37:57 UTC (rev 14282)
@@ -170,8 +170,10 @@
}
- public Vector getAllMessages(String[] keywords, int orderBy, boolean
desc) {
- return KSKBoard.getMessages(-1, this, null, keywords, orderBy,
desc, true);
+ public Vector getAllMessages(String[] keywords, int orderBy,
+ boolean desc, boolean archived) {
+ return KSKBoard.getMessages(-1, this, null, keywords,
+ orderBy, desc, archived, true);
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
2007-07-23 16:50:29 UTC (rev 14281)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
2007-07-23 17:37:57 UTC (rev 14282)
@@ -39,10 +39,12 @@
* @param keywords can be null
* @param orderBy specify an order
* @param desc
+ * @param archived If true, archived messages will also be returned
*/
public Vector getMessages(String[] keywords,
int orderBy,
- boolean desc);
+ boolean desc,
+ boolean archived);
/**
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
2007-07-23 16:50:29 UTC (rev 14281)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
2007-07-23 17:37:57 UTC (rev 14282)
@@ -27,7 +27,8 @@
* similar to Board.getMessages()
* @param orderBy see Board
*/
- public Vector getAllMessages(String[] keywords, int orderBy, boolean
desc);
+ public Vector getAllMessages(String[] keywords, int orderBy,
+ boolean desc, boolean archived);
/**
* display the dialog asking for a name, etc.
