Fix Issue #628 : Spreadsheet export is now able to export hidden columns in...

Fix Issue #628 : Spreadsheet export is now able to export hidden columns in data laboratory and is not affected by localization.

modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/datatables/AttributeTableCSVExporter.java

+/*
+ Copyright 2008-2010 Gephi
+ Authors : Eduardo Ramos <eduramiba@gmail.com>
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2011 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.  When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2011 Gephi Consortium.
+ */
+package org.gephi.datalab.api.datatables;
+
+import com.csvreader.CsvWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import org.gephi.data.attributes.api.AttributeColumn;
+import org.gephi.data.attributes.api.AttributeTable;
+import org.gephi.graph.api.Attributable;
+import org.gephi.graph.api.Edge;
+
+public class AttributeTableCSVExporter {
+
+    private static final Character DEFAULT_SEPARATOR = ',';
+    public static final int FAKE_COLUMN_EDGE_SOURCE = -1;
+    public static final int FAKE_COLUMN_EDGE_TARGET = -2;
+    public static final int FAKE_COLUMN_EDGE_TYPE = -3;
+
+    /**
+     * <p>Export a AttributeTable to the specified file.</p>
+     *
+     * @param table Table to export
+     * @param file File to write
+     * @param separator Separator to use for separating values of a row in the CSV file. If null ',' will be used.
+     * @param charset Charset encoding for the file
+     * @param columnsToExport Indicates the indexes of the columns to export. All columns will be exported if null
+     * @throws IOException When an error happens while writing the file
+     */
+    public static void writeCSVFile(AttributeTable table, File file, Character separator, Charset charset, Integer[] columnsToExport, Attributable[] rows) throws IOException {
+        FileOutputStream out = new FileOutputStream(file);
+        if (separator == null) {
+            separator = DEFAULT_SEPARATOR;
+        }
+
+        AttributeColumn columns[] = table.getColumns();
+
+        if (columnsToExport == null) {
+            columnsToExport = new Integer[columns.length];
+            for (int i = 0; i < columnsToExport.length; i++) {
+                columnsToExport[i] = columns[i].getIndex();
+            }
+        }
+
+        CsvWriter writer = new CsvWriter(out, separator, charset);
+
+
+
+        //Write column headers:
+        for (int column = 0; column < columnsToExport.length; column++) {
+            int columnIndex = columnsToExport[column];
+
+            if (columnIndex == FAKE_COLUMN_EDGE_SOURCE) {
+                writer.write("Source");
+            } else if (columnIndex == FAKE_COLUMN_EDGE_TARGET) {
+                writer.write("Target");
+            } else if (columnIndex == FAKE_COLUMN_EDGE_TYPE) {
+                writer.write("Type");
+            } else {
+                writer.write(table.getColumn(columnIndex).getTitle(), true);
+            }
+
+        }
+        writer.endRecord();
+
+        //Write rows:
+        Object value;
+        String text;
+        for (int row = 0; row < rows.length; row++) {
+            for (int column = 0; column < columnsToExport.length; column++) {
+                int columnIndex = columnsToExport[column];
+                
+                if (columnIndex == FAKE_COLUMN_EDGE_SOURCE) {
+                    value = ((Edge)rows[row]).getSource().getNodeData().getId();
+                } else if (columnIndex == FAKE_COLUMN_EDGE_TARGET) {
+                    value = ((Edge)rows[row]).getTarget().getNodeData().getId();
+                } else if (columnIndex == FAKE_COLUMN_EDGE_TYPE) {
+                    value = ((Edge)rows[row]).isDirected() ? "Directed" : "Undirected";
+                } else {
+                    value = rows[row].getAttributes().getValue(columnIndex);
+                }
+
+                if (value != null) {
+                    text = value.toString();
+                } else {
+                    text = "";
+                }
+                writer.write(text, true);
+            }
+            writer.endRecord();
+        }
+        writer.close();
+    }
+}

modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/ui/CreateTimeIntervalUI.java

@@ -57,6 +57,7 @@ import org.netbeans.validation.api.Problems;
 import org.netbeans.validation.api.Validator;
 import org.netbeans.validation.api.ui.ValidationGroup;
 import org.netbeans.validation.api.ui.ValidationPanel;
