X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectInsertPage.java;h=2cedd5b567167bf25d11fb2e5ae223a75c144028;hb=56b5bbc99fc0179022aba3c7a847b71122963801;hp=c871261063040942599b4dcc1ac2a60acd13eead;hpb=c31cd04312c68fc7f629e7cf22509d8694e677d5;p=jSite.git diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java index c871261..2cedd5b 100644 --- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java +++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java @@ -56,18 +56,42 @@ import de.todesbaum.util.swing.TWizard; import de.todesbaum.util.swing.TWizardPage; /** + * Wizard page that shows the progress of an insert. + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> */ public class ProjectInsertPage extends TWizardPage implements InsertListener, ClipboardOwner { + /** The project inserter. */ private ProjectInserter projectInserter; + /** The “copy URI” action. */ private Action copyURIAction; + + /** The “request URI” textfield. */ private JTextField requestURITextField; + + /** The “start time” label. */ private JLabel startTimeLabel; + + /** The progress bar. */ private JProgressBar progressBar; + + /** The start time of the insert. */ private long startTime = 0; + /** The number of inserted blocks. */ + private volatile int insertedBlocks; + + /** Whether the “copy URI to clipboard” button was used. */ + private boolean uriCopied; + + /** + * Creates a new progress insert wizard page. + * + * @param wizard + * The wizard this page belongs to + */ public ProjectInsertPage(final TWizard wizard) { super(wizard); createActions(); @@ -85,6 +109,9 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl projectInserter.addInsertListener(this); } + /** + * Creates all used actions. + */ private void createActions() { copyURIAction = new AbstractAction(I18n.getMessage("jsite.project.action.copy-uri")) { @@ -107,11 +134,19 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl }); } + /** + * Initializes the page. + */ private void pageInit() { setLayout(new BorderLayout(12, 12)); add(createProjectInsertPanel(), BorderLayout.CENTER); } + /** + * Creates the main panel. + * + * @return The main panel + */ private JComponent createProjectInsertPanel() { JComponent projectInsertPanel = new JPanel(new GridBagLayout()); @@ -135,7 +170,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl final JLabel progressLabel = new JLabel(I18n.getMessage("jsite.insert.progress") + ":"); projectInsertPanel.add(progressLabel, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0)); projectInsertPanel.add(progressBar, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0)); - projectInsertPanel.add(new JButton(copyURIAction), new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0)); + projectInsertPanel.add(new JButton(copyURIAction), new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(12, 18, 0, 0), 0, 0)); I18nContainer.getInstance().registerRunnable(new Runnable() { @@ -167,6 +202,9 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl this.wizard.setQuitName(I18n.getMessage("jsite.wizard.quit")); } + /** + * Starts the insert. + */ public void startInsert() { wizard.setNextEnabled(false); copyURIAction.setEnabled(false); @@ -177,16 +215,10 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl } /** - * @param debug - * The debug to set. - */ - public void setDebug(boolean debug) { - projectInserter.setDebug(debug); - } - - /** + * Sets the project to insert. + * * @param project - * The project to set. + * The project to insert */ public void setProject(final Project project) { projectInserter.setProject(project); @@ -199,10 +231,38 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl }); } + /** + * Sets the freenet interface to use. + * + * @param freenetInterface + * The freenet interface to use + */ public void setFreenetInterface(Freenet7Interface freenetInterface) { projectInserter.setFreenetInterface(freenetInterface); } + /** + * Sets the project inserter’s temp directory. + * + * @see ProjectInserter#setTempDirectory(String) + * @param tempDirectory + * The temp directory to use, or {@code null} to use the system + * default + */ + public void setTempDirectory(String tempDirectory) { + projectInserter.setTempDirectory(tempDirectory); + } + + /** + * Returns whether the “copy URI to clipboard” button was used. + * + * @return {@code true} if an URI was copied to clipboard, {@code false} + * otherwise + */ + public boolean wasUriCopied() { + return uriCopied; + } + // // INTERFACE InsertListener // @@ -211,12 +271,12 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl * {@inheritDoc} */ public void projectInsertStarted(final Project project) { - startTime = System.currentTimeMillis(); + SwingUtilities.invokeLater(new Runnable() { @SuppressWarnings("synthetic-access") public void run() { - startTimeLabel.setText(DateFormat.getDateTimeInstance().format(new Date(startTime))); + startTimeLabel.setText(DateFormat.getDateTimeInstance().format(new Date())); } }); } @@ -224,6 +284,13 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl /** * {@inheritDoc} */ + public void projectUploadFinished(Project project) { + startTime = System.currentTimeMillis(); + } + + /** + * {@inheritDoc} + */ public void projectURIGenerated(Project project, final String uri) { SwingUtilities.invokeLater(new Runnable() { @@ -239,6 +306,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl * {@inheritDoc} */ public void projectInsertProgress(Project project, final int succeeded, final int failed, final int fatal, final int total, final boolean finalized) { + insertedBlocks = succeeded; SwingUtilities.invokeLater(new Runnable() { @SuppressWarnings("synthetic-access") @@ -248,8 +316,10 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl int progress = (succeeded + failed + fatal) * 100 / total; StringBuilder progressString = new StringBuilder(); progressString.append(progress).append("% ("); - progressString.append(succeeded + failed + fatal).append("/").append(total); - progressString.append(")"); + progressString.append(succeeded + failed + fatal).append('/').append(total); + progressString.append(") ("); + progressString.append(getTransferRate()); + progressString.append(' ').append(I18n.getMessage("jsite.insert.k-per-s")).append(')'); progressBar.setString(progressString.toString()); if (finalized) { progressBar.setFont(progressBar.getFont().deriveFont(Font.BOLD)); @@ -263,7 +333,11 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl */ public void projectInsertFinished(Project project, boolean success, Throwable cause) { if (success) { - JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.inserted"), null, JOptionPane.INFORMATION_MESSAGE); + String copyURILabel = I18n.getMessage("jsite.insert.okay-copy-uri"); + int selectedValue = JOptionPane.showOptionDialog(this, I18n.getMessage("jsite.insert.inserted"), I18n.getMessage("jsite.insert.done.title"), 0, JOptionPane.INFORMATION_MESSAGE, null, new Object[] { I18n.getMessage("jsite.insert.okay"), copyURILabel }, copyURILabel); + if (selectedValue == 1) { + actionCopyURI(); + } } else { if (cause == null) { JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE); @@ -276,7 +350,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl @SuppressWarnings("synthetic-access") public void run() { progressBar.setValue(progressBar.getMaximum()); - progressBar.setString(I18n.getMessage("jsite.insert.done")); + progressBar.setString(I18n.getMessage("jsite.insert.done") + " (" + getTransferRate() + " " + I18n.getMessage("jsite.insert.k-per-s") + ")"); wizard.setNextEnabled(true); wizard.setQuitEnabled(true); } @@ -287,11 +361,46 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl // ACTIONS // + /** + * Copies the request URI of the project to the clipboard. + */ private void actionCopyURI() { + uriCopied = true; Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); clipboard.setContents(new StringSelection(requestURITextField.getText()), this); } + /** + * Formats the given number so that it always has the the given number of + * fractional digits. + * + * @param number + * The number to format + * @param digits + * The number of fractional digits + * @return The formatted number + */ + private String formatNumber(double number, int digits) { + int multiplier = (int) Math.pow(10, digits); + String formattedNumber = String.valueOf((int) (number * multiplier) / (double) multiplier); + if (formattedNumber.indexOf('.') == -1) { + formattedNumber += '.'; + for (int digit = 0; digit < digits; digit++) { + formattedNumber += "0"; + } + } + return formattedNumber; + } + + /** + * Returns the formatted transfer rate at this point. + * + * @return The formatted transfer rate + */ + private String getTransferRate() { + return formatNumber(insertedBlocks * 32.0 / ((System.currentTimeMillis() - startTime) / 1000), 1); + } + // // INTERFACE ClipboardOwner // @@ -300,6 +409,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl * {@inheritDoc} */ public void lostOwnership(Clipboard clipboard, Transferable contents) { + /* ignore. */ } }