merge from master

[fanfix.git] / library / WebLibraryServerHtml.java

diff --git a/library/WebLibraryServerHtml.java b/library/WebLibraryServerHtml.java
index a534b4cdafbbdd8ec1c4c6b373bb7fc2953ec58c..ac0631dd60ba32abc8f34b7297510bbc78039c95 100644 (file)
--- a/library/WebLibraryServerHtml.java
+++ b/library/WebLibraryServerHtml.java
@@ -67,6 +67,9 @@ abstract class WebLibraryServerHtml implements Runnable {
 
        protected abstract Response imprtProgress(String uri, WLoginResult login);
 
+       protected abstract Response delete(String uri, WLoginResult login)
+                       throws IOException;
+
        public WebLibraryServerHtml(boolean secure) throws IOException {
                Integer port = Instance.getInstance().getConfig()
                                .getInteger(Config.SERVER_PORT);
@@ -205,6 +208,8 @@ abstract class WebLibraryServerHtml implements Runnable {
                                                                } else {
                                                                        rep = imprtProgress(uri, login);
                                                                }
+                                                       } else if (WebLibraryUrls.isDeleteUrl(uri)) {
+                                                               rep = delete(uri, login);
                                                        } else {
                                                                getTraceHandler().error(
                                                                                "Supported URL was not processed: "
@@ -251,9 +256,7 @@ abstract class WebLibraryServerHtml implements Runnable {
                        }
                };
 
-               if (ssf != null)
-
-               {
+               if (ssf != null) {
                        getTraceHandler().trace("Install SSL on the web server...");
                        server.makeSecure(ssf, null);
                        getTraceHandler().trace("Done.");