+import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 
 /**
@@ -204,7 +205,7 @@ public class CreateTimeIntervalUI extends javax.swing.JPanel implements Manipula
             public boolean validate(Problems prblms, String string, String t) {
                 boolean valid = validateDateFormat(t);
                 if(!valid){
-                    prblms.add("Invalid date format");
+                    prblms.add(NbBundle.getMessage(CreateTimeIntervalUI.class, "CreateTimeIntervalUI.invalid.dateformat"));
                 }
                 return valid;
             }
@@ -215,7 +216,7 @@ public class CreateTimeIntervalUI extends javax.swing.JPanel implements Manipula
             public boolean validate(Problems prblms, String string, String t) {
                 boolean valid = validateNumberOrEmpty(t);
                 if(!valid){
-                    prblms.add("Invalid number");
+                    prblms.add(NbBundle.getMessage(CreateTimeIntervalUI.class, "CreateTimeIntervalUI.invalid.number"));
                 }
                 return valid;
             }

modules/DataLaboratoryPlugin/src/main/resources/org/gephi/datalab/plugin/manipulators/columns/merge/ui/Bundle.properties

-BooleanLogicOperationsUI.descriptionLabel.text=<html><center>Choose the logical operations between each pair of columns</center></html>
-BooleanLogicOperationsUI.titleLabel.text=New column title:
-JoinWithSeparatorUI.titleLabel.text=New column title:
-JoinWithSeparatorUI.separatorLabel.text=Separator text:
-JoinWithSeparatorUI.separatorText.text=
-BooleanLogicOperationsUI.titleTextField.text=
-JoinWithSeparatorUI.titleTextField.text=
-GeneralColumnTitleChooserUI.titleLabel.text=New column title:
-GeneralColumnTitleChooserUI.titleTextField.text=
-CreateTimeIntervalUI.startColumnLabel.text=Start time column:
-CreateTimeIntervalUI.endColumnLabel.text=End time column:
-CreateTimeIntervalUI.header.title=Time Interval creation options
-CreateTimeIntervalUI.header.description=<html>Choose columns to use as start and/or end times.<br>Also you can choose default start and end times to use when values are not correct or missing, else  infinity will be used instead.</html>
-CreateTimeIntervalUI.parseDatesRadioButton.text=Parse dates
-CreateTimeIntervalUI.parseNumbersRadioButton.text=Parse numbers
-CreateTimeIntervalUI.dateDefaultStartLabel.text=Default start time:
-CreateTimeIntervalUI.dateDefaultEndLabel.text=Default end time:
-CreateTimeIntervalUI.dateFormatLabel.text=Date format:
-CreateTimeIntervalUI.defaultStartNumberText.text=
-CreateTimeIntervalUI.defaultEndNumberText.text=
-CreateTimeIntervalUI.defaultStartNumberLabel.text=Default start time:
-CreateTimeIntervalUI.defaultEndNumberLabel.text=Default end time:
+BooleanLogicOperationsUI.descriptionLabel.text=<html><center>Choose the logical operations between each pair of columns</center></html>
+BooleanLogicOperationsUI.titleLabel.text=New column title:
+JoinWithSeparatorUI.titleLabel.text=New column title:
+JoinWithSeparatorUI.separatorLabel.text=Separator text:
+JoinWithSeparatorUI.separatorText.text=
+BooleanLogicOperationsUI.titleTextField.text=
+JoinWithSeparatorUI.titleTextField.text=
+GeneralColumnTitleChooserUI.titleLabel.text=New column title:
+GeneralColumnTitleChooserUI.titleTextField.text=
+CreateTimeIntervalUI.startColumnLabel.text=Start time column:
+CreateTimeIntervalUI.endColumnLabel.text=End time column:
+CreateTimeIntervalUI.header.title=Time Interval creation options
+CreateTimeIntervalUI.header.description=<html>Choose columns to use as start and/or end times.<br>Also you can choose default start and end times to use when values are not correct or missing, else  infinity will be used instead.</html>
+CreateTimeIntervalUI.parseDatesRadioButton.text=Parse dates
+CreateTimeIntervalUI.parseNumbersRadioButton.text=Parse numbers
+CreateTimeIntervalUI.dateDefaultStartLabel.text=Default start time:
+CreateTimeIntervalUI.dateDefaultEndLabel.text=Default end time:
+CreateTimeIntervalUI.dateFormatLabel.text=Date format:
+CreateTimeIntervalUI.defaultStartNumberText.text=
+CreateTimeIntervalUI.defaultEndNumberText.text=
+CreateTimeIntervalUI.defaultStartNumberLabel.text=Default start time:
+CreateTimeIntervalUI.defaultEndNumberLabel.text=Default end time:
+CreateTimeIntervalUI.invalid.dateformat=Invalid date format
+CreateTimeIntervalUI.invalid.number=Invalid number

modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/DataTableTopComponent.java

@@ -49,7 +49,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.io.File;
-import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -60,6 +59,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import org.gephi.data.attributes.api.*;
 import org.gephi.datalab.api.DataLaboratoryHelper;
+import org.gephi.datalab.api.datatables.AttributeTableCSVExporter;
 import org.gephi.datalab.api.datatables.DataTablesController;
 import org.gephi.datalab.api.datatables.DataTablesEventListener;
 import org.gephi.datalab.spi.ContextMenuItemManipulator;
@@ -73,11 +73,11 @@ import org.gephi.desktop.datalab.general.actions.CSVExportUI;
 import org.gephi.desktop.datalab.general.actions.MergeColumnsUI;
 import org.gephi.graph.api.*;
 import org.gephi.project.api.*;
-import org.gephi.ui.components.WrapLayout;
 import org.gephi.ui.components.BusyUtils;
+import org.gephi.ui.components.WrapLayout;
 import org.gephi.ui.utils.DialogFileFilter;
 import org.gephi.ui.utils.UIUtils;
-import org.gephi.utils.TableCSVExporter;
+import org.gephi.utils.JTableCSVExporter;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.netbeans.swing.etable.ETableColumnModel;
 import org.openide.DialogDescriptor;
@@ -697,21 +697,25 @@ public class DataTableTopComponent extends TopComponent implements AWTEventListe
     }
 
     public void exportCurrentTable(ExportMode exportMode) {
-        JTable table;
+        AttributeTable table;
+        Attributes[] rows;
         String fileName = prepareTableExportFileName();
+        boolean edgesTable;
 
         if (classDisplayed == ClassDisplayed.NODE) {
-            table = nodeTable.getOutlineTable();
+            table = Lookup.getDefault().lookup(AttributeController.class).getModel().getNodeTable();
+            edgesTable = false;
             fileName += " [Nodes]";
         } else {
-            table = edgeTable.getTable();
+            table = Lookup.getDefault().lookup(AttributeController.class).getModel().getEdgeTable();
+            edgesTable = true;
             fileName += " [Edges]";
         }
         fileName += ".csv";
 
         switch (exportMode) {
             case CSV:
-                showCSVExportUI(table, fileName);
+                showCSVExportUI(table, edgesTable, fileName);
                 break;
         }
     }
@@ -750,11 +754,11 @@ public class DataTableTopComponent extends TopComponent implements AWTEventListe
         return fileName;
     }
 
-    private void showCSVExportUI(JTable table, String fileName) {
-        CSVExportUI csvUI = new CSVExportUI(table);
+    private void showCSVExportUI(AttributeTable table, boolean edgesTable, String fileName) {
+        CSVExportUI csvUI = new CSVExportUI(table, edgesTable);
         DialogDescriptor dd = new DialogDescriptor(csvUI, csvUI.getDisplayName());
         if (DialogDisplayer.getDefault().notify(dd).equals(DialogDescriptor.OK_OPTION)) {
-            DataTableTopComponent.exportTableAsCSV(this, table, csvUI.getSelectedSeparator(), csvUI.getSelectedCharset(), csvUI.getSelectedColumnsIndexes(), fileName);
+            DataTableTopComponent.exportTableAsCSV(this, table, edgesTable, csvUI.getSelectedSeparator(), csvUI.getSelectedCharset(), csvUI.getSelectedColumnsIndexes(), fileName);
         }
         csvUI.unSetup();
     }
@@ -1411,7 +1415,7 @@ public class DataTableTopComponent extends TopComponent implements AWTEventListe
     }
 
     /**
-     * <p>Exports a JTable to a CSV file showing first a dialog to select the
+     * <p>Exports a AttributeTable to a CSV file showing first a dialog to select the
      * file to write.</p>
      *
      * @param parent Parent window
@@ -1422,11 +1426,16 @@ public class DataTableTopComponent extends TopComponent implements AWTEventListe
      * @param columnsToExport Indicates the indexes of the columns to export.
      * All columns will be exported if null
      */
