[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6346] trunk/sql12/fw/src/main/java/net/ sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java

[<wi...@us...>]

Revision: 6346
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6346&view=rev
Author:   wis775
Date:     2011-08-07 17:05:21 +0000 (Sun, 07 Aug 2011)

Log Message:
-----------
Store result of SQL in file:  Use column label or alias - depends on the user's choice within the global settings.

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java	2011-08-07 17:03:50 UTC (rev 6345)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java	2011-08-07 17:05:21 UTC (rev 6346)
@@ -24,15 +24,10 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.swing.JTable;
-
-import org.hibernate.dialect.Dialect;
-
 import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
 import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeBigDecimal;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeGeneral;
 import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
-import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
 
 /**
  * The implementation of {@link IExportData} for exporting data of a {@link ResultSet}
@@ -88,8 +83,13 @@
 	public Iterator<String> getHeaders() {
 		List<String> headers = new ArrayList<String>();
 		for (ColumnDisplayDefinition col : this.colDispDef) {
-			// TODO Use the correct label for the column. (A alias is more important than the column name)
-			headers.add(col.getColumnName());
+			String headerValue;
+            if (DataTypeGeneral.isUseColumnLabelInsteadColumnName()){
+               headerValue = col.getLabel();
+            } else {
+               headerValue = col.getColumnName();
+            }
+			headers.add(headerValue);
 		}
 		return headers.iterator();
 


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