[CIShell-SVN] SF.net SVN: cishell: [639] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence/view/FileView.java

[<zh...@us...>]

Revision: 639
          http://cishell.svn.sourceforge.net/cishell/?rev=639&view=rev
Author:   zhang45
Date:     2008-02-26 11:51:53 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
improvement for viewing csv,

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java	2008-02-26 16:58:55 UTC (rev 638)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java	2008-02-26 19:51:53 UTC (rev 639)
@@ -123,39 +123,55 @@
         		 
         		
         	}else{
-        		final Converter[] converters = conversionManager.findConverters(data[i], "file-ext:*");
+        		final Converter[] convertersCSV = conversionManager.findConverters(data[i], "file-ext:csv");
+        		//logger.log(LogService.LOG_ERROR, "convertersCSV's length = " + convertersCSV.length);
+        		if (convertersCSV.length == 1)
+        		{
+        			Data newDataCSV = convertersCSV[0].convert(data[i]);
+        			tempFile = getTempFileCSV();
+        		    isCSVFile = true;
+        		    copy((File)newDataCSV.getData(), tempFile);    
+         		    lastSaveSuccessful = true; 
+        			
+        		}
+        		else if (convertersCSV.length > 1)
+        		{
+        			Data newDataCSV = convertersCSV[0].convert(data[i]);
+        			for (int j = 1; j < convertersCSV.length; j++ )
+        			{
+        				newDataCSV = convertersCSV[j].convert(newDataCSV);
+        			}
+        			tempFile = getTempFileCSV();
+        		    isCSVFile = true;
+        		    copy((File)newDataCSV.getData(), tempFile);    
+         		    lastSaveSuccessful = true; 
+        		}
+        		else{
+        		   final Converter[] converters = conversionManager.findConverters(data[i], "file-ext:*");
                 
-            	if (converters.length < 1) {
-            		guiBuilder.showError("No Converters", 
-            				"No valid converters for data type: " + 
-            				data[i].getData().getClass().getName(), 
-            				"Please install a plugin that will save the data type to a file");
-            	}
-            	else if (converters.length == 1){
-             		//If length=1, use the unique path to save it directly 
-            		//and bring the text editor.
-            	    Data newData = converters[0].convert(data[i]);     
-            	    if (format.startsWith("prefuse.data.Table"))
-            	    {
-            	       tempFile = getTempFileCSV();
-              		   isCSVFile = true;
+            	   if (converters.length < 1) {
+            		  guiBuilder.showError("No Converters", 
+            			    	"No valid converters for data type: " + 
+            				     data[i].getData().getClass().getName(), 
+            				    "Please install a plugin that will save the data type to a file");
+            	   }
+            	   else if (converters.length == 1){
+             		    //If length=1, use the unique path to save it directly 
+            		    //and bring the text editor.
+            	        Data newData = converters[0].convert(data[i]);     
+                        tempFile = getTempFile(); 
+            	        copy((File)newData.getData(), tempFile);    
+            	  	    lastSaveSuccessful = true; 
+            	   }
+            	   else {
+             		  if (!parentShell.isDisposed()) {
+            		    	DataViewer dataViewer = new DataViewer(parentShell, data[i], converters);
+            		    	display.syncExec(dataViewer);
+             		    	lastSaveSuccessful = dataViewer.isSaved;
+            			    tempFile = dataViewer.theFile;
+            		      }
             	    }
-            	    else
-            	    {
-            	    	tempFile = getTempFile(); 
-            	    	
-            	    }
-            	    copy((File)newData.getData(), tempFile);    
-            		lastSaveSuccessful = true; 
-            	}
-            	else {
-             		if (!parentShell.isDisposed()) {
-            			DataViewer dataViewer = new DataViewer(parentShell, data[i], converters);
-            			display.syncExec(dataViewer);
-             			lastSaveSuccessful = dataViewer.isSaved;
-            			tempFile = dataViewer.theFile;
-            		}
-            	}
+        	    }
         	}
         	if (isCSVFile){//TC181
         		Display.getDefault().syncExec(new Runnable() {


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