X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FFileManager.java;h=98e9d804a49a92133e5fb8d9eb23390c9fb3fa24;hb=61fe749eaa69c139ba3fe6a9e28a00f3ceb83ada;hp=d69d222d37612abb55a571b77715d8b6dda099ce;hpb=431385ab25460a8ef58878c6b109d2a9a5781b37;p=jSite2.git
diff --git a/src/net/pterodactylus/jsite/gui/FileManager.java b/src/net/pterodactylus/jsite/gui/FileManager.java
index d69d222..98e9d80 100644
--- a/src/net/pterodactylus/jsite/gui/FileManager.java
+++ b/src/net/pterodactylus/jsite/gui/FileManager.java
@@ -59,9 +59,11 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
import javax.swing.JTextField;
import javax.swing.JTree;
import javax.swing.SwingConstants;
+import javax.swing.border.EmptyBorder;
import javax.swing.event.TreeModelEvent;
import javax.swing.event.TreeModelListener;
import javax.swing.event.TreeSelectionEvent;
@@ -70,21 +72,21 @@ 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;
/**
* Manages physical and virtual files in a project.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
public class FileManager extends JDialog implements I18nable, TreeSelectionListener, MouseListener {
@@ -202,7 +204,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Creates a new file manager.
- *
+ *
* @param swingInterface
* The Swing interface
* @param project
@@ -399,7 +401,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 +414,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
}
}
};
+ overrideContentTypeDefaultAction.setEnabled(false);
contentTypeOverrideAction = new AbstractAction() {
/**
@@ -464,15 +471,17 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Creates the main panel with the file tree and the file properties.
- *
+ *
* @return The mail panel
*/
private Component createFileManagerPanel() {
- JPanel fileManagerPanel = new JPanel(new BorderLayout(12, 12));
+ JSplitPane fileManagerPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
+ fileManagerPanel.setBorder(null);
/* file tree panel */
JPanel fileTreePanel = new JPanel(new BorderLayout(12, 12));
- fileManagerPanel.add(fileTreePanel, BorderLayout.LINE_START);
+ fileTreePanel.setBorder(new EmptyBorder(0, 0, 0, 12));
+ fileManagerPanel.setLeftComponent(fileTreePanel);
fileTree = new JTree(fileTreeModel);
fileTree.setShowsRootHandles(false);
@@ -489,7 +498,8 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/* the right panel */
JPanel rightPanel = new JPanel(new BorderLayout(12, 12));
- fileManagerPanel.add(rightPanel, BorderLayout.CENTER);
+ rightPanel.setBorder(new EmptyBorder(0, 12, 0, 0));
+ fileManagerPanel.setRightComponent(rightPanel);
/* properties panel */
JPanel propertiesPanel = new JPanel(new GridBagLayout());
@@ -568,7 +578,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Creates the button panel.
- *
+ *
* @return The button panel
*/
private Component createButtonPanel() {
@@ -610,7 +620,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Checks whether the given mouse event is a popup trigger and occured over
* a file. If so, the context menu is shown.
- *
+ *
* @param mouseEvent
* The mouse event to check
*/
@@ -640,7 +650,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Finds whether the {@link ProjectFile} given by
* projectFileWrapper
is hidden.
- *
+ *
* @param projectFileWrapper
* The wrapped project file
* @return true
if the file is hidden and should not be
@@ -726,7 +736,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Returns all currently selected {@link ProjectFileWrapper}s.
- *
+ *
* @param filesOnly
* true
to return only selected files,
* false
to include directories
@@ -750,7 +760,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Sets the given actionâs enabled state to the given enabled state if the
* actionâs current enabled state is not the given enabled state.
- *
+ *
* @param action
* The action to set the enabled state on
* @param enabled
@@ -765,7 +775,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Sets the given buttonâs selected state to the given selected state if the
* buttonâs current selected state is not the given selected state.
- *
+ *
* @param button
* The button to set the selected state on
* @param selected
@@ -781,7 +791,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
* Returns the extension of the given filename. If the file name does not
* have an extension, the name of the file (without any path components) is
* returned.
- *
+ *
* @param fileName
* The name of the file
* @return The extension of the file
@@ -794,7 +804,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Repopulates the content type combo box with all content types, putting
* the most probably ones to the front of the list.
- *
+ *
* @param fileName
* The name of the file
*/
@@ -845,7 +855,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;
@@ -940,7 +950,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Tree cell renderer that takes care of certain display properties for
* project-specific stuff.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
private class FileCellRenderer extends DefaultTreeCellRenderer {
@@ -1009,7 +1019,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* TreeModel that is based on {@link Project#getBaseFile()}.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
private class ProjectFileTreeModel implements TreeModel, PropertyChangeListener {
@@ -1053,7 +1063,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Notifies all listeners that a node has changed.
- *
+ *
* @param changedProjectFileWrapper
* The wrapper around the changed project file
*/
@@ -1075,7 +1085,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Notifies all listeners that the tree structure has changed
* significantly.
- *
+ *
* @see TreeModelListener#treeStructureChanged(TreeModelEvent)
* @param newRootNode
*/
@@ -1091,7 +1101,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Sets the new base project file. This causes the model to reload.
- *
+ *
* @param baseProjectFile
* The new base project file
*/
@@ -1112,7 +1122,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Creates {@link ProjectFileWrapper}s for all files below the given
* project file.
- *
+ *
* @param projectFile
* The base project file for all project files to create
* wrappers for
@@ -1240,7 +1250,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Wrapper around a {@link ProjectFile} that overwrites
* {@link Object#toString()} to return the project fileâs name.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
private static class ProjectFileWrapper {
@@ -1253,7 +1263,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Creates a new wrapper around a project file.
- *
+ *
* @param projectFile
* The project file to wrap
*/
@@ -1263,7 +1273,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Returns the wrapped project file.
- *
+ *
* @return The wrapped project file
*/
public ProjectFile getProjectFile() {
@@ -1273,7 +1283,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* Sets the name override. If the name override is not null
* it will be shown insted of the project fileâs name.
- *
+ *
* @param nameOverride
* The name override
*/
@@ -1294,7 +1304,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
/**
* A cell renderer for combo boxes that converts the string â--â to a
* separator.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
private class MimeTypeComboBoxRenderer extends DefaultListCellRenderer {