import java.text.DateFormat;
import java.text.MessageFormat;
import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.swing.AbstractAction;
import javax.swing.Action;
*/
public class ProjectInsertPage extends TWizardPage implements InsertListener, ClipboardOwner {
+ /** The logger. */
+ private static final Logger logger = Logger.getLogger(ProjectInsertPage.class.getName());
+
/** The project inserter. */
private ProjectInserter projectInserter;
/** 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.
*
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() {
}
/**
- * Sets whether to activate the debug mode.
- *
- * @param debug
- * <code>true</code> to activate the debug mode,
- * <code>false</code> to deactivate.
- */
- public void setDebug(boolean debug) {
- projectInserter.setDebug(debug);
- }
-
- /**
* Sets the project to insert.
*
* @param project
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
//
* {@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()));
}
});
}
/**
* {@inheritDoc}
*/
+ public void projectUploadFinished(Project project) {
+ startTime = System.currentTimeMillis();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void projectURIGenerated(Project project, final String uri) {
SwingUtilities.invokeLater(new Runnable() {
requestURITextField.setText(uri);
}
});
+ logger.log(Level.FINEST, "Insert generated URI: " + uri);
+ int slash = uri.indexOf('/');
+ slash = uri.indexOf('/', slash + 1);
+ int secondSlash = uri.indexOf('/', slash + 1);
+ if (secondSlash == -1) {
+ secondSlash = uri.length();
+ }
+ String editionNumber = uri.substring(slash + 1, secondSlash);
+ logger.log(Level.FINEST, "Extracted edition number: " + editionNumber);
+ int edition = -1;
+ try {
+ edition = Integer.valueOf(editionNumber);
+ } catch (NumberFormatException nfe1) {
+ /* ignore. */
+ }
+ logger.log(Level.FINEST, "Insert edition: " + edition + ", Project edition: " + project.getEdition());
+ if ((edition != -1) && (edition == project.getEdition())) {
+ JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.reinserted-edition"), I18n.getMessage("jsite.insert.reinserted-edition.title"), JOptionPane.INFORMATION_MESSAGE);
+ }
}
/**
* {@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")
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));
*/
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.general.ok"), copyURILabel }, copyURILabel);
+ if (selectedValue == 1) {
+ actionCopyURI();
+ }
} else {
if (cause == null) {
JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE);
@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);
}
* 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);
}
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
//
projects / jSite.git / blobdiff