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

[<pat...@us...>]

Revision: 960
          http://cishell.svn.sourceforge.net/cishell/?rev=960&view=rev
Author:   pataphil
Date:     2009-10-12 17:38:10 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
Removed commented-out code.  Oops.

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

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java	2009-10-12 17:37:06 UTC (rev 959)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java	2009-10-12 17:38:10 UTC (rev 960)
@@ -7,12 +7,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.osgi.service.log.LogService;
 
-// TODO: Refactor this class.
 public class ViewDataChooser extends SaveDataChooser {
-	/*private boolean isSaved = false;
-	private LogService logger;
-	private Data theData;
-	private File outputFile;*/
 	private Converter selectedConverter = null;
 	
 	public ViewDataChooser(String title,
@@ -21,50 +16,16 @@
 						   Converter[] converters,
 						   CIShellContext ciShellContext,
 						   LogService logger){
-		super (data, parent, converters, title, ciShellContext);
-		
-		/*this.theData = data;
-		this.logger = logger;*/
+		super(data, parent, converters, title, ciShellContext);
 	}
-	//TODO: replace this stuff with convertToFile -- specifically, just ahve this return the darn selected format.
+
 	protected void selectionMade(int selectedIndex) {
         getShell().setVisible(false);
         this.selectedConverter = converterArray[selectedIndex];
         close(true);
-        /*final Converter selectedConverter = converterArray[selectedIndex];
-        
-        try {
-        	Data newData = selectedConverter.convert(theData);
-        	String label = (String) newData.getMetadata().get(DataProperty.LABEL);
-	        String fileName = FileUtil.extractFileName(label);
-	        String extension = FileUtil.extractExtension(newData.getFormat());
-	        File tempFile = FileUtil.getTempFile(fileName, extension, logger);
-	        
-	        try {
-				FileUtilities.copyFile((File)newData.getData(), tempFile);
-				isSaved = true;
-			} catch (FileCopyingException fileCopyingException) {
-				logger.log(LogService.LOG_ERROR, "Error copying view for view:\n    " + fileCopyingException.getMessage(), fileCopyingException);
-				return;
-			}
-			
-			outputFile = tempFile;
-	      	close(true);			
-        }  catch (ConversionException e) {
-			logger.log(LogService.LOG_ERROR, "Error: Unable to view data:\n    " + e.getMessage(), e);
-			return;
-		}*/
 	}
 	
 	public Converter getSelectedConverter() {
 		return this.selectedConverter;
 	}
-	
-	/*public boolean isSaved(){
-		return this.isSaved;
-	}
-	
-	public File getOutputFile() {
-		return this.outputFile;
-	}*/
 }

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java	2009-10-12 17:37:06 UTC (rev 959)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/FileViewer.java	2009-10-12 17:38:10 UTC (rev 960)
@@ -426,8 +426,6 @@
 	private final static class DataViewer implements Runnable {
 		public static final String VIEW_DIALOG_TITLE = "View";
 		private Shell shellWindow;
-		/*private boolean isSaved;
-		private File outputFile;*/
 		private Converter selectedConverter;
 		private Data data;
 		private Converter[] converters;
@@ -470,8 +468,6 @@
 				this.ciShellContext,
 				this.logger);
 			viewDataChooser.open();
-			/*isSaved = viewDataChooser.isSaved();
-			outputFile = viewDataChooser.getOutputFile();*/
 			this.selectedConverter = viewDataChooser.getSelectedConverter();
 		}
 	}


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