Author: jflesch
Date: 2007-07-01 23:34:45 +0000 (Sun, 01 Jul 2007)
New Revision: 13872
Removed:
trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
Modified:
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Remove the progress bar in the index browser panel (meaningless)
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-01
23:17:43 UTC (rev 13871)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-01
23:34:45 UTC (rev 13872)
@@ -331,7 +331,7 @@
thaw.plugin.index.loadOnTheFly=Charger l'arbre d'indexes ? la vol?e (signifie
moins de m?moire utilis?e, mais plus de temps CPU consomm?)
-thaw.plugin.index.indexLoading=Chargement d'indexes
+thaw.plugin.index.indexLoading=Chargement de l'index
thaw.plugin.index.blackList=Liste noire d'indexes
thaw.plugin.index.editBlackList=Editer la liste noire d'indexes
Modified: trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java 2007-07-01
23:17:43 UTC (rev 13871)
+++ trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java 2007-07-01
23:34:45 UTC (rev 13872)
@@ -123,8 +123,6 @@
index.downloadFromFreenet(this,
browserPanel.getIndexTree(), queueManager);
browserPanel.getIndexTree().redraw();
-
-
browserPanel.getIndexProgressBar().addTransfer(1);
}
return ret;
@@ -148,7 +146,6 @@
browserPanel.getTables().getLinkTable().refresh();
}
browserPanel.getUnknownIndexList().addLinks((LinkList)o);
- browserPanel.getIndexProgressBar().removeTransfer(1);
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2007-07-01 23:17:43 UTC (rev 13871)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2007-07-01 23:34:45 UTC (rev 13872)
@@ -20,7 +20,6 @@
private Tables tables;
private DetailPanel detailPanel;
private UnknownIndexList unknownList;
- private IndexProgressBar indexProgressBar;
private BlackList blackList;
private CommentTab commentTab;
@@ -73,11 +72,9 @@
indexTree.addTreeSelectionListener(this);
- indexProgressBar = new IndexProgressBar();
globalPanel = new JPanel(new BorderLayout());
globalPanel.add(split, BorderLayout.CENTER);
- globalPanel.add(indexProgressBar.getProgressBar(),
BorderLayout.SOUTH);
}
@@ -131,9 +128,6 @@
return commentTab;
}
- public IndexProgressBar getIndexProgressBar() {
- return indexProgressBar;
- }
public MainWindow getMainWindow() {
return mainWindow;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-07-01 23:17:43 UTC (rev 13871)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-07-01 23:34:45 UTC (rev 13872)
@@ -785,9 +785,6 @@
public static class IndexDownloader extends BasicIndexAction implements
Runnable, Observer {
- public boolean allStarted;
- public int toRemove;
-
public IndexDownloader(FCPQueueManager queueManager,
IndexBrowserPanel indexBrowser, final AbstractButton actionSource) {
super(queueManager, indexBrowser, actionSource);
}
@@ -797,21 +794,8 @@
}
public void apply() {
- int i;
-
- toRemove = 0;
- allStarted = false;
-
- i = getTarget().downloadFromFreenet(this,
getIndexBrowserPanel().getIndexTree(), getQueueManager());
-
+ getTarget().downloadFromFreenet(this,
getIndexBrowserPanel().getIndexTree(), getQueueManager());
getIndexBrowserPanel().getIndexTree().redraw(getTarget());
-
- if (i > 0)
-
getIndexBrowserPanel().getIndexProgressBar().addTransfer(i);
- else
- Logger.notice(this, "No download started ?!");
-
- allStarted = true;
}
public void update(Observable o, Object param) {
@@ -827,13 +811,6 @@
}
getIndexBrowserPanel().getUnknownIndexList().addLinks((LinkList)o);
-
- toRemove++;
-
- if (allStarted) {
-
getIndexBrowserPanel().getIndexProgressBar().removeTransfer(toRemove);
- toRemove = 0;
- }
}
}
@@ -851,9 +828,6 @@
public static class IndexUploader extends BasicIndexAction implements
Runnable, Observer {
- private boolean allStarted = false;
- private int toRemove = 0;
-
public IndexUploader(FCPQueueManager queueManager,
IndexBrowserPanel indexBrowser, final AbstractButton actionSource) {
super(queueManager, indexBrowser, actionSource);
}
@@ -866,32 +840,13 @@
}
public void apply() {
- int i;
+ getTarget().insertOnFreenet(this,
getIndexBrowserPanel(), getQueueManager());
- toRemove = 0;
- allStarted = false;
-
- i = getTarget().insertOnFreenet(this,
getIndexBrowserPanel(), getQueueManager());
-
getIndexBrowserPanel().getIndexTree().redraw(getTarget());
-
- if (i > 0)
-
getIndexBrowserPanel().getIndexProgressBar().addTransfer(i);
- else
- Logger.notice(this, "No insertion started ?!");
-
- allStarted = true;
}
public void update(Observable o, Object param) {
getIndexBrowserPanel().getIndexTree().redraw(((Index)o));
-
- toRemove++;
-
- if (allStarted) {
-
getIndexBrowserPanel().getIndexProgressBar().removeTransfer(toRemove);
- toRemove = 0;
- }
}
}
Deleted: trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
2007-07-01 23:17:43 UTC (rev 13871)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
2007-07-01 23:34:45 UTC (rev 13872)
@@ -1,72 +0,0 @@
-package thaw.plugins.index;
-
-import javax.swing.JProgressBar;
-
-import thaw.core.I18n;
-import thaw.core.Logger;
-
-public class IndexProgressBar {
-
- private JProgressBar progressBar;
-
- private int total;
- private int current;
-
- private int nmbTransfers;
-
- public IndexProgressBar() {
- progressBar = new JProgressBar(0, 100);
- total = 0;
- current = 0;
- nmbTransfers = 0;
- refreshBar();
- progressBar.setStringPainted(true);
- }
-
- public void addTransfer(int nmb) {
- Logger.info(this, "Adding "+Integer.toString(nmb)+" transfers");
-
- total += nmb;
- current += 0;
- nmbTransfers += nmb;
-
- refreshBar();
- }
-
-
- public void removeTransfer(int nmb) {
- Logger.info(this, "Removing "+Integer.toString(nmb)+"
transfers");
-
- nmbTransfers -= nmb;
-
- if (nmbTransfers <= 0) {
- total = 0;
- current = 0;
- }
- else {
- current++;
- }
-
- refreshBar();
- }
-
- public void refreshBar() {
- int pourcent;
-
- if (total == 0) {
- progressBar.setValue(0);
- progressBar.setString("");
- } else {
- pourcent = (current * 100) / total;
- progressBar.setValue(pourcent);
-
progressBar.setString(I18n.getMessage("thaw.plugin.index.indexLoading")+": "
- + Integer.toString(pourcent) + "
%");
- }
- }
-
- public JProgressBar getProgressBar() {
- return progressBar;
- }
-}
-
-
