Author: jflesch
Date: 2007-07-30 12:25:36 +0000 (Mon, 30 Jul 2007)
New Revision: 14441
Modified:
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKDraft.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoard.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Draft.java
Log:
Fix message posting
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-30 12:06:51 UTC
(rev 14440)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-30 12:25:36 UTC
(rev 14441)
@@ -555,7 +555,6 @@
thaw.plugin.miniFrost.loadNewMessages=Load new messages
-
thaw.plugin.miniFrost.subject=Subject
thaw.plugin.miniFrost.author=From
thaw.plugin.miniFrost.status=Status
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java 2007-07-30
12:06:51 UTC (rev 14440)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java 2007-07-30
12:25:36 UTC (rev 14441)
@@ -35,6 +35,7 @@
private MiniFrostPanel mainPanel;
+ private JLabel boardLabel;
private JComboBox authorBox;
private JTextField subjectField;
private JTextArea textArea;
@@ -62,14 +63,18 @@
textArea.setLineWrap(true);
textArea.setWrapStyleWord(true);
+ boardLabel = new JLabel("");
+
JPanel northPanel = new JPanel(new BorderLayout(5, 5));
- JPanel headersPanel = new JPanel(new GridLayout(2, 1));
+ JPanel headersPanel = new JPanel(new GridLayout(3, 1));
+ headersPanel.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.board")+": "));
headersPanel.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.author")+": "));
headersPanel.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.subject")+": "));
- JPanel valuesPanel = new JPanel(new GridLayout(2, 1));
+ JPanel valuesPanel = new JPanel(new GridLayout(3, 1));
+ valuesPanel.add(boardLabel);
valuesPanel.add(authorBox);
valuesPanel.add(subjectField);
@@ -95,8 +100,9 @@
public void setDraft(Draft draft) {
this.draft = draft;
- refresh();
+ boardLabel.setText(draft.getBoard().toString());
+
Vector ids = new Vector();
ids.add(I18n.getMessage("thaw.plugin.miniFrost.anonymous"));
ids.addAll(Identity.getYourIdentities(mainPanel.getDb()));
@@ -111,6 +117,8 @@
String txt = draft.getText();
textArea.setText(draft.getText());
+
+ refresh();
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-07-30 12:06:51 UTC (rev 14440)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-07-30 12:25:36 UTC (rev 14441)
@@ -335,6 +335,10 @@
return keyBuf.toString();
}
+ protected int getKeyType() {
+ return thaw.fcp.FCPClientPut.KEY_TYPE_KSK;
+ }
+
/**
* called by KSKDraft
*/
@@ -753,13 +757,17 @@
return id;
}
+
+ /**
+ * @return the board name, as it
+ */
public String getName() {
return name;
}
/**
- * Always return the board name,
- * without anything more
+ * Return the board name,
+ * with maybe some informations
*/
public String toString() {
return name;
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKDraft.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKDraft.java
2007-07-30 12:06:51 UTC (rev 14440)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKDraft.java
2007-07-30 12:25:36 UTC (rev 14441)
@@ -160,14 +160,15 @@
String privateKey = board.getPrivateKey();
String name = board.getNameForInsertion(date, revUsed);
+ int keyType = board.getKeyType();
- if (privateKey == null)
+ if (keyType == FCPClientPut.KEY_TYPE_KSK)
Logger.info(this, "Inserting : KSK@"+name);
else
- Logger.info(this, "Insertion : SSK@[...]/"+name);
+ Logger.info(this, "Insertion : SSK@"+privateKey+name);
FCPClientPut clientPut = new FCPClientPut(fileToInsert,
-
FCPClientPut.KEY_TYPE_KSK,
+ keyType,
-1, /* rev : we
specify it ouselves in the key name */
name,
privateKey, /*
privateKey */
@@ -194,6 +195,7 @@
synchronized(board) {
if (fileToInsert == null ||
!isBoardUpToDateForToday())
return;
+ board.deleteObserver(this);
revUsed = board.getNextNonDownloadedRev(date,
-1);
}
@@ -246,4 +248,8 @@
}
}
+
+ public Board getBoard() {
+ return board;
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoard.java
2007-07-30 12:06:51 UTC (rev 14440)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoard.java
2007-07-30 12:25:36 UTC (rev 14441)
@@ -46,6 +46,11 @@
return keyBuf.toString();
}
+
+ protected int getKeyType() {
+ return thaw.fcp.FCPClientPut.KEY_TYPE_SSK;
+ }
+
/**
* called by KSKDraft
*/
@@ -130,5 +135,13 @@
return super.getDraft(inReplyTo);
}
+
+
+ public String toString() {
+ if (privateKey == null)
+ return super.toString()+" (R)";
+ else
+ return super.toString()+" (R/W)";
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Draft.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Draft.java
2007-07-30 12:06:51 UTC (rev 14440)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Draft.java
2007-07-30 12:25:36 UTC (rev 14441)
@@ -41,4 +41,6 @@
public boolean isWaiting();
public boolean isPosting();
+
+ public Board getBoard();
}
