X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectFilesPage.java;h=9321d6e4cf25b7155552b2688f00d0f4c45b0982;hb=c6ea6c65ccbaa523847309272a11050538869a5f;hp=80bb52c38fd89a72998defaf05159fc0e7409ec9;hpb=0e88169c3e8decfcd99f39f5ecf3a85df50c3fca;p=jSite.git diff --git a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java index 80bb52c..9321d6e 100644 --- a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java +++ b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java @@ -26,6 +26,8 @@ import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.text.MessageFormat; import java.util.HashSet; import java.util.Iterator; @@ -34,18 +36,23 @@ import java.util.Set; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; +import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JProgressBar; import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.ListSelectionModel; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; @@ -53,12 +60,14 @@ import javax.swing.event.ListSelectionListener; import javax.swing.text.BadLocationException; import javax.swing.text.Document; +import net.pterodactylus.util.io.MimeTypes; +import net.pterodactylus.util.swing.DelayedNotification; +import net.pterodactylus.util.swing.SwingUtils; import de.todesbaum.jsite.application.FileOption; import de.todesbaum.jsite.application.Project; import de.todesbaum.jsite.gui.FileScanner.ScannedFile; import de.todesbaum.jsite.i18n.I18n; import de.todesbaum.jsite.i18n.I18nContainer; -import de.todesbaum.util.mime.DefaultMIMETypes; import de.todesbaum.util.swing.TLabel; import de.todesbaum.util.swing.TWizard; import de.todesbaum.util.swing.TWizardPage; @@ -106,6 +115,18 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis /** The “mime type” combo box. */ private JComboBox fileOptionsMIMETypeComboBox; + /** Delayed notification for file scanning. */ + private DelayedNotification delayedNotification; + + /** Dialog to display while scanning. */ + private JDialog scanningFilesDialog; + + /** The file scanner. */ + private FileScanner fileScanner; + + /** The progress bar. */ + private JProgressBar progressBar; + /** * Creates a new project file page. * @@ -132,6 +153,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis private void createActions() { scanAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.rescan")) { + @Override @SuppressWarnings("synthetic-access") public void actionPerformed(ActionEvent actionEvent) { actionScan(); @@ -142,6 +164,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis I18nContainer.getInstance().registerRunnable(new Runnable() { + @Override @SuppressWarnings("synthetic-access") public void run() { scanAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.rescan")); @@ -155,6 +178,10 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis */ @Override public void pageAdded(TWizard wizard) { + /* create file scanner. */ + fileScanner = new FileScanner(project); + fileScanner.addFileScannerListener(this); + actionScan(); this.wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous")); this.wizard.setNextName(I18n.getMessage("jsite.project-files.insert-now")); @@ -262,14 +289,17 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis } } + @Override public void changedUpdate(DocumentEvent documentEvent) { storeText(documentEvent); } + @Override public void insertUpdate(DocumentEvent documentEvent) { storeText(documentEvent); } + @Override public void removeUpdate(DocumentEvent documentEvent) { storeText(documentEvent); } @@ -279,7 +309,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis fileOptionsPanel.add(fileOptionsRenameCheckBox, new GridBagConstraints(0, 7, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0)); fileOptionsPanel.add(fileOptionsRenameTextField, new GridBagConstraints(2, 7, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0)); - fileOptionsMIMETypeComboBox = new JComboBox(DefaultMIMETypes.getAllMIMETypes()); + fileOptionsMIMETypeComboBox = new JComboBox(MimeTypes.getAllMimeTypes().toArray()); fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip")); fileOptionsMIMETypeComboBox.setName("project-files.mime-type"); fileOptionsMIMETypeComboBox.addActionListener(this); @@ -290,8 +320,39 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis fileOptionsPanel.add(mimeTypeLabel, new GridBagConstraints(0, 8, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0)); fileOptionsPanel.add(fileOptionsMIMETypeComboBox, new GridBagConstraints(1, 8, 4, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0)); + /* create dialog to show while scanning. */ + scanningFilesDialog = new JDialog(wizard); + scanningFilesDialog.setModal(true); + scanningFilesDialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + + JPanel progressPanel = new JPanel(new BorderLayout(12, 12)); + scanningFilesDialog.getContentPane().add(progressPanel, BorderLayout.CENTER); + progressPanel.setBorder(BorderFactory.createEmptyBorder(12, 12, 12, 12)); + + final TLabel scanningLabel = new TLabel(I18n.getMessage("jsite.project-files.scanning"), SwingConstants.CENTER); + progressPanel.add(scanningLabel, BorderLayout.NORTH); + progressBar = new JProgressBar(SwingConstants.HORIZONTAL); + progressPanel.add(progressBar, BorderLayout.SOUTH); + progressBar.setIndeterminate(true); + progressBar.setStringPainted(true); + progressBar.setPreferredSize(new Dimension(progressBar.getPreferredSize().width * 2, progressBar.getPreferredSize().height)); + + scanningFilesDialog.pack(); + scanningFilesDialog.addWindowListener(new WindowAdapter() { + + /** + * {@inheritDoc} + */ + @Override + @SuppressWarnings("synthetic-access") + public void windowOpened(WindowEvent e) { + SwingUtils.center(scanningFilesDialog, wizard); + } + }); + I18nContainer.getInstance().registerRunnable(new Runnable() { + @Override @SuppressWarnings("synthetic-access") public void run() { ignoreHiddenFilesCheckBox.setText(I18n.getMessage("jsite.project-files.ignore-hidden-files")); @@ -311,6 +372,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis fileOptionsRenameCheckBox.setToolTipText("jsite.project-files.rename.tooltip"); fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip")); mimeTypeLabel.setText(I18n.getMessage("jsite.project-files.mime-type") + ":"); + scanningLabel.setText(I18n.getMessage("jsite.project-files.scanning")); } }); @@ -330,6 +392,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis ignoreHiddenFilesCheckBox.setSelected(project.isIgnoreHiddenFiles()); I18nContainer.getInstance().registerRunnable(new Runnable() { + @Override public void run() { setHeading(MessageFormat.format(I18n.getMessage("jsite.project-files.heading"), project.getName())); setDescription(I18n.getMessage("jsite.project-files.description")); @@ -352,9 +415,24 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis wizard.setPreviousEnabled(false); wizard.setQuitEnabled(false); - FileScanner fileScanner = new FileScanner(project); - fileScanner.addFileScannerListener(this); + delayedNotification = new DelayedNotification(scanningFilesDialog, 2000); new Thread(fileScanner).start(); + new Thread(delayedNotification).start(); + new Thread(new Runnable() { + + @Override + @SuppressWarnings("synthetic-access") + public void run() { + while (!delayedNotification.isFinished()) { + try { + Thread.sleep(250); + } catch (InterruptedException ie1) { + /* ignore. */ + } + progressBar.setString(fileScanner.getLastFilename()); + } + } + }).start(); } /** @@ -362,12 +440,15 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis *

* Updates the file list. */ + @Override public void fileScannerFinished(FileScanner fileScanner) { + delayedNotification.finish(); final boolean error = fileScanner.isError(); if (!error) { final List files = fileScanner.getFiles(); SwingUtilities.invokeLater(new Runnable() { + @Override @SuppressWarnings("synthetic-access") public void run() { projectFileList.setListData(files.toArray()); @@ -397,6 +478,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis } SwingUtilities.invokeLater(new Runnable() { + @Override @SuppressWarnings("synthetic-access") public void run() { wizard.setPreviousEnabled(true); @@ -428,6 +510,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis /** * {@inheritDoc} */ + @Override public void actionPerformed(ActionEvent actionEvent) { Object source = actionEvent.getSource(); if ((source instanceof JCheckBox) && ("ignore-hidden-files".equals(((JCheckBox) source).getName()))) { @@ -487,6 +570,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis /** * {@inheritDoc} */ + @Override @SuppressWarnings("null") public void valueChanged(ListSelectionEvent e) { ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue(); @@ -523,7 +607,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis fileOptionsRenameCheckBox.setSelected(false); fileOptionsRenameTextField.setEnabled(false); fileOptionsRenameTextField.setText(""); - fileOptionsMIMETypeComboBox.getModel().setSelectedItem(DefaultMIMETypes.DEFAULT_MIME_TYPE); + fileOptionsMIMETypeComboBox.getModel().setSelectedItem(MimeTypes.DEFAULT_CONTENT_TYPE); } } @@ -556,6 +640,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis /** * {@inheritDoc} */ + @Override public void changedUpdate(DocumentEvent documentEvent) { processDocumentUpdate(documentEvent); } @@ -563,6 +648,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis /** * {@inheritDoc} */ + @Override public void insertUpdate(DocumentEvent documentEvent) { processDocumentUpdate(documentEvent); } @@ -570,6 +656,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis /** * {@inheritDoc} */ + @Override public void removeUpdate(DocumentEvent documentEvent) { processDocumentUpdate(documentEvent); }