Author: jflesch
Date: 2007-04-12 10:04:39 +0000 (Thu, 12 Apr 2007)
New Revision: 12593
Modified:
trunk/apps/Thaw/src/thaw/core/SplashScreen.java
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
Log:
Auto-update the corresponding links when a new revision of an index is found
Modified: trunk/apps/Thaw/src/thaw/core/SplashScreen.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-04-12 09:18:01 UTC
(rev 12592)
+++ trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-04-12 10:04:39 UTC
(rev 12593)
@@ -17,7 +17,7 @@
public final static int SIZE_X = 500;
public final static int SIZE_Y = 150;
- public final static int NMB_ICONS = 9;
+ public final static int NMB_ICONS = 10;
public JDialog splashScreen;
public JProgressBar progressBar;
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-04-12 09:18:01 UTC
(rev 12592)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-04-12 10:04:39 UTC
(rev 12593)
@@ -19,7 +19,7 @@
public class IndexBrowser extends ToolbarModifier implements Plugin,
ChangeListener {
- public static final String DEFAULT_INDEX = "USK at
G-ofLp2KlhHBNPezx~GDWDKThJ-QUxJK8c2xiF~-jwE,-55vLnqo3U1H5qmKA1LLADoYGQdk-Y3hSLxyKeUyHNc,AQABAAE/Thaw/2/Thaw.xml";
+ public static final String DEFAULT_INDEX = "USK at
G-ofLp2KlhHBNPezx~GDWDKThJ-QUxJK8c2xiF~-jwE,-55vLnqo3U1H5qmKA1LLADoYGQdk-Y3hSLxyKeUyHNc,AQABAAE/Thaw/9/Thaw.xml";
private Core core;
private Hsqldb hsqldb;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-04-12 09:18:01 UTC
(rev 12592)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-04-12 10:04:39 UTC
(rev 12593)
@@ -462,6 +462,32 @@
st.setInt(3, id);
st.execute();
+
+
+ /* we update also all the links in the index
with the private key */
+
+ st =
db.getConnection().prepareStatement("SELECT links.id, links.publicKey "+
+ "FROM
LINKS JOIN INDEXES ON links.indexParent = indexes.id "+
+ "WHERE
indexes.privateKey IS NOT NULL AND LOWER(publicKey) LIKE ?");
+
+ st.setString(1,
FreenetURIHelper.getComparablePart(publicKey)+"%");
+ ResultSet res = st.executeQuery();
+
+
+ PreparedStatement updateLinkSt;
+
+ updateLinkSt =
db.getConnection().prepareStatement("UPDATE links SET publicKey = ? WHERE id =
?");
+
+ while(res.next()) {
+ String pubKey =
res.getString("publicKey").replaceAll(".xml", ".frdx");
+
+ if
(FreenetURIHelper.compareKeys(pubKey, publicKey)) {
+ updateLinkSt.setString(1,
publicKey);
+ updateLinkSt.setInt(2,
res.getInt("id"));
+ updateLinkSt.execute();
+ }
+ }
+
} catch(SQLException e) {
Logger.error(this, "Unable to set public Key
because: "+e.toString());
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-04-12
09:18:01 UTC (rev 12592)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-04-12
10:04:39 UTC (rev 12593)
@@ -69,13 +69,7 @@
table = new JTable(linkListModel);
table.setShowGrid(false);
table.setDefaultRenderer(table.getColumnClass(0), new
LinkRenderer());
- table.setDragEnabled(true);
- table.setTransferHandler(new TransferHandler("text"));
-
- MouseListener mouseListener = new DragMouseAdapter(); /* see
below */
- table.addMouseListener(mouseListener);
-
panel = new JPanel();
panel.setLayout(new BorderLayout());
@@ -128,19 +122,6 @@
}
- private class DragMouseAdapter extends MouseAdapter {
- public void mousePressed(MouseEvent e) {
- Logger.error(this, "MOOH");
-
- JComponent src = (JComponent) e.getSource();
- TransferHandler handler = src.getTransferHandler();
-
- handler.exportAsDrag(src, e, TransferHandler.COPY);
-
- }
- }
-
-
public ToolbarModifier getToolbarModifier() {
return toolbarModifier;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-04-12 09:18:01 UTC (rev 12592)
+++ trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-04-12 10:04:39 UTC (rev 12593)
@@ -71,12 +71,6 @@
list.setSelectionMode(javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- list.setDragEnabled(true);
- list.setTransferHandler(new TransferHandler("text"));
-
- MouseListener mouseListener = new DragMouseAdapter(); /* see
below */
- list.addMouseListener(mouseListener);
-
panel = new JPanel(new BorderLayout());
panel.add(new
JLabel(I18n.getMessage("thaw.plugin.index.unknownIndexes")),
BorderLayout.NORTH);
@@ -96,18 +90,7 @@
list.addMouseListener(this);
}
- private class DragMouseAdapter extends MouseAdapter {
- public void mousePressed(MouseEvent e) {
- Logger.error(this, "MOOH");
- JComponent src = (JComponent) e.getSource();
- TransferHandler handler = src.getTransferHandler();
-
- handler.exportAsDrag(src, e, TransferHandler.COPY);
-
- }
- }
-
public ToolbarModifier getToolbarModifier() {
return toolbarModifier;
}
