fix combo box behaviour when selecting content type override

[jSite2.git] / src / net / pterodactylus / jsite / gui / FileManager.java

diff --git a/src/net/pterodactylus/jsite/gui/FileManager.java b/src/net/pterodactylus/jsite/gui/FileManager.java
index d69d222..766677f 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/FileManager.java
+++ b/src/net/pterodactylus/jsite/gui/FileManager.java
@@ -70,14 +70,14 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
+import net.pterodactylus.jsite.core.FileOverride;
+import net.pterodactylus.jsite.core.Project;
+import net.pterodactylus.jsite.core.ProjectFile;
 import net.pterodactylus.jsite.i18n.I18n;
 import net.pterodactylus.jsite.i18n.I18nable;
 import net.pterodactylus.jsite.i18n.gui.I18nAction;
 import net.pterodactylus.jsite.i18n.gui.I18nLabel;
 import net.pterodactylus.jsite.i18n.gui.I18nMenu;
-import net.pterodactylus.jsite.project.FileOverride;
-import net.pterodactylus.jsite.project.Project;
-import net.pterodactylus.jsite.project.ProjectFile;
 import net.pterodactylus.util.io.MimeTypes;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.swing.SwingUtils;
@@ -399,7 +399,11 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
                                                fileOverride = new FileOverride();
                                                project.addFileOverride(projectFile, fileOverride);
                                        }
-                                       fileOverride.setContentType(MimeTypes.getMimeType(getFileExtension(projectFile.getName())));
+                                       String projectFileName = projectFile.getName();
+                                       String mimeType = MimeTypes.getMimeType(getFileExtension(projectFileName));
+                                       fileOverride.setContentType(mimeType);
+                                       fillComboBox(projectFileName);
+                                       contentTypeOverrideComboBox.setSelectedItem(mimeType);
                                } else {
                                        fileOverride.setContentType(null);
                                        if (fileOverride.isEmpty()) {
@@ -408,6 +412,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
                                }
                        }
                };
+               overrideContentTypeDefaultAction.setEnabled(false);
                contentTypeOverrideAction = new AbstractAction() {
 
                        /**
@@ -845,7 +850,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
                boolean overrideInsertSelected = false;
                boolean insertOverrideEnabled = false;
                boolean insertOverrideSelected = false;
-               String defaultContentType = MimeTypes.DEFAULT_CONTENT_TYPE;
+               String defaultContentType = "";
                boolean overrideContentTypeEnabled = false;
                boolean overrideContentTypeSelected = false;
                boolean contentTypeOverrideEnabled = false;