X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectFilesPage.java;h=5b2666190e55f30cda43c84cc4b355d6f0ae9b81;hb=967018cd81182ec2fd4f941e271137aadbaa6d81;hp=80bb52c38fd89a72998defaf05159fc0e7409ec9;hpb=0e88169c3e8decfcd99f39f5ecf3a85df50c3fca;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
index 80bb52c..5b26661 100644
--- a/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
+++ b/src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
@@ -53,12 +53,12 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 
+import net.pterodactylus.util.io.MimeTypes;
 import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.gui.FileScanner.ScannedFile;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
-import de.todesbaum.util.mime.DefaultMIMETypes;
 import de.todesbaum.util.swing.TLabel;
 import de.todesbaum.util.swing.TWizard;
 import de.todesbaum.util.swing.TWizardPage;
@@ -132,6 +132,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	private void createActions() {
 		scanAction = new AbstractAction(I18n.getMessage("jsite.project-files.action.rescan")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
 				actionScan();
@@ -142,6 +143,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 
 		I18nContainer.getInstance().registerRunnable(new Runnable() {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				scanAction.putValue(Action.NAME, I18n.getMessage("jsite.project-files.action.rescan"));
@@ -262,14 +264,17 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 				}
 			}
 
+			@Override
 			public void changedUpdate(DocumentEvent documentEvent) {
 				storeText(documentEvent);
 			}
 
+			@Override
 			public void insertUpdate(DocumentEvent documentEvent) {
 				storeText(documentEvent);
 			}
 
+			@Override
 			public void removeUpdate(DocumentEvent documentEvent) {
 				storeText(documentEvent);
 			}
@@ -279,7 +284,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 		fileOptionsPanel.add(fileOptionsRenameCheckBox, new GridBagConstraints(0, 7, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
 		fileOptionsPanel.add(fileOptionsRenameTextField, new GridBagConstraints(2, 7, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
 
-		fileOptionsMIMETypeComboBox = new JComboBox(DefaultMIMETypes.getAllMIMETypes());
+		fileOptionsMIMETypeComboBox = new JComboBox(MimeTypes.getAllMimeTypes().toArray());
 		fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip"));
 		fileOptionsMIMETypeComboBox.setName("project-files.mime-type");
 		fileOptionsMIMETypeComboBox.addActionListener(this);
@@ -292,6 +297,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 
 		I18nContainer.getInstance().registerRunnable(new Runnable() {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				ignoreHiddenFilesCheckBox.setText(I18n.getMessage("jsite.project-files.ignore-hidden-files"));
@@ -330,6 +336,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 		ignoreHiddenFilesCheckBox.setSelected(project.isIgnoreHiddenFiles());
 		I18nContainer.getInstance().registerRunnable(new Runnable() {
 
+			@Override
 			public void run() {
 				setHeading(MessageFormat.format(I18n.getMessage("jsite.project-files.heading"), project.getName()));
 				setDescription(I18n.getMessage("jsite.project-files.description"));
@@ -362,12 +369,14 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	 * <p>
 	 * Updates the file list.
 	 */
+	@Override
 	public void fileScannerFinished(FileScanner fileScanner) {
 		final boolean error = fileScanner.isError();
 		if (!error) {
 			final List<ScannedFile> files = fileScanner.getFiles();
 			SwingUtilities.invokeLater(new Runnable() {
 
+				@Override
 				@SuppressWarnings("synthetic-access")
 				public void run() {
 					projectFileList.setListData(files.toArray());
@@ -397,6 +406,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 		}
 		SwingUtilities.invokeLater(new Runnable() {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				wizard.setPreviousEnabled(true);
@@ -428,6 +438,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void actionPerformed(ActionEvent actionEvent) {
 		Object source = actionEvent.getSource();
 		if ((source instanceof JCheckBox) && ("ignore-hidden-files".equals(((JCheckBox) source).getName()))) {
@@ -487,6 +498,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	@SuppressWarnings("null")
 	public void valueChanged(ListSelectionEvent e) {
 		ScannedFile scannedFile = (ScannedFile) projectFileList.getSelectedValue();
@@ -523,7 +535,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 			fileOptionsRenameCheckBox.setSelected(false);
 			fileOptionsRenameTextField.setEnabled(false);
 			fileOptionsRenameTextField.setText("");
-			fileOptionsMIMETypeComboBox.getModel().setSelectedItem(DefaultMIMETypes.DEFAULT_MIME_TYPE);
+			fileOptionsMIMETypeComboBox.getModel().setSelectedItem(MimeTypes.DEFAULT_CONTENT_TYPE);
 		}
 	}
 
@@ -556,6 +568,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void changedUpdate(DocumentEvent documentEvent) {
 		processDocumentUpdate(documentEvent);
 	}
@@ -563,6 +576,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void insertUpdate(DocumentEvent documentEvent) {
 		processDocumentUpdate(documentEvent);
 	}
@@ -570,6 +584,7 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void removeUpdate(DocumentEvent documentEvent) {
 		processDocumentUpdate(documentEvent);
 	}