X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectFilesPage.java;h=4ae819fc2d15dfded6ec8e8975e799b5dff70222;hb=6a27a4ea40649df0a8fb62f9c79da1f7c1ce5507;hp=b256e51dd3d9e7bbd2152d69dd8ac9124d67dd40;hpb=e4f461213da0e30faf9e9eb2e97626abff320618;p=jSite.git
diff --git a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
index b256e51..4ae819f 100644
--- a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -31,8 +31,11 @@ import java.awt.event.KeyEvent;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+import java.util.Map.Entry;
import javax.swing.AbstractAction;
import javax.swing.Action;
@@ -61,10 +64,10 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
-import de.todesbaum.jsite.application.EditionProject;
import de.todesbaum.jsite.application.FileOption;
import de.todesbaum.jsite.application.Project;
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;
@@ -76,14 +79,12 @@ import de.todesbaum.util.swing.TWizardPage;
*/
public class ProjectFilesPage extends TWizardPage implements ActionListener, ListSelectionListener, DocumentListener, FileScannerListener, ChangeListener {
- protected TWizard wizard;
-
protected Project project;
- private Action scanAction;
- private Action editContainerAction;
- private Action addContainerAction;
- private Action deleteContainerAction;
+ protected Action scanAction;
+ protected Action editContainerAction;
+ protected Action addContainerAction;
+ protected Action deleteContainerAction;
protected JList projectFileList;
private JCheckBox defaultFileCheckBox;
@@ -95,8 +96,8 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
private JSpinner replaceEditionRangeSpinner;
private JCheckBox replacementCheckBox;
- public ProjectFilesPage() {
- super();
+ public ProjectFilesPage(final TWizard wizard) {
+ super(wizard);
pageInit();
}
@@ -142,12 +143,28 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
};
deleteContainerAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project-files.action.delete-container.tooltip"));
deleteContainerAction.setEnabled(false);
+
+ I18nContainer.getInstance().registerRunnable(new Runnable() {
+
+ public void run() {
+ scanAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.rescan"));
+ scanAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project-files.action.rescan.tooltip"));
+ addContainerAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.add-container"));
+ addContainerAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project-files.action.add-container.tooltip"));
+ editContainerAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.edit-container"));
+ editContainerAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project-files.action.edit-container.tooltip"));
+ deleteContainerAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.delete-container"));
+ deleteContainerAction.putValue(Action.SHORT_DESCRIPTION, I18n.getMessage("jsite.project-files.action.delete-container.tooltip"));
+ }
+ });
}
@Override
public void pageAdded(TWizard wizard) {
- this.wizard = wizard;
actionScan();
+ this.wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
+ this.wizard.setNextName(I18n.getMessage("jsite.project-files.insert-now"));
+ this.wizard.setQuitName(I18n.getMessage("jsite.wizard.quit"));
}
private JComponent createProjectFilesPanel() {
@@ -167,7 +184,8 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
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));
- fileOptionsPanel.add(new JLabel("" + I18n.getMessage("jsite.project-files.file-options") + ""), 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("" + I18n.getMessage("jsite.project-files.file-options") + "");
+ 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));
defaultFileCheckBox = new JCheckBox(I18n.getMessage("jsite.project-files.default"));
defaultFileCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.default.tooltip"));
@@ -191,7 +209,8 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
fileOptionsCustomKeyTextField.setEnabled(false);
fileOptionsCustomKeyTextField.getDocument().addDocumentListener(this);
- fileOptionsPanel.add(new TLabel(I18n.getMessage("jsite.project-files.custom-key"), KeyEvent.VK_K, fileOptionsCustomKeyTextField), new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ 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));
fileOptionsMIMETypeComboBox = new JComboBox(DefaultMIMETypes.getAllMIMETypes());
@@ -200,7 +219,8 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
fileOptionsMIMETypeComboBox.addActionListener(this);
fileOptionsMIMETypeComboBox.setEnabled(false);
- fileOptionsPanel.add(new TLabel(I18n.getMessage("jsite.project-files.mime-type"), KeyEvent.VK_M, fileOptionsMIMETypeComboBox), new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ 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));
containerComboBoxModel = new DefaultComboBoxModel();
@@ -210,7 +230,8 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
fileOptionsContainerComboBox.addActionListener(this);
fileOptionsContainerComboBox.setEnabled(false);
- fileOptionsPanel.add(new TLabel(I18n.getMessage("jsite.project-files.container"), KeyEvent.VK_C, fileOptionsContainerComboBox), new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ final TLabel containerLabel = new TLabel(I18n.getMessage("jsite.project-files.container") + ":", KeyEvent.VK_C, fileOptionsContainerComboBox);
+ 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(new JButton(addContainerAction), 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(new JButton(editContainerAction), new GridBagConstraints(3, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
@@ -231,18 +252,47 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
replaceEditionRangeSpinner.setToolTipText(I18n.getMessage("jsite.project-files.replacement.edition-range.tooltip"));
replaceEditionRangeSpinner.addChangeListener(this);
replaceEditionRangeSpinner.setEnabled(false);
- fileOptionsReplacementPanel.add(new JLabel(I18n.getMessage("jsite.project-files.replacement.edition-range")));
+ final JLabel editionRangeLabel = new JLabel(I18n.getMessage("jsite.project-files.replacement.edition-range"));
+ 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));
+ I18nContainer.getInstance().registerRunnable(new Runnable() {
+
+ public void run() {
+ fileOptionsLabel.setText("" + I18n.getMessage("jsite.project-files.file-options") + "");
+ 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"));
+ 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"));
+ mimeTypeLabel.setText(I18n.getMessage("jsite.project-files.mime-type") + ":");
+ fileOptionsContainerComboBox.setToolTipText(I18n.getMessage("jsite.project-files.container.tooltip"));
+ containerLabel.setText(I18n.getMessage("jsite.project-files.container") + ":");
+ replacementCheckBox.setText(I18n.getMessage("jsite.project-files.replacement"));
+ replacementCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.replacement.tooltip"));
+ replaceEditionRangeSpinner.setToolTipText(I18n.getMessage("jsite.project-files.replacement.edition-range.tooltip"));
+ editionRangeLabel.setText(I18n.getMessage("jsite.project-files.replacement.edition-range"));
+ }
+ });
+
return projectFilesPanel;
}
- public void setProject(Project project) {
+ public void setProject(final Project project) {
this.project = project;
setHeading(MessageFormat.format(I18n.getMessage("jsite.project-files.heading"), project.getName()));
setDescription(I18n.getMessage("jsite.project-files.description"));
+ I18nContainer.getInstance().registerRunnable(new Runnable() {
+
+ public void run() {
+ setHeading(MessageFormat.format(I18n.getMessage("jsite.project-files.heading"), project.getName()));
+ setDescription(I18n.getMessage("jsite.project-files.description"));
+ }
+ });
}
private List getProjectFiles() {
@@ -353,13 +403,17 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
rebuildContainerComboBox();
}
});
+ Set entriesToRemove = new HashSet();
Iterator filenames = project.getFileOptions().keySet().iterator();
while (filenames.hasNext()) {
String filename = filenames.next();
if (!files.contains(filename)) {
- project.setFileOption(filename, null);
+ entriesToRemove.add(filename);
}
}
+ for (String filename: entriesToRemove) {
+ project.setFileOption(filename, null);
+ }
} else {
JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.scan-error"), null, JOptionPane.ERROR_MESSAGE);
}
@@ -443,7 +497,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
addContainerAction.setEnabled(enabled);
editContainerAction.setEnabled(enabled);
deleteContainerAction.setEnabled(enabled);
- replacementCheckBox.setEnabled(enabled && insert && (project instanceof EditionProject));
+ replacementCheckBox.setEnabled(enabled && insert);
if (filename != null) {
FileOption fileOption = project.getFileOption(filename);
defaultFileCheckBox.setSelected(filename.equals(project.getIndexFile()));