X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectFilesPage.java;h=3789ebddba22976a431caa43118f9b3d48958c6b;hb=a2758febb07a49f6f76364c82f133e72df3cb8df;hp=4ae819fc2d15dfded6ec8e8975e799b5dff70222;hpb=6a27a4ea40649df0a8fb62f9c79da1f7c1ce5507;p=jSite.git
diff --git a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
index 4ae819f..3789ebd 100644
--- a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -35,7 +35,6 @@ 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;
@@ -79,19 +78,19 @@ import de.todesbaum.util.swing.TWizardPage;
*/
public class ProjectFilesPage extends TWizardPage implements ActionListener, ListSelectionListener, DocumentListener, FileScannerListener, ChangeListener {
- protected Project project;
+ private Project project;
- protected Action scanAction;
- protected Action editContainerAction;
- protected Action addContainerAction;
- protected Action deleteContainerAction;
+ private Action scanAction;
+ private Action editContainerAction;
+ private Action addContainerAction;
+ private Action deleteContainerAction;
- protected JList projectFileList;
+ private JList projectFileList;
private JCheckBox defaultFileCheckBox;
private JCheckBox fileOptionsInsertCheckBox;
private JTextField fileOptionsCustomKeyTextField;
private JComboBox fileOptionsMIMETypeComboBox;
- protected DefaultComboBoxModel containerComboBoxModel;
+ private DefaultComboBoxModel containerComboBoxModel;
private JComboBox fileOptionsContainerComboBox;
private JSpinner replaceEditionRangeSpinner;
private JCheckBox replacementCheckBox;
@@ -110,6 +109,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
private void createActions() {
scanAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.rescan")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionScan();
}
@@ -119,6 +119,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
addContainerAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.add-container")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionAddContainer();
}
@@ -128,6 +129,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
editContainerAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.edit-container")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionEditContainer();
}
@@ -137,6 +139,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
deleteContainerAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.delete-container")) {
+ @SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
actionDeleteContainer();
}
@@ -146,6 +149,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
I18nContainer.getInstance().registerRunnable(new Runnable() {
+ @SuppressWarnings("synthetic-access")
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"));
@@ -260,6 +264,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
I18nContainer.getInstance().registerRunnable(new Runnable() {
+ @SuppressWarnings("synthetic-access")
public void run() {
fileOptionsLabel.setText("" + I18n.getMessage("jsite.project-files.file-options") + "");
defaultFileCheckBox.setText(I18n.getMessage("jsite.project-files.default"));
@@ -303,14 +308,14 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
return files;
}
- protected void rebuildContainerComboBox() {
+ private void rebuildContainerComboBox() {
/* scan files for containers */
List files = getProjectFiles();
List containers = new ArrayList(); // ComboBoxModel
// sucks. No
// contains()!
containers.add("");
- for (String filename: files) {
+ for (String filename : files) {
String container = project.getFileOption(filename).getContainer();
if (!containers.contains(container)) {
containers.add(container);
@@ -318,7 +323,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
}
Collections.sort(containers);
containerComboBoxModel.removeAllElements();
- for (String container: containers) {
+ for (String container : containers) {
containerComboBoxModel.addElement(container);
}
}
@@ -327,7 +332,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
// ACTIONS
//
- protected void actionScan() {
+ private void actionScan() {
projectFileList.clearSelection();
projectFileList.setListData(new Object[0]);
@@ -340,7 +345,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
new Thread(fileScanner).start();
}
- protected void actionAddContainer() {
+ private void actionAddContainer() {
String containerName = JOptionPane.showInputDialog(wizard, I18n.getMessage("jsite.project-files.action.add-container.message") + ":", null, JOptionPane.INFORMATION_MESSAGE);
if (containerName == null) {
return;
@@ -353,7 +358,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
fileOptionsContainerComboBox.setSelectedItem(containerName);
}
- protected void actionEditContainer() {
+ private void actionEditContainer() {
String selectedFilename = (String) projectFileList.getSelectedValue();
FileOption fileOption = project.getFileOption(selectedFilename);
String oldContainerName = fileOption.getContainer();
@@ -367,7 +372,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
return;
}
List files = getProjectFiles();
- for (String filename: files) {
+ for (String filename : files) {
fileOption = project.getFileOption(filename);
if (fileOption.getContainer().equals(oldContainerName)) {
fileOption.setContainer(containerName);
@@ -377,11 +382,11 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
fileOptionsContainerComboBox.setSelectedItem(containerName);
}
- protected void actionDeleteContainer() {
+ private void actionDeleteContainer() {
if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.action.delete-container.message"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
String containerName = (String) fileOptionsContainerComboBox.getSelectedItem();
List files = getProjectFiles();
- for (String filename: files) {
+ for (String filename : files) {
FileOption fileOption = project.getFileOption(filename);
if (fileOption.getContainer().equals(containerName)) {
fileOption.setContainer("");
@@ -397,6 +402,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
final List files = fileScanner.getFiles();
SwingUtilities.invokeLater(new Runnable() {
+ @SuppressWarnings("synthetic-access")
public void run() {
projectFileList.setListData(files.toArray(new String[files.size()]));
projectFileList.clearSelection();
@@ -411,7 +417,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
entriesToRemove.add(filename);
}
}
- for (String filename: entriesToRemove) {
+ for (String filename : entriesToRemove) {
project.setFileOption(filename, null);
}
} else {
@@ -419,6 +425,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
}
SwingUtilities.invokeLater(new Runnable() {
+ @SuppressWarnings("synthetic-access")
public void run() {
wizard.setPreviousEnabled(true);
wizard.setNextEnabled(!error);