/*
- * jSite - ProjectFilesPage.java - Copyright © 2006–2011 David Roden
+ * jSite - ProjectFilesPage.java - Copyright © 2006–2012 David Roden
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
/** The “insert” checkbox. */
private JCheckBox fileOptionsInsertCheckBox;
+ /** The “force insert” checkbox. */
+ private JCheckBox fileOptionsForceInsertCheckBox;
+
/** The “insert redirect” checkbox. */
private JCheckBox fileOptionsInsertRedirectCheckBox;
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));
+ fileOptionsForceInsertCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.force-insert"));
+ fileOptionsForceInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.force-insert.tooltip"));
+ fileOptionsForceInsertCheckBox.setName("force-insert");
+ fileOptionsForceInsertCheckBox.setMnemonic(KeyEvent.VK_F);
+ 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));
+
fileOptionsCustomKeyTextField = new JTextField(45);
fileOptionsCustomKeyTextField.setToolTipText(I18n.getMessage("jsite.project-files.custom-key.tooltip"));
fileOptionsCustomKeyTextField.setEnabled(false);
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, 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));
+ 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));
fileOptionsRenameCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.rename"), false);
fileOptionsRenameCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.rename.tooltip"));
@SuppressWarnings("synthetic-access")
private void storeText(DocumentEvent documentEvent) {
FileOption fileOption = getSelectedFile();
+ if (fileOption == null) {
+ /* no file selected. */
+ return;
+ }
Document document = documentEvent.getDocument();
int documentLength = document.getLength();
try {
});
- fileOptionsPanel.add(fileOptionsRenameCheckBox, new GridBagConstraints(0, 6, 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, 6, 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, 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.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, 7, 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, 7, 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, 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));
I18nContainer.getInstance().registerRunnable(new Runnable() {
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"));
+ fileOptionsForceInsertCheckBox.setText(I18n.getMessage("jsite.project-files.force-insert"));
+ fileOptionsForceInsertCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.force-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"));
});
}
- /**
- * Returns a list of all project files.
- *
- * @return All project files
- */
- private List<String> getProjectFiles() {
- List<String> files = new ArrayList<String>();
- for (int index = 0, size = projectFileList.getModel().getSize(); index < size; index++) {
- files.add((String) projectFileList.getModel().getElementAt(index));
- }
- return files;
- }
-
//
// ACTIONS
//
@SuppressWarnings("synthetic-access")
public void run() {
- String[] filenames = new String[files.size()];
- for (int fileIndex = 0; fileIndex < files.size(); ++fileIndex) {
- filenames[fileIndex] = files.get(fileIndex).getFilename();
- }
- projectFileList.setListData(filenames);
+ projectFileList.setListData(files.toArray());
projectFileList.clearSelection();
}
});
Iterator<String> filenames = new HashSet<String>(project.getFileOptions().keySet()).iterator();
while (filenames.hasNext()) {
String filename = filenames.next();
- if (!files.contains(filename)) {
+ boolean found = false;
+ for (ScannedFile scannedFile : files) {
+ if (scannedFile.getFilename().equals(filename)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
entriesToRemove.add(filename);
}
}
* no file is selected
*/
private FileOption getSelectedFile() {
- String filename = (String) projectFileList.getSelectedValue();
- if (filename == null) {
+ ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
+ if (scannedFile == null) {
return null;
}
- return project.getFileOption(filename);
+ return project.getFileOption(scannedFile.getFilename());
}
//
actionScan();
return;
}
- String filename = (String) projectFileList.getSelectedValue();
- if (filename == null) {
+ ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
+ if (scannedFile == null) {
return;
}
+ String filename = scannedFile.getFilename();
FileOption fileOption = project.getFileOption(filename);
if (source instanceof JCheckBox) {
JCheckBox checkBox = (JCheckBox) source;
boolean isInsert = checkBox.isSelected();
fileOption.setInsert(isInsert);
fileOptionsInsertRedirectCheckBox.setEnabled(!isInsert);
+ } else if ("force-insert".equals(checkBox.getName())) {
+ boolean isForceInsert = checkBox.isSelected();
+ fileOption.setForceInsert(isForceInsert);
} else if ("insert-redirect".equals(checkBox.getName())) {
boolean isInsertRedirect = checkBox.isSelected();
fileOption.setInsertRedirect(isInsertRedirect);
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("null")
public void valueChanged(ListSelectionEvent e) {
- String filename = (String) projectFileList.getSelectedValue();
- boolean enabled = filename != null;
- boolean insert = fileOptionsInsertCheckBox.isSelected();
+ ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
+ boolean enabled = scannedFile != null;
+ String filename = (scannedFile == null) ? null : scannedFile.getFilename();
defaultFileCheckBox.setEnabled(enabled);
fileOptionsInsertCheckBox.setEnabled(enabled);
fileOptionsRenameCheckBox.setEnabled(enabled);
FileOption fileOption = project.getFileOption(filename);
defaultFileCheckBox.setSelected(filename.equals(project.getIndexFile()));
fileOptionsInsertCheckBox.setSelected(fileOption.isInsert());
+ fileOptionsForceInsertCheckBox.setEnabled(scannedFile.getHash().equals(fileOption.getLastInsertHash()));
+ fileOptionsForceInsertCheckBox.setSelected(fileOption.isForceInsert());
fileOptionsInsertRedirectCheckBox.setEnabled(!fileOption.isInsert());
fileOptionsInsertRedirectCheckBox.setSelected(fileOption.isInsertRedirect());
fileOptionsCustomKeyTextField.setEnabled(fileOption.isInsertRedirect());
} else {
defaultFileCheckBox.setSelected(false);
fileOptionsInsertCheckBox.setSelected(true);
+ fileOptionsForceInsertCheckBox.setEnabled(false);
+ fileOptionsForceInsertCheckBox.setSelected(false);
fileOptionsInsertRedirectCheckBox.setEnabled(false);
fileOptionsInsertRedirectCheckBox.setSelected(false);
fileOptionsCustomKeyTextField.setEnabled(false);
* The document event to process
*/
private void processDocumentUpdate(DocumentEvent documentEvent) {
- String filename = (String) projectFileList.getSelectedValue();
- if (filename == null) {
+ ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
+ if (scannedFile == null) {
return;
}
- FileOption fileOption = project.getFileOption(filename);
+ FileOption fileOption = project.getFileOption(scannedFile.getFilename());
Document document = documentEvent.getDocument();
try {
String text = document.getText(0, document.getLength());
projects / jSite.git / blobdiff