r1544 - in xwiki/trunk: core/src/main/java/com/xpn/xwiki/plugin/zipexplorer src/test/java/com/xpn/xwiki/plugin/zipexplorer

[Vincent Massol]

Author: vmassol
Date: 2006-11-14 09:23:15 +0100 (Tue, 14 Nov 2006)
New Revision: 1544

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPlugin.java
   xwiki/trunk/src/test/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerTest.java
Log:
Refactoring for the ZipExplorerPlugin class and its tests:
* renamed getFileName in getFileNameFromZipURL which seems more explicit
* marked the getFileNameFromZipURL protected as it's not meant to be public

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPlugin.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPlugin.java	2006-11-14 07:03:29 UTC (rev 1543)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPlugin.java	2006-11-14 08:23:15 UTC (rev 1544)
@@ -78,7 +78,7 @@
      *         <code>http://[...]/zipfile.zip/SomeDirectory/SomeFile.txt</code>. With the example
      *         above this method would return <code>SomeDirectory/SomeFile.txt</code>.
      */
-    public String getFileName(String path, String action) {
+    protected String getFileNameFromZipURL(String path, String action) {
         path = path.substring(path.indexOf("/" + action));
         int pos = 0;
         for (int i = 0; i < 4; i++) {
@@ -96,7 +96,7 @@
         if (!attachment.getFilename().endsWith(".zip"))
             return attachment;
         try {
-            filename = getFileName(url, context.getAction().trim());
+            filename = getFileNameFromZipURL(url, context.getAction().trim());
         }
         catch(Exception e){
             filename = "";

Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerTest.java	2006-11-14 07:03:29 UTC (rev 1543)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerTest.java	2006-11-14 08:23:15 UTC (rev 1544)
@@ -112,21 +112,21 @@
         assertEquals("/xwiki/bin/download/Main/ZipExplorerTest/" + filename1,zpa.getFileLink(maindoc, attachment.getFilename(), filename1));
     }
 
-    public void testGetFileName()
+    public void testGetFileNameFromZipURL()
     {
         ZipExplorerPlugin plugin = new ZipExplorerPlugin("zipexplorer",
             ZipExplorerPlugin.class.getName(), new XWikiContext());
-        String fileName = plugin.getFileName(
+        String fileName = plugin.getFileNameFromZipURL(
             "http://server/xwiki/bin/download/Main/Document/zipfile.zip/Directory/File.txt",
             "download");
         assertEquals("Directory/File.txt", fileName);
     }
 
-    public void testGetFileNameWhenInvalidURL()
+    public void testGetFileNameFromZipURLWhenInvalidURL()
     {
         ZipExplorerPlugin plugin = new ZipExplorerPlugin("zipexplorer",
             ZipExplorerPlugin.class.getName(), new XWikiContext());
-        String fileName = plugin.getFileName(
+        String fileName = plugin.getFileNameFromZipURL(
             "http://server/xwiki/bin/download/Main/Document/zipfile.zip",
             "download");
         assertEquals("", fileName);