version 0.4.8

[jSite.git] / src / de / todesbaum / jsite / gui / ProjectFilesPage.java

diff --git a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
index 1b5b8c6..c1a8eae 100644 (file)
--- a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -31,6 +31,7 @@ import java.awt.event.KeyEvent;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.AbstractAction;
@@ -60,7 +61,6 @@ 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;
@@ -71,7 +71,7 @@ import de.todesbaum.util.swing.TWizardPage;
 
 /**
  * @author David Roden <droden@gmail.com>
- * @version $Id: ProjectFilesPage.java 404 2006-03-26 02:11:03Z bombe $
+ * @version $Id$
  */
 public class ProjectFilesPage extends TWizardPage implements ActionListener, ListSelectionListener, DocumentListener, FileScannerListener, ChangeListener {
 
@@ -143,6 +143,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
                deleteContainerAction.setEnabled(false);
        }
 
+       @Override
        public void pageAdded(TWizard wizard) {
                this.wizard = wizard;
                actionScan();
@@ -351,6 +352,13 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
                                        rebuildContainerComboBox();
                                }
                        });
+                       Iterator<String> filenames = project.getFileOptions().keySet().iterator();
+                       while (filenames.hasNext()) {
+                               String filename = filenames.next();
+                               if (!files.contains(filename)) {
+                                       project.setFileOption(filename, null);
+                               }
+                       }
                } else {
                        JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.scan-error"), null, JOptionPane.ERROR_MESSAGE);
                }
@@ -434,7 +442,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()));
@@ -462,8 +470,9 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 
        private void processDocumentUpdate(DocumentEvent documentEvent) {
                String filename = (String) projectFileList.getSelectedValue();
-               if (filename == null)
+               if (filename == null) {
                        return;
+               }
                FileOption fileOption = project.getFileOption(filename);
                Document document = documentEvent.getDocument();
                try {
@@ -503,8 +512,9 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
         */
        public void stateChanged(ChangeEvent changeEvent) {
                String filename = (String) projectFileList.getSelectedValue();
-               if (filename == null)
+               if (filename == null) {
                        return;
+               }
                FileOption fileOption = project.getFileOption(filename);
                Object source = changeEvent.getSource();
                if (source instanceof JSpinner) {