[freenet-cvs] r16175 - trunk/apps/jSite/src/de/todesbaum/jsite/gui

[bombe at freenetproject.org]

Author: bombe
Date: 2007-12-01 12:18:09 +0000 (Sat, 01 Dec 2007)
New Revision: 16175

Modified:
   trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
Log:
fix exception when files is removed (should fix #1755)

Modified: trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java	2007-12-01 12:17:34 UTC (rev 16174)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java	2007-12-01 12:18:09 UTC (rev 16175)
@@ -31,8 +31,11 @@
 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;
@@ -400,13 +403,17 @@
 					rebuildContainerComboBox();
 				}
 			});
+			Set<String> entriesToRemove = new HashSet<String>();
 			Iterator<String> 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);
 		}