From a07e7e7a3010da502deea0e5020189cb7f8477bc Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 08:59:08 +0000
Subject: [PATCH] Darstellung der Symbolleisten passt sich unterschiedlichen Bidlschirmgroessen an

---
 src/de/uhilger/mediaz/api/StorageHandler.java |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index f55e8e0..9d9a4be 100644
--- a/src/de/uhilger/mediaz/api/StorageHandler.java
+++ b/src/de/uhilger/mediaz/api/StorageHandler.java
@@ -21,6 +21,7 @@
 import com.sun.net.httpserver.HttpExchange;
 import de.uhilger.mediaz.App;
 import static de.uhilger.mediaz.App.RB_EP_LISTE;
+import static de.uhilger.mediaz.App.RB_EP_LISTE_ALLES;
 import de.uhilger.mediaz.Server;
 import de.uhilger.mediaz.store.FileStorage;
 import de.uhilger.mediaz.entity.Entity;
@@ -28,16 +29,8 @@
 import static de.uhilger.mediaz.store.FileStorage.ST_ABLAGEORT;
 import static de.uhilger.mediaz.store.FileStorage.ST_GERAET;
 import de.uhilger.mediaz.store.Storage;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.Authenticator;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.ProxySelector;
 import java.net.URI;
-import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
@@ -46,7 +39,6 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpClient.Redirect;
-import java.net.http.HttpClient.Builder;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
@@ -56,6 +48,9 @@
 
 /**
  * HttpHandler fuer die Verwaltung von Entitaeten der Mediazentrale
+ * 
+ * /mz/api/store/[name]/liste
+ * /mz/api/store/[name]/listealles  (nur Typ Geraet)
  * 
  * @author Ulrich Hilger
  * @version 1, 5.4.2021
@@ -107,7 +102,7 @@
     FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
     if(path.endsWith(Server.SLASH)) {
       List list = null;
-      if(elems[elems.length - 1].equalsIgnoreCase(App.getRs(RB_EP_LISTE))) {
+      if(elems[elems.length - 1].equalsIgnoreCase(App.getRs(RB_EP_LISTE_ALLES))) {
         String type = elems[elems.length - 2];
         logger.fine(type);
         if(type.equalsIgnoreCase(ST_GERAET)) {
@@ -115,9 +110,11 @@
           Gson gson = new Gson();
           Object o = gson.fromJson(bodyLesen(e), fs.typeFromName(type).getType());
           return gson.toJson(list);
-        } else {        
-          list = fs.list(type);
         }
+      } else if(elems[elems.length - 1].equalsIgnoreCase(App.getRs(RB_EP_LISTE))) {
+        String type = elems[elems.length - 2];
+        logger.fine(type);
+        list = fs.list(type);
         if(type.equalsIgnoreCase(ST_ABLAGEORT)) {
           list.add("Livestreams");
         }

--
Gitblit v1.9.3