Author: jflesch
Date: 2007-04-23 00:43:25 +0000 (Mon, 23 Apr 2007)
New Revision: 12889
Modified:
trunk/apps/Thaw/src/thaw/plugins/index/Comment.java
trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerHelper.java
trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
Log:
Fix the build
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Comment.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Comment.java 2007-04-23 00:35:01 UTC
(rev 12888)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Comment.java 2007-04-23 00:43:25 UTC
(rev 12889)
@@ -490,20 +490,26 @@
* @see org.xml.sax.ContentHandler#endDocument()
*/
public void endDocument() throws SAXException {
- if (comment != null && authorTxt != null
- && y != null && r != null && s != null) {
+ try {
+ if (comment != null && authorTxt != null
+ && y != null && r != null && s != null) {
- author = Identity.getIdentity(db, authorTxt, y);
- valid =
author.check(index.getCommentPublicKey()+"-"+
- author.getNick()+"-"+
- comment,
- r, s);
+ author = Identity.getIdentity(db,
authorTxt, y);
+ valid =
author.check(index.getCommentPublicKey()+"-"+
+
author.getNick()+"-"+
+ comment,
+ r, s);
- if (!valid) {
- Logger.notice(this, "Signature
validation failed !");
+ if (!valid) {
+ Logger.notice(this, "Signature
validation failed !");
+ }
+ } else {
+ Logger.notice(this, "Signature
validation failed ! (missing elements)");
+ valid = false;
}
- } else {
- Logger.notice(this, "Signature validation
failed ! (missing elements)");
+ } catch(Exception e) { /* we must not failed ! */
+ Logger.error(this, "Error while checking
signature: "+e.toString());
+ e.printStackTrace();
valid = false;
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2007-04-23 00:35:01 UTC (rev 12888)
+++ trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2007-04-23 00:43:25 UTC (rev 12889)
@@ -290,7 +290,8 @@
if((selectedFiles.getText() == null)
|| "".equals( selectedFiles.getText() )) {
- new WarningWindow(null,
I18n.getMessage("thaw.plugin.insert.specifyFile"));
+ new WarningWindow((thaw.core.MainWindow)null,
+
I18n.getMessage("thaw.plugin.insert.specifyFile"));
return;
}
@@ -299,7 +300,8 @@
|| "".equals( nameField.getText() )
|| (revField.getText() == null)
|| revField.getText().equals("")) {
- new WarningWindow(null,
I18n.getMessage("thaw.plugin.insert.specifyNameAndRev"));
+ new
WarningWindow(((thaw.core.MainWindow)null),
+
I18n.getMessage("thaw.plugin.insert.specifyNameAndRev"));
return;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerHelper.java
2007-04-23 00:35:01 UTC (rev 12888)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerHelper.java
2007-04-23 00:43:25 UTC (rev 12889)
@@ -117,7 +117,7 @@
addPeer(queueManager, ref);
dialog.setVisible(false);
} else {
- new thaw.gui.WarningWindow(null,
+ new
thaw.gui.WarningWindow((thaw.core.MainWindow)null,
I18n.getMessage("thaw.plugin.peerMonitor.invalidRef"));
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-04-23
00:35:01 UTC (rev 12888)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-04-23
00:43:25 UTC (rev 12889)
@@ -149,7 +149,23 @@
return Color.BLACK;
}
+ public void setTrustLevel(String str) {
+ int i;
+ for (i = 0 ; i < Identity.trustLevelStr.length ; i++) {
+ if
(I18n.getMessage(Identity.trustLevelStr[i]).equals(str))
+ break;
+ }
+
+ if (i >= Identity.trustLevelStr.length) {
+ Logger.error(this, "Unknown trust level: "+str);
+ return;
+ }
+
+ setTrustLevel(trustLevelInt[i]);
+ }
+
+
public void setTrustLevel(int i) {
try {
synchronized(db.dbLock) {
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
2007-04-23 00:35:01 UTC (rev 12888)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
2007-04-23 00:43:25 UTC (rev 12889)
@@ -293,18 +293,8 @@
if (e.getSource() instanceof JButton) {
JButton bt = (JButton)e.getSource();
- int i;
+ target.setTrustLevel(bt.getText());
- for (i = 0 ; i < Identity.trustLevelStr.length
; i++) {
- if
(I18n.getMessage(Identity.trustLevelStr[i]).equals(bt.getText()))
- break;
- }
-
- if (i >= Identity.trustLevelStr.length)
- return;
-
- target.setTrustLevel(Identity.trustLevelInt[i]);
-
updateList();
}
