Merge branch 'mavenize' into next

[jSite.git] / src / main / java / de / todesbaum / jsite / application / Project.java

diff --git a/src/main/java/de/todesbaum/jsite/application/Project.java b/src/main/java/de/todesbaum/jsite/application/Project.java
index fa0b774..36fff55 100644 (file)
--- a/src/main/java/de/todesbaum/jsite/application/Project.java
+++ b/src/main/java/de/todesbaum/jsite/application/Project.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import de.todesbaum.util.mime.DefaultMIMETypes;
+import net.pterodactylus.util.io.MimeTypes;
 
 /**
  * Container for project information.
@@ -289,7 +289,7 @@ public class Project implements Comparable<Project> {
         *            The URI to shorten
         * @return The shortened URI
         */
-       private String shortenURI(String uri) {
+       private static String shortenURI(String uri) {
                String shortUri = uri;
                if (shortUri.startsWith("freenet:")) {
                        shortUri = shortUri.substring("freenet:".length());
@@ -337,7 +337,7 @@ public class Project implements Comparable<Project> {
        public FileOption getFileOption(String filename) {
                FileOption fileOption = fileOptions.get(filename);
                if (fileOption == null) {
-                       fileOption = new FileOption(DefaultMIMETypes.guessMIMEType(filename));
+                       fileOption = new FileOption(MimeTypes.getMimeType(filename.substring(filename.lastIndexOf('.') + 1)));
                        fileOptions.put(filename, fileOption);
                }
                return fileOption;
@@ -386,6 +386,7 @@ public class Project implements Comparable<Project> {
         * <p>
         * Projects are compared by their name only.
         */
+       @Override
        public int compareTo(Project project) {
                return name.compareToIgnoreCase(project.name);
        }