Author: jflesch
Date: 2007-04-16 08:50:16 +0000 (Mon, 16 Apr 2007)
New Revision: 12761
Added:
trunk/apps/Thaw/images/indexSettings.png
trunk/apps/Thaw/images/min-indexSettings.png
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
trunk/apps/Thaw/src/thaw/gui/IconBox.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Fix index insertion bug (#1271)
Added: trunk/apps/Thaw/images/indexSettings.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/indexSettings.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/Thaw/images/min-indexSettings.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/min-indexSettings.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -1011,4 +1011,10 @@
public int getTransferWithTheNodeProgression() {
return fromTheNodeProgress;
}
+
+
+ public void notifyChange() {
+ setChanged();
+ notifyObservers();
+ }
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -1022,4 +1022,9 @@
return (String)metadatas.get(name);
}
+
+ public void notifyChange() {
+ setChanged();
+ notifyObservers();
+ }
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -4,6 +4,8 @@
import java.util.Iterator;
import java.util.Vector;
+import java.util.Observable;
+
import thaw.core.Logger;
/**
@@ -248,6 +250,7 @@
Logger.info(this, "Restart done.");
}
+
public void remove(final FCPTransferQuery query) {
runningQueries.remove(query);
@@ -264,6 +267,7 @@
setChanged();
this.notifyObservers(query);
+
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -142,4 +142,6 @@
public String getIdentifier();
public String getFilename();
+
+ public void notifyChange();
}
Modified: trunk/apps/Thaw/src/thaw/gui/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-04-16 01:17:21 UTC (rev
12760)
+++ trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-04-16 08:50:16 UTC (rev
12761)
@@ -115,6 +115,9 @@
public static ImageIcon file;
public static ImageIcon minFile;
+ public static ImageIcon indexSettings;
+ public static ImageIcon minIndexSettings;
+
/**
* Not really used
*/
@@ -218,6 +221,8 @@
IconBox.minFile = IconBox.loadIcon("min-file.png");
IconBox.link =
IconBox.loadIcon("indexBrowser.png");
IconBox.minLink =
IconBox.loadIcon("min-indexBrowser.png");
+ IconBox.minIndexSettings =
IconBox.loadIcon("min-indexSettings.png");
+ IconBox.indexSettings =
IconBox.loadIcon("min-indexSettings.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-04-16
01:17:21 UTC (rev 12760)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-04-16
08:50:16 UTC (rev 12761)
@@ -326,8 +326,11 @@
thaw.plugin.index.stillRev0=N'oubliez pas d'ins?rer cet index sur Freenet
avant de donner la clef ? quelqu'un
+thaw.plugin.index.comment.comments=Voir les ? commentaires
+thaw.plugin.index.comment.add=Ajouter un commentaire
+
thaw.plugin.peerMonitor.peerMonitor=Connexion
thaw.plugin.peerMonitor.yourReference=Votre r?f?rence:
thaw.plugin.peerMonitor.copyReference=Copier votre r?f?rence vers le
presse-papier
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -321,6 +321,10 @@
thaw.plugin.index.stillRev0=Don't forget to insert this index on Freenet
before giving the key to someone
+thaw.plugin.index.comment.comments=See the ? comment(s)
+thaw.plugin.index.comment.add=Add a comment
+
+
thaw.plugin.peerMonitor.peerMonitor=Connection
thaw.plugin.peerMonitor.yourReference=Your reference:
thaw.plugin.peerMonitor.copyReference=Copy your reference to the clipboard
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -326,8 +326,11 @@
thaw.plugin.index.stillRev0=N'oubliez pas d'ins\u00e9rer cet index sur Freenet
avant de donner la clef \u00e0 quelqu'un
+thaw.plugin.index.comment.comments=Voir les ? commentaires
+thaw.plugin.index.comment.add=Ajouter un commentaire
+
thaw.plugin.peerMonitor.peerMonitor=Connexion
thaw.plugin.peerMonitor.yourReference=Votre r\u00e9f\u00e9rence:
thaw.plugin.peerMonitor.copyReference=Copier votre r\u00e9f\u00e9rence vers le
presse-papier
Modified: trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java 2007-04-16
01:17:21 UTC (rev 12760)
+++ trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java 2007-04-16
08:50:16 UTC (rev 12761)
@@ -1,9 +1,18 @@
package thaw.plugins.index;
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
+
import javax.swing.JPanel;
+import javax.swing.JLabel;
import javax.swing.JButton;
+import java.util.Vector;
+import java.util.Iterator;
+import thaw.core.I18n;
+
+
/**
* Initially, I wanted to use it to show details about the
* currently-viewed index, but in the end it will mostly
@@ -12,11 +21,28 @@
public class DetailPanel {
private JPanel panel;
- private JButton seeComment;
- private JButton addComment;
+ private Vector buttonActions;
+
public DetailPanel() {
- panel = new JPanel();
+ panel = new JPanel(new BorderLayout());
+
+ panel.add(new JLabel(""), BorderLayout.CENTER); /* because we
need something */
+
+ JPanel buttonPanel = new JPanel(new GridLayout(1, 2));
+ buttonActions = new Vector(2);
+ JButton button;
+
+ button = new
JButton(I18n.getMessage("thaw.plugin.index.comment.comments").replaceAll("\\?",
"0"));
+ buttonActions.add(new
IndexManagementHelper.IndexCommentViewer(button));
+ buttonPanel.add(button);
+
+ button = new
JButton(I18n.getMessage("thaw.plugin.index.comment.add"));
+ buttonActions.add(new
IndexManagementHelper.IndexCommentAdder(button));
+ buttonPanel.add(button);
+
+
+ panel.add(buttonPanel, BorderLayout.EAST);
}
@@ -26,7 +52,15 @@
public void setList(final FileAndLinkList l) {
+ if (l instanceof Index) {
+ for (Iterator it = buttonActions.iterator();
+ it.hasNext();) {
+ IndexManagementHelper.IndexAction action =
(IndexManagementHelper.IndexAction)it.next();
+ action.setTarget((Index)l);
+ }
+
+ }
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-04-16 01:17:21 UTC
(rev 12760)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-04-16 08:50:16 UTC
(rev 12761)
@@ -577,14 +577,17 @@
}
+ private IndexTree indexTree = null;
+
public int insertOnFreenet(Observer o, IndexBrowserPanel indexBrowser,
FCPQueueManager queueManager) {
String privateKey = getPrivateKey();
String publicKey = getPublicKey();
int rev = getRevision();
+ if (indexBrowser != null && indexBrowser.getMainWindow() !=
null) {
+ indexTree = indexBrowser.getIndexTree();
- if (indexBrowser != null && indexBrowser.getMainWindow() !=
null) {
synchronized(db.dbLock) {
try {
PreparedStatement st;
@@ -707,9 +710,7 @@
*/
private boolean rewriteKey = true;
- private IndexTree indexTree = null;
-
public int downloadFromFreenet(Observer o, IndexTree tree,
FCPQueueManager queueManager, int specificRev) {
FCPClientGet clientGet;
String publicKey;
@@ -827,6 +828,7 @@
fl.delete();
((Observable)transfer).deleteObserver(this);
+
if (indexTree != null)
indexTree.removeUpdatingIndex(this);
@@ -1532,4 +1534,16 @@
return true;
return false;
}
+
+
+
+ /**
+ * @return an SSK@
+ */
+ public String getCommentPublicKey() {
+ /* TODO */
+ return null;
+ }
+
+
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-04-16 01:17:21 UTC (rev 12760)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-04-16 08:50:16 UTC (rev 12761)
@@ -1478,4 +1478,47 @@
}
}
+
+
+
+ public static class IndexCommentAdder extends BasicIndexAction
implements Runnable {
+ public IndexCommentAdder(final AbstractButton actionSource) {
+ super(null, null, actionSource);
+
+ if (actionSource != null)
+ actionSource.setEnabled(false);
+ }
+
+
+ public void setTarget(final IndexTreeNode node) {
+ super.setTarget(node);
+ getActionSource().setEnabled(node instanceof Index
+ &&
((Index)node).getCommentPublicKey() != null);
+ }
+
+ public void apply() {
+ /* TODO */
+ }
+ }
+
+
+ public static class IndexCommentViewer extends BasicIndexAction
implements Runnable {
+ public IndexCommentViewer(final AbstractButton actionSource) {
+ super(null, null, actionSource);
+
+ if (actionSource != null)
+ actionSource.setEnabled(false);
+ }
+
+
+ public void setTarget(final IndexTreeNode node) {
+ super.setTarget(node);
+ getActionSource().setEnabled(node instanceof Index
+ &&
((Index)node).getCommentPublicKey() != null);
+ }
+
+ public void apply() {
+ /* TODO */
+ }
+ }
}
