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

[<fu...@us...>]

Revision: 1058
          http://cishell.svn.sourceforge.net/cishell/?rev=1058&view=rev
Author:   fugu13
Date:     2010-03-25 21:46:54 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
File loading fixed up for demo, reviewed by Katy and Joseph.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileFormatSelector.java
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileFormatSelector.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileFormatSelector.java	2010-03-22 20:04:57 UTC (rev 1057)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileFormatSelector.java	2010-03-25 21:46:54 UTC (rev 1058)
@@ -13,6 +13,7 @@
 import org.cishell.framework.algorithm.AlgorithmFactory;
 import org.cishell.framework.data.BasicData;
 import org.cishell.framework.data.Data;
+import org.cishell.framework.data.DataProperty;
 import org.cishell.reference.gui.common.AbstractDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -206,7 +207,9 @@
 			this.logger.log(LogService.LOG_INFO, "Loaded: " + this.selectedFile.getPath());
 
 			for (int ii = 0; ii < data.length; ii++) {
-				this.returnList.add(data[ii]);
+				Data dataItem = data[ii];
+				FileLoad.relabelWithFilename(dataItem, selectedFile);
+				this.returnList.add(dataItem);
 			}
 
 			close(true); 

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2010-03-22 20:04:57 UTC (rev 1057)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2010-03-25 21:46:54 UTC (rev 1058)
@@ -10,6 +10,7 @@
 import org.cishell.framework.algorithm.AlgorithmFactory;
 import org.cishell.framework.data.BasicData;
 import org.cishell.framework.data.Data;
+import org.cishell.framework.data.DataProperty;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
@@ -49,6 +50,19 @@
 			}
 		}
 	}
+	
+	protected static void relabelWithFilename(Data data, File file) {
+		File absoluteFile = file.getAbsoluteFile();
+		File parent = absoluteFile.getParentFile();
+		String prefix;
+		String parentName = parent.getName();
+		if(parentName.trim().length() == 0) {
+			prefix = File.separator;
+		} else {
+			prefix = "..." + File.separator + parentName + File.separator;
+		}
+		data.getMetadata().put(DataProperty.LABEL, prefix + absoluteFile.getName());
+	}
 
 	public Data[] execute() throws AlgorithmExecutionException {
 		// prepare to run load dialog in GUI thread
@@ -158,9 +172,11 @@
 						loadFileSuccess = true;
 						logger.log(LogService.LOG_INFO, "Loaded: "
 								+ file.getPath());
-						for (int i = 0; i < outputDataAfterValidation.length; i++)
-							loadedFiles_ReturnParameter.
-							add(outputDataAfterValidation[i]);
+						for (int i = 0; i < outputDataAfterValidation.length; i++) {
+							Data data = outputDataAfterValidation[i];
+							relabelWithFilename(data, file);
+							loadedFiles_ReturnParameter.add(data);
+						}
 					}
 				}
 
@@ -177,7 +193,9 @@
 				throw new RuntimeException(e);
 			}
 		}
+
 		
+		
 		private ServiceReference[] getSupportingValidators(String fileExtension) {
 			try {
 				String ldapQuery = "(& (type=validator)" +


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