From: <jm...@us...> - 2010-03-13 10:23:56
|
Revision: 1297 http://eulergui.svn.sourceforge.net/eulergui/?rev=1297&view=rev Author: jmvanel Date: 2010-03-13 10:23:50 +0000 (Sat, 13 Mar 2010) Log Message: ----------- Several tests were broken since revision 1289, were the Project URL string (field url) was set as a file:// URL for file projects; this led to errors in SimplifiedURI were field baseDirectory can (alas!) be an URL or a file path. Revision Links: -------------- http://eulergui.svn.sourceforge.net/eulergui/?rev=1289&view=rev Modified Paths: -------------- trunk/eulergui/src/main/java/eulergui/project/Project.java trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java Modified: trunk/eulergui/src/main/java/eulergui/project/Project.java =================================================================== --- trunk/eulergui/src/main/java/eulergui/project/Project.java 2010-03-12 17:21:44 UTC (rev 1296) +++ trunk/eulergui/src/main/java/eulergui/project/Project.java 2010-03-13 10:23:50 UTC (rev 1297) @@ -938,11 +938,11 @@ if( prepared ) { return; } - System.out.println("Project.prepare()"); + System.out.println("Project.prepare() " + getUrl() ); // copy sources to avoid ConcurrentModificationException Collection<N3Source> sources_ = new ArrayList<N3Source>(sources.values()); for ( final N3Source n3 : sources_ ) { - n3.setProject(this); + n3.setProject(this); // TODO remove <<<<<<<<<<< System.out.println("Project.prepare(): loop: " + n3.showShortName() ); try { Modified: trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java =================================================================== --- trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java 2010-03-12 17:21:44 UTC (rev 1296) +++ trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java 2010-03-13 10:23:50 UTC (rev 1297) @@ -21,6 +21,7 @@ private String fileName; private String simplifiedURI; // File referenceFile; // ( projectFile ) + /** TODO in fact base URL */ private String baseDirectory; private static boolean osIsWindows; @@ -30,13 +31,14 @@ } public SimplifiedURI(String baseDirectory) { - this.baseDirectory = baseDirectory; + this.baseDirectory = baseDirectory; // TODO convert to URL ? } /** get the absolute URI */ public String uri() { if (uri == null) { uri = expandRelativeURItoFileURI(simplifiedURI); } + // TODO test expandRelativeURL a,d remove method expandRelativeURItoFileURI return uri; } @@ -225,11 +227,12 @@ } } - /** TODO use public method elsewhere <<<<<<<< */ + /** PENDING use public method elsewhere <<<<<<<< */ private boolean baseIsURL() { return baseDirectory.startsWith("http:/") || baseDirectory.startsWith("https:/") || baseDirectory.startsWith("ftp:/") + || baseDirectory.startsWith("file:/") // TODO test <<<<<<<<<<< ; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |