Author: noelr
Date: 2009-08-14 03:37:59 -0700 (Fri, 14 Aug 2009)
New Revision: 17820

Modified:
   cytoscape/trunk/src/cytoscape/plugin/InstallablePlugin.java
Log:
Fix for Bug 2055
Made regexp for matching jars in zips less restrictive.

Modified: cytoscape/trunk/src/cytoscape/plugin/InstallablePlugin.java
===================================================================
--- cytoscape/trunk/src/cytoscape/plugin/InstallablePlugin.java 2009-08-14 
08:26:53 UTC (rev 17819)
+++ cytoscape/trunk/src/cytoscape/plugin/InstallablePlugin.java 2009-08-14 
10:37:59 UTC (rev 17820)
@@ -26,6 +26,11 @@
  * 
  */
 public class InstallablePlugin implements Installable {
+
+  // Bug 2055 changing regexp used to match jars
+  // Was "\\w+\\.jar", which seemed unecessarily restrictive
+  public static final String MATCH_JAR_REGEXP = ".*\\.jar$";
+
   private static CyLogger logger = CyLogger.getLogger(InstallablePlugin.class);
 
   private PluginInfo infoObj;
@@ -283,7 +288,7 @@
 
                case ZIP:
                        List<ZipEntry> Entries = ZipUtil
-                                       .getAllFiles(FileName, "\\w+\\.jar");
+                                       .getAllFiles(FileName, 
MATCH_JAR_REGEXP);
                        if (Entries.size() <= 0) {
                                String[] FilePath = FileName.split("/");
                                FileName = FilePath[FilePath.length - 1];


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to