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;
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;
import javax.swing.text.Document;
import net.pterodactylus.util.io.MimeTypes;
+import net.pterodactylus.util.swing.SwingUtils;
+import net.pterodactylus.util.thread.StoppableDelay;
import de.todesbaum.jsite.application.FileOption;
import de.todesbaum.jsite.application.Project;
import de.todesbaum.jsite.gui.FileScanner.ScannedFile;
/** The “scan files” action. */
private Action scanAction;
+ /** The “always force insert” checkbox. */
+ private JCheckBox alwaysForceInsertCheckBox;
+
/** The “ignore hidden files” checkbox. */
private JCheckBox ignoreHiddenFilesCheckBox;
/** The “mime type” combo box. */
private JComboBox fileOptionsMIMETypeComboBox;
+ /** Delayed notification for file scanning. */
+ private StoppableDelay 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.
*
private void createActions() {
scanAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.rescan")) {
+ @Override
@SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionScan();
I18nContainer.getInstance().registerRunnable(new Runnable() {
+ @Override
@SuppressWarnings("synthetic-access")
public void run() {
scanAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.rescan"));
*/
@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"));
JPanel fileOptionsPanel = new JPanel(new GridBagLayout());
fileOptionsAlignmentPanel.add(fileOptionsPanel, BorderLayout.PAGE_START);
+ alwaysForceInsertCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.always-force-insert"));
+ alwaysForceInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.always-force-insert.tooltip"));
+ alwaysForceInsertCheckBox.setName("always-force-insert");
+ alwaysForceInsertCheckBox.addActionListener(this);
+ fileOptionsPanel.add(alwaysForceInsertCheckBox, new GridBagConstraints(0, 0, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+
ignoreHiddenFilesCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.ignore-hidden-files"));
ignoreHiddenFilesCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.ignore-hidden-files.tooltip"));
ignoreHiddenFilesCheckBox.setName("ignore-hidden-files");
ignoreHiddenFilesCheckBox.addActionListener(this);
- fileOptionsPanel.add(ignoreHiddenFilesCheckBox, new GridBagConstraints(0, 0, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ fileOptionsPanel.add(ignoreHiddenFilesCheckBox, new GridBagConstraints(0, 1, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
- fileOptionsPanel.add(new JButton(scanAction), new GridBagConstraints(0, 1, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 0, 0, 0), 0, 0));
+ fileOptionsPanel.add(new JButton(scanAction), new GridBagConstraints(0, 2, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 0, 0, 0), 0, 0));
final JLabel fileOptionsLabel = new JLabel("<html><b>" + I18n.getMessage("jsite.project-files.file-options") + "</b></html>");
- fileOptionsPanel.add(fileOptionsLabel, new GridBagConstraints(0, 2, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 0, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsLabel, new GridBagConstraints(0, 3, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 0, 0, 0), 0, 0));
defaultFileCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.default"));
defaultFileCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.default.tooltip"));
defaultFileCheckBox.addActionListener(this);
defaultFileCheckBox.setEnabled(false);
- fileOptionsPanel.add(defaultFileCheckBox, new GridBagConstraints(0, 3, 5, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0));
+ fileOptionsPanel.add(defaultFileCheckBox, new GridBagConstraints(0, 4, 5, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0));
fileOptionsInsertCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.insert"), true);
fileOptionsInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.insert.tooltip"));
fileOptionsInsertCheckBox.addActionListener(this);
fileOptionsInsertCheckBox.setEnabled(false);
- fileOptionsPanel.add(fileOptionsInsertCheckBox, new GridBagConstraints(0, 4, 5, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsInsertCheckBox, new GridBagConstraints(0, 5, 5, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
fileOptionsForceInsertCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.force-insert"));
fileOptionsForceInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.force-insert.tooltip"));
fileOptionsForceInsertCheckBox.addActionListener(this);
fileOptionsForceInsertCheckBox.setEnabled(false);
- fileOptionsPanel.add(fileOptionsForceInsertCheckBox, new GridBagConstraints(0, 5, 5, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsForceInsertCheckBox, new GridBagConstraints(0, 6, 5, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
fileOptionsCustomKeyTextField = new JTextField(45);
fileOptionsCustomKeyTextField.setToolTipText(I18n.getMessage("jsite.project-files.custom-key.tooltip"));
fileOptionsInsertRedirectCheckBox.setEnabled(false);
final TLabel customKeyLabel = new TLabel(I18n.getMessage("jsite.project-files.custom-key") + ":", KeyEvent.VK_K, fileOptionsCustomKeyTextField);
- fileOptionsPanel.add(fileOptionsInsertRedirectCheckBox, new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
- fileOptionsPanel.add(customKeyLabel, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 6, 0, 0), 0, 0));
- fileOptionsPanel.add(fileOptionsCustomKeyTextField, new GridBagConstraints(2, 6, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsInsertRedirectCheckBox, new GridBagConstraints(0, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ fileOptionsPanel.add(customKeyLabel, new GridBagConstraints(1, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsCustomKeyTextField, new GridBagConstraints(2, 7, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
fileOptionsRenameCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.rename"), false);
fileOptionsRenameCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.rename.tooltip"));
}
}
+ @Override
public void changedUpdate(DocumentEvent documentEvent) {
storeText(documentEvent);
}
+ @Override
public void insertUpdate(DocumentEvent documentEvent) {
storeText(documentEvent);
}
+ @Override
public void removeUpdate(DocumentEvent documentEvent) {
storeText(documentEvent);
}
});
- 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));
+ fileOptionsPanel.add(fileOptionsRenameCheckBox, new GridBagConstraints(0, 8, 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, 8, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
fileOptionsMIMETypeComboBox = new JComboBox(MimeTypes.getAllMimeTypes().toArray());
fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip"));
fileOptionsMIMETypeComboBox.setEnabled(false);
final TLabel mimeTypeLabel = new TLabel(I18n.getMessage("jsite.project-files.mime-type") + ":", KeyEvent.VK_M, fileOptionsMIMETypeComboBox);
- 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));
+ fileOptionsPanel.add(mimeTypeLabel, new GridBagConstraints(0, 9, 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, 9, 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() {
+ alwaysForceInsertCheckBox.setText(I18n.getMessage("jsite.project-files.always-force-insert"));
+ alwaysForceInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.always-force-insert.tooltip"));
ignoreHiddenFilesCheckBox.setText(I18n.getMessage("jsite.project-files.ignore-hidden-files"));
ignoreHiddenFilesCheckBox.setToolTipText(I18n.getMessage("jsite.projet-files.ignore-hidden-files.tooltip"));
fileOptionsLabel.setText("<html><b>" + I18n.getMessage("jsite.project-files.file-options") + "</b></html>");
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"));
}
});
setHeading(MessageFormat.format(I18n.getMessage("jsite.project-files.heading"), project.getName()));
setDescription(I18n.getMessage("jsite.project-files.description"));
ignoreHiddenFilesCheckBox.setSelected(project.isIgnoreHiddenFiles());
+ alwaysForceInsertCheckBox.setSelected(project.isAlwaysForceInsert());
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"));
wizard.setPreviousEnabled(false);
wizard.setQuitEnabled(false);
- FileScanner fileScanner = new FileScanner(project);
- fileScanner.addFileScannerListener(this);
+ ignoreHiddenFilesCheckBox.setEnabled(false);
+ scanAction.setEnabled(false);
+
+ delayedNotification = new StoppableDelay(new Runnable() {
+
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() {
+ scanningFilesDialog.setVisible(true);
+ }
+ }, new Runnable() {
+
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() {
+ scanningFilesDialog.setVisible(false);
+ }
+ }, 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();
}
/**
* <p>
* Updates the file list.
*/
+ @Override
public void fileScannerFinished(FileScanner fileScanner) {
+ delayedNotification.finish();
final boolean error = fileScanner.isError();
if (!error) {
final List<ScannedFile> files = fileScanner.getFiles();
SwingUtilities.invokeLater(new Runnable() {
+ @Override
@SuppressWarnings("synthetic-access")
public void run() {
projectFileList.setListData(files.toArray());
}
SwingUtilities.invokeLater(new Runnable() {
+ @Override
@SuppressWarnings("synthetic-access")
public void run() {
wizard.setPreviousEnabled(true);
wizard.setNextEnabled(!error);
wizard.setQuitEnabled(true);
+ ignoreHiddenFilesCheckBox.setEnabled(true);
+ scanAction.setEnabled(true);
}
});
}
/**
* {@inheritDoc}
*/
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
Object source = actionEvent.getSource();
- if ((source instanceof JCheckBox) && ("ignore-hidden-files".equals(((JCheckBox) source).getName()))) {
- project.setIgnoreHiddenFiles(((JCheckBox) source).isSelected());
- actionScan();
- return;
+ if (source instanceof JCheckBox) {
+ String checkboxName = ((JCheckBox) source).getName();
+ if ("ignore-hidden-files".equals(checkboxName)) {
+ project.setIgnoreHiddenFiles(((JCheckBox) source).isSelected());
+ actionScan();
+ return;
+ } else if ("always-force-insert".equals(checkboxName)) {
+ project.setAlwaysForceInsert(((JCheckBox) source).isSelected());
+ valueChanged(null);
+ return;
+ }
}
ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
if (scannedFile == null) {
/**
* {@inheritDoc}
*/
+ @Override
@SuppressWarnings("null")
public void valueChanged(ListSelectionEvent e) {
ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
FileOption fileOption = project.getFileOption(filename);
defaultFileCheckBox.setSelected(filename.equals(project.getIndexFile()));
fileOptionsInsertCheckBox.setSelected(fileOption.isInsert());
- fileOptionsForceInsertCheckBox.setEnabled(scannedFile.getHash().equals(fileOption.getLastInsertHash()));
+ fileOptionsForceInsertCheckBox.setEnabled(!project.isAlwaysForceInsert() && scannedFile.getHash().equals(fileOption.getLastInsertHash()));
fileOptionsForceInsertCheckBox.setSelected(fileOption.isForceInsert());
fileOptionsInsertRedirectCheckBox.setEnabled(!fileOption.isInsert());
fileOptionsInsertRedirectCheckBox.setSelected(fileOption.isInsertRedirect());
/**
* {@inheritDoc}
*/
+ @Override
public void changedUpdate(DocumentEvent documentEvent) {
processDocumentUpdate(documentEvent);
}
/**
* {@inheritDoc}
*/
+ @Override
public void insertUpdate(DocumentEvent documentEvent) {
processDocumentUpdate(documentEvent);
}
/**
* {@inheritDoc}
*/
+ @Override
public void removeUpdate(DocumentEvent documentEvent) {
processDocumentUpdate(documentEvent);
}
projects / jSite.git / blobdiff