Fix #1155 Add Import Spreadsheet option to File menu

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

@@ -42,13 +42,9 @@
 package org.gephi.desktop.datalab;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.gephi.graph.api.Column;
 import org.gephi.graph.api.Table;
 

modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/actions/ImportSpreadsheet.java

+/*
+ Copyright 2008-2015 Gephi
+ Authors : Eduardo Ramos
+ 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.desktop.datalab.actions;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import org.gephi.datalab.api.DataLaboratoryHelper;
+import org.gephi.datalab.spi.general.GeneralActionsManipulator;
+import org.gephi.project.api.ProjectController;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.Lookup;
+
+/**
+ *
+ * @author Eduardo Ramos
+ */
+@ActionID(id = "org.gephi.desktop.datalab.actions.ImportSpreadsheet", category = "File")
+@ActionRegistration(displayName = "#CTL_ImportSpreadsheet", iconInMenu = true)
+public class ImportSpreadsheet implements ActionListener {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        DataLaboratoryHelper dlh = Lookup.getDefault().lookup(DataLaboratoryHelper.class);
+        GeneralActionsManipulator m = dlh.getGeneralActionsManipulatorByName("ImportCSV");
+
+        if (m != null) {
+            ProjectController pc = Lookup.getDefault().lookup(ProjectController.class);
+            if(pc.getCurrentProject() == null){
+                pc.newProject();//Make sure to have an active project for import
+            }
+            
+            dlh.executeManipulator(m);
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+}

modules/DesktopDataLaboratory/src/main/nbm/manifest.mf

 Manifest-Version: 1.0
 AutoUpdate-Essential-Module: true
+OpenIDE-Module-Layer: org/gephi/desktop/datalab/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/gephi/desktop/datalab/Bundle.properties
 OpenIDE-Module-Specification-Version: ${gephi.modules.specification.version}
\ No newline at end of file

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

+CTL_ImportSpreadsheet=Import spreadsheet...
\ No newline at end of file

modules/DesktopDataLaboratory/src/main/resources/org/gephi/desktop/datalab/layer.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+   
+    <folder name="Actions"/>
+    <folder name="Menu">
+        <folder name="File">
+            <file name="org-gephi-desktop-datalab-actions-ImportSpreadsheet.shadow">
+                <attr name="originalFile" stringvalue="Actions/File/org-gephi-desktop-datalab-actions-ImportSpreadsheet.instance"/>
+                <attr name="position" intvalue="585"/>
+            </file>
+        </folder>
+    </folder>
+</filesystem>