[Thaw-dev] r12883 - in trunk/apps/Thaw/src/thaw/plugins: index signatures

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-22 22:46:26 +0000 (Sun, 22 Apr 2007)
New Revision: 12883

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/Comment.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
   trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
Log:
Fix index creation

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Comment.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Comment.java 2007-04-22 22:20:59 UTC 
(rev 12882)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Comment.java 2007-04-22 22:46:26 UTC 
(rev 12883)
@@ -141,8 +141,10 @@
                                                                 new 
java.awt.Font("Dialog", java.awt.Font.BOLD, 14) ));

                JLabel sigLabel = new 
JLabel(I18n.getMessage("thaw.plugin.signature.trustLevel.trustLevel")+ " : ");
-               JTextField sigLevel = new 
JTextField(I18n.getMessage(author.getTrustLevelStr()));
+               JTextField sigLevel = new 
JTextField(I18n.getMessage(author.getTrustLevelStr())
+                                                    + (author.isDup() ? 
I18n.getMessage("thaw.plugin.signature.duplicata") : ""));

+
                sigLevel.setDisabledTextColor(author.getTrustLevelColor());
                sigLevel.setEditable(false);
                sigLevel.setBackground(panel.getBackground());
@@ -490,6 +492,7 @@
                public void endDocument() throws SAXException {
                        if (comment != null && authorTxt != null
                                && y != null && r != null && s != null) {
+
                                author = Identity.getIdentity(db, authorTxt, y);
                                valid = 
author.check(index.getCommentPublicKey()+"-"+
                                                     author.getNick()+"-"+

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2007-04-22 22:20:59 UTC (rev 12882)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2007-04-22 22:46:26 UTC (rev 12883)
@@ -199,7 +199,7 @@
                                                                                
 " publicKey, privateKey, author, "+
                                                                                
 " positionInTree, revision, "+
                                                                                
 " newRev, newComment, parent) "+
-                                                                               
 "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+                                                                               
 "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");

                                        /* TODO : Author */


Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java   2007-04-22 
22:20:59 UTC (rev 12882)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java   2007-04-22 
22:46:26 UTC (rev 12883)
@@ -117,18 +117,18 @@
                }

                if (i < trustLevelInt.length) {
-                       if (!isDup)
-                               return trustLevelStr[i];
-                       return trustLevelStr[i] + 
I18n.getMessage("thaw.plugin.signature.duplicata");
+                       return trustLevelStr[i];
                }

-               if (!isDup)
-                       return "[?]";
-               else
-                       return "[?]" + 
I18n.getMessage("thaw.plugin.signature.duplicata");
+
+               return "[?]";
        }

+       public boolean isDup() {
+               return isDup;
+       }

+
        public Color getTrustLevelColor() {
                int i;