merge from master

diff --git a/library/WebLibrary.java b/library/WebLibrary.java
index 978dd9af51c05e5b56f93c2d61948e34fcbcc968..42f7ea5ccadd4eb40d6b86cfd1f6842abab0db50 100644 (file)
--- a/library/WebLibrary.java
+++ b/library/WebLibrary.java
@@ -309,6 +309,9 @@ public class WebLibrary extends BasicLibrary {
                                try {
                                        subPg = JsonIO.toProgress(
                                                        new JSONObject(IOUtils.readSmallStream(in)));
+                                       pg.setName(subPg.getName());
+                                       pg.setMinMax(subPg.getMin(), subPg.getMax());
+                                       pg.setProgress(subPg.getProgress());
                                } catch (Exception e) {
                                        subPg = null;
                                } finally {

diff --git a/library/WebLibraryUrls.java b/library/WebLibraryUrls.java
index 176b4ebce368e31ebce00f04d8b27f07a69f83c3..5ec669fea4d313dda921209a4d693c5f4ee5d16a 100644 (file)
--- a/library/WebLibraryUrls.java
+++ b/library/WebLibraryUrls.java
@@ -104,7 +104,8 @@ class WebLibraryUrls {
        static public boolean isSupportedUrl(String url) {
                return INDEX_URL.equals(url) || VERSION_URL.equals(url)
                                || LOGOUT_URL.equals(url) || isViewUrl(url) || isStoryUrl(url)
-                               || isListUrl(url) || isCoverUrl(url) || isImprtUrl(url);
+                               || isListUrl(url) || isCoverUrl(url) || isImprtUrl(url)
+                               || isDeleteUrl(url);
        }
 
        static public String getCoverUrlStory(String luid) {