Hello Chris,

after the last changes the last opened file does not open if its name 
contains spaces. Could you please revise your changes.

Dimitry


> Update of /cvsroot/freemind/freemind/freemind/modes/mindmapmode
> In directory 
> sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12601/freemind/modes/mindmapmode
> 
> Modified Files:
>       Tag: fm_060405_integration
>       MindMapController.java MindMapMode.java 
> Log Message:
> * Fixed: .toURL() is deprecated in Java 1.6
> https://sourceforge.net/tracker/?func=detail&atid=107118&aid=1812246&group_id=7118
> 
> 
> 
> Index: MindMapMode.java
> ===================================================================
> RCS file: 
> /cvsroot/freemind/freemind/freemind/modes/mindmapmode/MindMapMode.java,v
> retrieving revision 1.17.18.2.2.3
> retrieving revision 1.17.18.2.2.4
> diff -C2 -d -r1.17.18.2.2.3 -r1.17.18.2.2.4
> *** MindMapMode.java  20 Aug 2006 19:34:25 -0000      1.17.18.2.2.3
> --- MindMapMode.java  30 Mar 2008 20:39:58 -0000      1.17.18.2.2.4
> ***************
> *** 79,83 ****
>   
>       public void restore(String restoreable) throws FileNotFoundException, 
> XMLParseException, MalformedURLException, IOException {
> !         getDefaultModeController().load(new File(restoreable).toURL());
>       }
>   
> --- 79,83 ----
>   
>       public void restore(String restoreable) throws FileNotFoundException, 
> XMLParseException, MalformedURLException, IOException {
> !         getDefaultModeController().load(new 
> File(restoreable).toURI().toURL());
>       }
>   
> 
> Index: MindMapController.java
> ===================================================================
> RCS file: 
> /cvsroot/freemind/freemind/freemind/modes/mindmapmode/MindMapController.java,v
> retrieving revision 1.35.14.21.2.62
> retrieving revision 1.35.14.21.2.63
> diff -C2 -d -r1.35.14.21.2.62 -r1.35.14.21.2.63
> *** MindMapController.java    30 Jan 2008 20:44:48 -0000      1.35.14.21.2.62
> --- MindMapController.java    30 Mar 2008 20:39:58 -0000      1.35.14.21.2.63
> ***************
> *** 1159,1164 ****
>               try {
>                  String relative = selected.getLink();
> !                absolute = Tools.isAbsolutePath(relative) ? new 
> File(relative).toURL() :
> !                   new URL(getMap().getFile().toURL(), relative); }
>               catch (MalformedURLException ex) {
>                  JOptionPane.showMessageDialog(getView(),"Couldn't create 
> valid URL for:"+getMap().getFile());
> --- 1159,1164 ----
>               try {
>                  String relative = selected.getLink();
> !                absolute = Tools.isAbsolutePath(relative) ? new 
> File(relative).toURI().toURL() :
> !                   new URL(getMap().getFile().toURI().toURL(), relative); }
>               catch (MalformedURLException ex) {
>                  JOptionPane.showMessageDialog(getView(),"Couldn't create 
> valid URL for:"+getMap().getFile());
> ***************
> *** 1188,1193 ****
>               try {
>                  String relative = selected.getLink();
> !                absolute = Tools.isAbsolutePath(relative) ? new 
> File(relative).toURL() :
> !                   new URL(getMap().getFile().toURL(), relative); }
>               catch (MalformedURLException ex) {
>                  JOptionPane.showMessageDialog(getView(),"Couldn't create 
> valid URL.");
> --- 1188,1193 ----
>               try {
>                  String relative = selected.getLink();
> !                absolute = Tools.isAbsolutePath(relative) ? new 
> File(relative).toURI().toURL() :
> !                   new URL(getMap().getFile().toURI().toURL(), relative); }
>               catch (MalformedURLException ex) {
>                  JOptionPane.showMessageDialog(getView(),"Couldn't create 
> valid URL.");
> ***************
> *** 1521,1525 ****
>                               String possiblyRelative = node.getLink();
>                               String relative = 
> Tools.isAbsolutePath(possiblyRelative) ?
> !                                new 
> File(possiblyRelative).toURL().toString() : possiblyRelative;
>                               if (relative != null) {
>                                  String strText = "<html><img src=\"" + 
> relative + "\">";
> --- 1521,1525 ----
>                               String possiblyRelative = node.getLink();
>                               String relative = 
> Tools.isAbsolutePath(possiblyRelative) ?
> !                                new 
> File(possiblyRelative).toURI().toURL().toString() : possiblyRelative;
>                               if (relative != null) {
>                                  String strText = "<html><img src=\"" + 
> relative + "\">";
> ***************
> *** 1574,1578 ****
>               setLastCurrentDir(input.getParentFile());
>               try {
> !                 link = input.toURL();
>                   relative = link.toString();
>               } catch (MalformedURLException ex) {
> --- 1574,1578 ----
>               setLastCurrentDir(input.getParentFile());
>               try {
> !                 link = input.toURI().toURL();
>                   relative = link.toString();
>               } catch (MalformedURLException ex) {
> ***************
> *** 1583,1587 ****
>                   //Create relative URL
>                   try {
> !                     relative = 
> Tools.toRelativeURL(getMap().getFile().toURL(), link);
>                   } catch (MalformedURLException ex) {
>                       getController().errorMessage(getText("url_error"));
> --- 1583,1587 ----
>                   //Create relative URL
>                   try {
> !                     relative = 
> Tools.toRelativeURL(getMap().getFile().toURI().toURL(), link);
>                   } catch (MalformedURLException ex) {
>                       getController().errorMessage(getText("url_error"));
> 
> 
> -------------------------------------------------------------------------
> Check out the new SourceForge.net Marketplace.
> It's the best place to buy or sell services for
> just about anything Open Source.
> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
> _______________________________________________
> Freemind-cvslog mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/freemind-cvslog
> 


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Freemind-developer mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freemind-developer

Reply via email to