[Bitcollider-commits] CVS: jbitcollider/plugins/org.bitpedia.collider.ui/src/org/bitpedia/collider/ui MainDialog.java,1.1,1.2

[Gordon M. <go...@us...>]

Update of /cvsroot/bitcollider/jbitcollider/plugins/org.bitpedia.collider.ui/src/org/bitpedia/collider/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32582/plugins/org.bitpedia.collider.ui/src/org/bitpedia/collider/ui

Modified Files:
	MainDialog.java 
Log Message:
* MainDialog.java
    bitprint.htmL
    remove unused method
    improve extraction of path to handle spaces (using URI instead of URL)

Index: MainDialog.java
===================================================================
RCS file: /cvsroot/bitcollider/jbitcollider/plugins/org.bitpedia.collider.ui/src/org/bitpedia/collider/ui/MainDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MainDialog.java	14 Apr 2006 07:40:12 -0000	1.1
--- MainDialog.java	15 Apr 2006 05:45:49 -0000	1.2
***************
*** 19,22 ****
--- 19,24 ----
  import java.io.PrintWriter;
  import java.io.Reader;
+ import java.net.URI;
+ import java.net.URISyntaxException;
  import java.net.URL;
  import java.util.ArrayList;
***************
*** 348,352 ****
  						tmpdir = tmpdir + sep;					
  					}
! 					String htmlFileName = tmpdir + "bitprint.htm";
  					PrintWriter pw = new PrintWriter(htmlFileName);
  					try {
--- 350,354 ----
  						tmpdir = tmpdir + sep;					
  					}
! 					String htmlFileName = tmpdir + "bitprint.html";
  					PrintWriter pw = new PrintWriter(htmlFileName);
  					try {
***************
*** 357,362 ****
  					}
  					
- //					BrowserControl.displayURL("file://localhost/"
- //							+ htmlFileName);
  					BrowserLauncher bl = new BrowserLauncher(null);
  					bl.openURLinBrowser("file://localhost/"+htmlFileName);
--- 359,362 ----
***************
*** 386,402 ****
  		
  	}
- 	
-     public String filenameFromUrl(URL url) {
-         String filename = url.getFile();
-         int lastSlash = url.getPath().lastIndexOf("/");
-         if(lastSlash==filename.length()) {
-             filename = filename.substring(0,filename.length()-1); 
-             lastSlash = url.getPath().lastIndexOf("/");
-         }
-         if(lastSlash>0) {
-             filename = filename.substring(lastSlash+1);
-         }
-         return filename;
-     }
  
  	public void drop(DropTargetDropEvent dtde) {
--- 386,389 ----
***************
*** 422,426 ****
  					List files = new ArrayList();
  	                while((line = reader.readLine()) != null) {
! 	                    files.add((new URL(line.trim())).getFile());
  	                }
  					executeBitcollider(files);
--- 409,417 ----
  					List files = new ArrayList();
  	                while((line = reader.readLine()) != null) {
! 	                    try {
!                             files.add((new URI(line.trim())).getPath());
!                         } catch (URISyntaxException e1) {
!                             System.err.println("Skipping "+line);
!                         }
  	                }
  					executeBitcollider(files);