/** The “delete container” action. */
protected Action deleteContainerAction;
+ /** The “ignore hidden files” checkbox. */
+ private JCheckBox ignoreHiddenFilesCheckBox;
+
/** The list of project files. */
private JList projectFileList;
/** The “insert” checkbox. */
private JCheckBox fileOptionsInsertCheckBox;
+ /** The “insert redirect” checkbox. */
+ private JCheckBox fileOptionsInsertRedirectCheckBox;
+
/** The “custom key” textfield. */
private JTextField fileOptionsCustomKeyTextField;
JPanel fileOptionsPanel = new JPanel(new GridBagLayout());
fileOptionsAlignmentPanel.add(fileOptionsPanel, BorderLayout.PAGE_START);
- fileOptionsPanel.add(new JButton(scanAction), 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(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));
final JLabel fileOptionsLabel = new JLabel("<html><b>" + I18n.getMessage("jsite.project-files.file-options") + "</b></html>");
- fileOptionsPanel.add(fileOptionsLabel, 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(fileOptionsLabel, new GridBagConstraints(0, 2, 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, 2, 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, 3, 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, 3, 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, 4, 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"));
fileOptionsCustomKeyTextField.setEnabled(false);
fileOptionsCustomKeyTextField.getDocument().addDocumentListener(this);
+ fileOptionsInsertRedirectCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.insert-redirect"), false);
+ fileOptionsInsertRedirectCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.insert-redirect.tooltip"));
+ fileOptionsInsertRedirectCheckBox.setName("insert-redirect");
+ fileOptionsInsertRedirectCheckBox.setMnemonic(KeyEvent.VK_R);
+ fileOptionsInsertRedirectCheckBox.addActionListener(this);
+
final TLabel customKeyLabel = new TLabel(I18n.getMessage("jsite.project-files.custom-key") + ":", KeyEvent.VK_K, fileOptionsCustomKeyTextField);
- fileOptionsPanel.add(customKeyLabel, new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
- fileOptionsPanel.add(fileOptionsCustomKeyTextField, new GridBagConstraints(1, 4, 4, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsInsertRedirectCheckBox, new GridBagConstraints(0, 5, 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, 5, 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, 5, 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.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, 5, 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, 5, 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, 6, 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, 6, 4, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
containerComboBoxModel = new DefaultComboBoxModel();
fileOptionsContainerComboBox = new JComboBox(containerComboBoxModel);
editContainerButton.setVisible(false);
JButton deleteContainerButton = new JButton(deleteContainerAction);
deleteContainerButton.setVisible(false);
- fileOptionsPanel.add(containerLabel, 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(fileOptionsContainerComboBox, new GridBagConstraints(1, 6, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
- fileOptionsPanel.add(addContainerButton, new GridBagConstraints(2, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
- fileOptionsPanel.add(editContainerButton, new GridBagConstraints(3, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
- fileOptionsPanel.add(deleteContainerButton, new GridBagConstraints(4, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(containerLabel, 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(fileOptionsContainerComboBox, new GridBagConstraints(1, 7, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(addContainerButton, new GridBagConstraints(2, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(editContainerButton, new GridBagConstraints(3, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
+ fileOptionsPanel.add(deleteContainerButton, new GridBagConstraints(4, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
JPanel fileOptionsReplacementPanel = new JPanel(new FlowLayout(FlowLayout.LEADING, 6, 6));
fileOptionsReplacementPanel.setBorder(new EmptyBorder(-6, -6, -6, -6));
replacementCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.replacement.tooltip"));
replacementCheckBox.addActionListener(this);
replacementCheckBox.setEnabled(false);
+ replacementCheckBox.setVisible(false);
fileOptionsReplacementPanel.add(replacementCheckBox);
replaceEditionRangeSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 99, 1));
replaceEditionRangeSpinner.setToolTipText(I18n.getMessage("jsite.project-files.replacement.edition-range.tooltip"));
replaceEditionRangeSpinner.addChangeListener(this);
replaceEditionRangeSpinner.setEnabled(false);
+ replaceEditionRangeSpinner.setVisible(false);
final JLabel editionRangeLabel = new JLabel(I18n.getMessage("jsite.project-files.replacement.edition-range"));
+ editionRangeLabel.setVisible(false);
fileOptionsReplacementPanel.add(editionRangeLabel);
fileOptionsReplacementPanel.add(replaceEditionRangeSpinner);
- fileOptionsPanel.add(fileOptionsReplacementPanel, new GridBagConstraints(0, 7, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0));
+ fileOptionsPanel.add(fileOptionsReplacementPanel, new GridBagConstraints(0, 8, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0));
I18nContainer.getInstance().registerRunnable(new Runnable() {
@SuppressWarnings("synthetic-access")
public void run() {
+ 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>");
defaultFileCheckBox.setText(I18n.getMessage("jsite.project-files.default"));
defaultFileCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.default.tooltip"));
fileOptionsInsertCheckBox.setText(I18n.getMessage("jsite.project-files.insert"));
fileOptionsInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.insert.tooltip"));
+ fileOptionsInsertRedirectCheckBox.setText(I18n.getMessage("jsite.project-files.insert-redirect"));
+ fileOptionsInsertRedirectCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.insert-redirect.tooltip"));
fileOptionsCustomKeyTextField.setToolTipText(I18n.getMessage("jsite.project-files.custom-key.tooltip"));
customKeyLabel.setText(I18n.getMessage("jsite.project-files.custom-key") + ":");
fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip"));
this.project = project;
setHeading(MessageFormat.format(I18n.getMessage("jsite.project-files.heading"), project.getName()));
setDescription(I18n.getMessage("jsite.project-files.description"));
+ ignoreHiddenFilesCheckBox.setSelected(project.isIgnoreHiddenFiles());
I18nContainer.getInstance().registerRunnable(new Runnable() {
public void run() {
}
});
Set<String> entriesToRemove = new HashSet<String>();
- Iterator<String> filenames = project.getFileOptions().keySet().iterator();
+ Iterator<String> filenames = new HashSet<String>(project.getFileOptions().keySet()).iterator();
while (filenames.hasNext()) {
String filename = filenames.next();
if (!files.contains(filename)) {
* {@inheritDoc}
*/
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;
+ }
String filename = (String) projectFileList.getSelectedValue();
if (filename == null) {
return;
}
FileOption fileOption = project.getFileOption(filename);
- Object source = actionEvent.getSource();
if (source instanceof JCheckBox) {
JCheckBox checkBox = (JCheckBox) source;
if ("default-file".equals(checkBox.getName())) {
}
} else if ("insert".equals(checkBox.getName())) {
boolean isInsert = checkBox.isSelected();
- fileOptionsCustomKeyTextField.setEnabled(!isInsert);
fileOption.setInsert(isInsert);
if (!isInsert) {
fileOptionsContainerComboBox.setSelectedItem("");
}
+ fileOptionsInsertRedirectCheckBox.setEnabled(!isInsert);
+ } else if ("insert-redirect".equals(checkBox.getName())) {
+ boolean isInsertRedirect = checkBox.isSelected();
+ fileOption.setInsertRedirect(isInsertRedirect);
+ fileOptionsCustomKeyTextField.setEnabled(isInsertRedirect);
} else if ("project-files.replace-edition".equals(checkBox.getName())) {
boolean replaceEdition = checkBox.isSelected();
fileOption.setReplaceEdition(replaceEdition);
boolean insert = fileOptionsInsertCheckBox.isSelected();
defaultFileCheckBox.setEnabled(enabled);
fileOptionsInsertCheckBox.setEnabled(enabled);
- fileOptionsCustomKeyTextField.setEnabled(enabled && !insert);
fileOptionsMIMETypeComboBox.setEnabled(enabled);
fileOptionsContainerComboBox.setEnabled(enabled);
addContainerAction.setEnabled(enabled);
FileOption fileOption = project.getFileOption(filename);
defaultFileCheckBox.setSelected(filename.equals(project.getIndexFile()));
fileOptionsInsertCheckBox.setSelected(fileOption.isInsert());
+ fileOptionsInsertRedirectCheckBox.setEnabled(!fileOption.isInsert());
+ fileOptionsInsertRedirectCheckBox.setSelected(fileOption.isInsertRedirect());
+ fileOptionsCustomKeyTextField.setEnabled(fileOption.isInsertRedirect());
fileOptionsCustomKeyTextField.setText(fileOption.getCustomKey());
fileOptionsMIMETypeComboBox.getModel().setSelectedItem(fileOption.getMimeType());
fileOptionsContainerComboBox.setSelectedItem(fileOption.getContainer());
} else {
defaultFileCheckBox.setSelected(false);
fileOptionsInsertCheckBox.setSelected(true);
+ fileOptionsInsertRedirectCheckBox.setEnabled(false);
+ fileOptionsInsertRedirectCheckBox.setSelected(false);
+ fileOptionsCustomKeyTextField.setEnabled(false);
fileOptionsCustomKeyTextField.setText("CHK@");
fileOptionsMIMETypeComboBox.getModel().setSelectedItem(DefaultMIMETypes.DEFAULT_MIME_TYPE);
fileOptionsContainerComboBox.setSelectedItem("");
projects / jSite.git / blobdiff