Revision: 14729
          http://gate.svn.sourceforge.net/gate/?rev=14729&view=rev
Author:   markagreenwood
Date:     2011-12-11 15:31:29 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
add a / to the end of a creole url when, looking for plugins to install, if it 
isn't already there

Modified Paths:
--------------
    gate/trunk/src/gate/Gate.java
    gate/trunk/src/gate/gui/creole/manager/CreolePlugin.java

Modified: gate/trunk/src/gate/Gate.java
===================================================================
--- gate/trunk/src/gate/Gate.java       2011-12-11 13:13:32 UTC (rev 14728)
+++ gate/trunk/src/gate/Gate.java       2011-12-11 15:31:29 UTC (rev 14729)
@@ -1220,7 +1220,7 @@
    *          the URL to be normalised
    * @return the (maybe) corrected URL.
    */
-  private static URL normaliseCreoleUrl(URL url) {
+  public static URL normaliseCreoleUrl(URL url) {
     // CREOLE URLs are directory URLs so they should end with "/"
     String urlName = url.toExternalForm();
     String separator = "/";

Modified: gate/trunk/src/gate/gui/creole/manager/CreolePlugin.java
===================================================================
--- gate/trunk/src/gate/gui/creole/manager/CreolePlugin.java    2011-12-11 
13:13:32 UTC (rev 14728)
+++ gate/trunk/src/gate/gui/creole/manager/CreolePlugin.java    2011-12-11 
15:31:29 UTC (rev 14729)
@@ -14,6 +14,7 @@
 
 package gate.gui.creole.manager;
 
+import gate.Gate;
 import gate.Main;
 import gate.util.VersionComparator;
 
@@ -49,6 +50,7 @@
 
   private Object readResolve() {
     if(url != null) {
+      url = Gate.normaliseCreoleUrl(url);
       try {
         return load(new URL(url, "creole.xml"));
       } catch(Exception e) {

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Learn Windows Azure Live!  Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for 
developers. It will provide a great way to learn Windows Azure and what it 
provides. You can attend the event by watching it streamed LIVE online.  
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to