-    public static void exportTableAsCSV(JComponent parent, JTable table, Character separator, Charset charset, Integer[] columnsToExport, String fileName) {
-        String lastPath = NbPreferences.forModule(TableCSVExporter.class).get(LAST_PATH, null);
+    public static void exportTableAsCSV(JComponent parent, AttributeTable table, boolean edgesTable, Character separator, Charset charset, Integer[] columnsToExport, String fileName) {
+        //Validate that at least 1 column is selected:
+        if(columnsToExport.length < 1){
+            return;
+        }
+        
+        String lastPath = NbPreferences.forModule(JTableCSVExporter.class).get(LAST_PATH, null);
         final JFileChooser chooser = new JFileChooser(lastPath);
         chooser.setAcceptAllFileFilterUsed(false);
-        DialogFileFilter dialogFileFilter = new DialogFileFilter(NbBundle.getMessage(TableCSVExporter.class, "TableCSVExporter.filechooser.csvDescription"));
+        DialogFileFilter dialogFileFilter = new DialogFileFilter(NbBundle.getMessage(DataTableTopComponent.class, "TableCSVExporter.filechooser.csvDescription"));
         dialogFileFilter.addExtension("csv");
         chooser.addChoosableFileFilter(dialogFileFilter);
         File selectedFile = new File(chooser.getCurrentDirectory(), fileName);
@@ -1443,12 +1452,19 @@ public class DataTableTopComponent extends TopComponent implements AWTEventListe
 
         //Save last path
         String defaultDirectory = file.getParentFile().getAbsolutePath();
-        NbPreferences.forModule(TableCSVExporter.class).put(LAST_PATH, defaultDirectory);
+        NbPreferences.forModule(JTableCSVExporter.class).put(LAST_PATH, defaultDirectory);
         try {
-            TableCSVExporter.writeCSVFile(table, file, separator, charset, columnsToExport);
-            JOptionPane.showMessageDialog(parent, NbBundle.getMessage(TableCSVExporter.class, "TableCSVExporter.dialog.success"));
-        } catch (IOException ex) {
-            JOptionPane.showMessageDialog(parent, NbBundle.getMessage(TableCSVExporter.class, "TableCSVExporter.dialog.error"), NbBundle.getMessage(TableCSVExporter.class, "TableCSVExporter.dialog.error.title"), JOptionPane.ERROR_MESSAGE);
+            Attributable[] rows;
+            if(edgesTable){
+                rows = Lookup.getDefault().lookup(GraphController.class).getModel().getGraph().getEdges().toArray();
+            }else{
+                rows = Lookup.getDefault().lookup(GraphController.class).getModel().getGraph().getNodes().toArray();
+            }
+            
+            AttributeTableCSVExporter.writeCSVFile(table, file, separator, charset, columnsToExport, rows);
+            JOptionPane.showMessageDialog(parent, NbBundle.getMessage(DataTableTopComponent.class, "TableCSVExporter.dialog.success"));
+        } catch (Exception ex) {
+            JOptionPane.showMessageDialog(parent, NbBundle.getMessage(DataTableTopComponent.class, "TableCSVExporter.dialog.error"), NbBundle.getMessage(DataTableTopComponent.class, "TableCSVExporter.dialog.error.title"), JOptionPane.ERROR_MESSAGE);
         }
     }
     private static final String LAST_PATH = "TableCSVExporter_Save_Last_Path";

modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/general/actions/CSVExportUI.form

-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>

modules/DesktopDataLaboratory/src/main/resources/org/gephi/desktop/datalab/Bundle.properties

@@ -46,3 +46,8 @@ AvailableColumnsPanel.title=Display settings
 AvailableColumnsPanel.descriptionLabel.text=Choose the columns to display:
 AvailableColumnsPanel.maximum-available-columns.info=Maximum number of columns reached
 ConfigurationPanel.timeIntervalsAsDates.text=Time intervals as dates
+
+TableCSVExporter.dialog.success=Table exported with success
+TableCSVExporter.dialog.error=An error happened when writing the file. Make sure the file is not in use and you have permissions
+TableCSVExporter.dialog.error.title=Error
+TableCSVExporter.filechooser.csvDescription=CSV
\ No newline at end of file

modules/Utils/src/main/java/org/gephi/utils/TableCSVExporter.java → modules/Utils/src/main/java/org/gephi/utils/JTableCSVExporter.java

-/*
-Copyright 2008-2010 Gephi
-Authors : Eduardo Ramos <eduramiba@gmail.com>
-Website : http://www.gephi.org
-
-This file is part of Gephi.
-
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2011 Gephi Consortium. All rights reserved.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 3 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://gephi.org/about/legal/license-notice/
-or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License files at
-/cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 3, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 3] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 3 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 3 code and therefore, elected the GPL
-Version 3 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Gephi Consortium.
- */
-package org.gephi.utils;
-
-import com.csvreader.CsvWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import javax.swing.JTable;
-import javax.swing.table.TableModel;
-
-public class TableCSVExporter {
-
-    private static final Character DEFAULT_SEPARATOR = ',';
-
-    /**
-     * <p>Export a JTable to the specified file.</p>
-     * @param table Table to export
-     * @param file File to write
-     * @param separator Separator to use for separating values of a row in the CSV file. If null ',' will be used.
-     * @param charset Charset encoding for the file
-     * @param columnsToExport Indicates the indexes of the columns to export. All columns will be exported if null
-     * @throws IOException When an error happens while writing the file
-     */
-    public static void writeCSVFile(JTable table, File file, Character separator, Charset charset, Integer[] columnsToExport) throws IOException {
-        TableModel model = table.getModel();
-        FileOutputStream out = new FileOutputStream(file);
-        if (separator == null) {
-            separator = DEFAULT_SEPARATOR;
-        }
-
-        if (columnsToExport == null) {
-            columnsToExport = new Integer[model.getColumnCount()];
-            for (int i = 0; i < columnsToExport.length; i++) {
-                columnsToExport[i] = i;
-            }
-        }
-
-        CsvWriter writer = new CsvWriter(out, separator, charset);
-
-        //Write column headers:
-        for (int column = 0; column < columnsToExport.length; column++) {
-            writer.write(model.getColumnName(columnsToExport[column]), true);
-        }
-        writer.endRecord();
-
-        //Write rows:
-        Object value;
-        String text;
-        for (int row = 0; row < table.getRowCount(); row++) {
-            for (int column = 0; column < columnsToExport.length; column++) {
-                value = model.getValueAt(table.convertRowIndexToModel(row), columnsToExport[column]);
-                if (value != null) {
-                    text = value.toString();
-                } else {
-                    text = "";
-                }
-                writer.write(text, true);
-            }
-            writer.endRecord();
-        }
-        writer.close();
-    }
-}
+/*
+Copyright 2008-2010 Gephi
+Authors : Eduardo Ramos <eduramiba@gmail.com>
+Website : http://www.gephi.org
+
+This file is part of Gephi.
+
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 2011 Gephi Consortium. All rights reserved.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 3 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://gephi.org/about/legal/license-notice/
+or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License files at
+/cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 3, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 3] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 3 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 3 code and therefore, elected the GPL
+Version 3 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+
+Portions Copyrighted 2011 Gephi Consortium.
+ */
+package org.gephi.utils;
+
+import com.csvreader.CsvWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import javax.swing.JTable;
+import javax.swing.table.TableModel;
+
+public class JTableCSVExporter {
+
+    private static final Character DEFAULT_SEPARATOR = ',';
+
+    /**
+     * <p>Export a JTable to the specified file.</p>
+     * @param table Table to export
+     * @param file File to write
+     * @param separator Separator to use for separating values of a row in the CSV file. If null ',' will be used.
+     * @param charset Charset encoding for the file
+     * @param columnsToExport Indicates the indexes of the columns to export. All columns will be exported if null
+     * @throws IOException When an error happens while writing the file
+     */
+    public static void writeCSVFile(JTable table, File file, Character separator, Charset charset, Integer[] columnsToExport) throws IOException {
+        TableModel model = table.getModel();
+        FileOutputStream out = new FileOutputStream(file);
+        if (separator == null) {
+            separator = DEFAULT_SEPARATOR;
+        }
+
+        if (columnsToExport == null) {
+            columnsToExport = new Integer[model.getColumnCount()];
+            for (int i = 0; i < columnsToExport.length; i++) {
+                columnsToExport[i] = i;
+            }
+        }
+
+        CsvWriter writer = new CsvWriter(out, separator, charset);
+
+        //Write column headers:
+        for (int column = 0; column < columnsToExport.length; column++) {
+            writer.write(model.getColumnName(columnsToExport[column]), true);
+        }
+        writer.endRecord();
+
+        //Write rows:
+        Object value;
+        String text;
+        for (int row = 0; row < table.getRowCount(); row++) {
+            for (int column = 0; column < columnsToExport.length; column++) {
+                value = model.getValueAt(table.convertRowIndexToModel(row), columnsToExport[column]);
+                if (value != null) {
+                    text = value.toString();
+                } else {
+                    text = "";
+                }
+                writer.write(text, true);
+            }
+            writer.endRecord();
+        }
+        writer.close();
+    }
+}

modules/Utils/src/main/resources/org/gephi/utils/Bundle.properties

@@ -2,8 +2,4 @@ OpenIDE-Module-Display-Category=Gephi Core
 OpenIDE-Module-Long-Description=\
     Utils classes for core
 OpenIDE-Module-Name=Utils
-OpenIDE-Module-Short-Description=Utils classes for core
-TableCSVExporter.dialog.success=Table exported with success
-TableCSVExporter.dialog.error=An error happened when writing the file. Make sure the file is not in use and you have permissions
-TableCSVExporter.dialog.error.title=Error
-TableCSVExporter.filechooser.csvDescription=CSV
\ No newline at end of file
+OpenIDE-Module-Short-Description=Utils classes for core
\ No newline at end of file