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 b919bb6..766677f 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/FileManager.java
+++ b/src/net/pterodactylus/jsite/gui/FileManager.java
@@ -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;