From d4d091e9c693f861fe9ad60a354897fd14a95808 Mon Sep 17 00:00:00 2001 From: ulrich Date: Sat, 10 Apr 2021 17:12:28 +0000 Subject: [PATCH] Sortierte Darstellung im Katalog --- src/de/uhilger/mediaz/store/StorageFile.java | 32 ++++++++++++++++++++++++++++++++ src/de/uhilger/mediaz/api/ListFileHandler.java | 4 ++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/de/uhilger/mediaz/api/ListFileHandler.java b/src/de/uhilger/mediaz/api/ListFileHandler.java index 4c31548..e6452eb 100644 --- a/src/de/uhilger/mediaz/api/ListFileHandler.java +++ b/src/de/uhilger/mediaz/api/ListFileHandler.java @@ -30,6 +30,8 @@ import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; @@ -79,6 +81,7 @@ File dir = new File(fileBase, fName); logger.fine(dir.getAbsolutePath()); File[] files = dir.listFiles(); + Arrays.sort(files); ArrayList list = new ArrayList(); if(files != null) { for(File file : files) { @@ -103,6 +106,7 @@ list.add(sf); } } + //Collections.sort(list); String json = jsonWithCustomType(list, "Medialiste"); logger.fine(json); e.sendResponseHeaders(200, json.length()); diff --git a/src/de/uhilger/mediaz/store/StorageFile.java b/src/de/uhilger/mediaz/store/StorageFile.java index 2e1a7bb..3d92b12 100644 --- a/src/de/uhilger/mediaz/store/StorageFile.java +++ b/src/de/uhilger/mediaz/store/StorageFile.java @@ -17,6 +17,8 @@ */ package de.uhilger.mediaz.store; +import java.util.Objects; + /** * * @author ulrich @@ -81,5 +83,35 @@ } } + @Override + public String toString() { + return "StorageFile{" + "name=" + name + '}'; + } + + @Override + public int hashCode() { + int hash = 3; + return hash; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final StorageFile other = (StorageFile) obj; + if (!Objects.equals(this.name, other.name)) { + return false; + } + return true; + } + + } -- Gitblit v1.9.3