Author: jflesch
Date: 2007-08-01 17:49:01 +0000 (Wed, 01 Aug 2007)
New Revision: 14456
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/I18n.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
Log:
Fix the signature management (remove an error + fix the way the signature are
ordered)
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-08-01 14:40:22 UTC (rev
14455)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-08-01 17:49:01 UTC (rev
14456)
@@ -394,12 +394,10 @@
try {
javax.swing.SwingUtilities.invokeAndWait(s);
} catch(InterruptedException e) {
- Logger.error(s, "Interrupted while setting theme
'"+theme+"' !");
- Logger.error(s, "Interrupted because: "+e.toString());
+ Logger.error(s, "Interrupted while setting theme
'"+theme+"' because: "+e.toString());
} catch(java.lang.reflect.InvocationTargetException e) {
Logger.error(s, "Error while setting theme :
"+e.toString());
- e.printStackTrace();
- Logger.error(s, "Original exception:
"+e.getTargetException().toString());
+ Logger.notice(s, "Original exception:
"+e.getTargetException().toString());
e.getTargetException().printStackTrace();
}
}
Modified: trunk/apps/Thaw/src/thaw/core/I18n.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/I18n.java 2007-08-01 14:40:22 UTC (rev
14455)
+++ trunk/apps/Thaw/src/thaw/core/I18n.java 2007-08-01 17:49:01 UTC (rev
14456)
@@ -68,7 +68,7 @@
try {
return I18n.getResourceBundle().getString(key);
} catch(final Exception e) {
- Logger.warning(new I18n(),/* we need a ref -> random
ref -> this is *bad* */
+ Logger.warning(new I18n(),
"Unable to find translation for
'"+key+"'");
e.printStackTrace();
return key;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-08-01 14:40:22 UTC
(rev 14455)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-08-01 17:49:01 UTC
(rev 14456)
@@ -475,8 +475,7 @@
schedule();
} catch(final Exception e) {
- Logger.error(this, "EXCEPTION FROM ORDONNANCOR
: "+e.toString());
- Logger.error(this, "ERROR : "+e.getMessage());
+ Logger.error(this, "EXCEPTION FROM ORDONNANCOR
: "+e.toString()+ " ; "+e.getMessage());
e.printStackTrace();
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-08-01
14:40:22 UTC (rev 14455)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-08-01
17:49:01 UTC (rev 14456)
@@ -540,11 +540,11 @@
"privateKey, isDup, trustLevel "+
"FROM signatures "+
"WHERE "+cond + " "+
-
"ORDER BY nickName");
+
"ORDER BY LOWER(nickName)");
else
st =
db.getConnection().prepareStatement("SELECT id, nickName, publicKey, "+
"privateKey, isDup, trustLevel "+
-
"FROM signatures ORDER BY nickName");
+
"FROM signatures ORDER BY LOWER(nickName)");
ResultSet set = st.executeQuery();
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
2007-08-01 14:40:22 UTC (rev 14455)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
2007-08-01 17:49:01 UTC (rev 14456)
@@ -480,6 +480,7 @@
if (e.getSource() == close) {
dialog.setVisible(false);
+ return;
}
int row = table.getSelectedRow();
