Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9436] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2016-10-13 08:37:39
|
Revision: 9436
http://sourceforge.net/p/fudaa/svn/9436
Author: deniger
Date: 2016-10-13 08:37:36 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
CRUE-667: Import de conditions aux limites
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniImportProgressRunnable.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponentPopupFactory.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheBarrageFilEauPanel.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties
trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportListCLimMsTopExportPopupBuilder.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/TablerFileReader.java
trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/TablerFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/TablerFileReader.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/TablerFileReader.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -1,126 +0,0 @@
-/*
-GPL 2
- */
-package org.fudaa.fudaa.crue.common.helper;
-
-import com.Ostermiller.util.CSVParser;
-import com.memoire.bu.BuFileFilter;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JFileChooser;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluResource;
-import org.fudaa.ctulu.gui.CtuluFileChooser;
-import org.openide.util.Exceptions;
-
-/**
- * Lit a un fichier et le traduit en tableau a 2 dimension.
- *
- * @author Frederic Deniger
- */
-public class TablerFileReader {
-
- public static CtuluFileChooser createTablerFileChooser() {
- final BuFileFilter ftCsv = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV"));
- final BuFileFilter ftXsl = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier Excel 97-2003"));
- final BuFileFilter ftXslx = new BuFileFilter(new String[]{"xlsx"}, CtuluResource.CTULU.getString("Fichier Excel"));
- ftCsv.setExtensionListInDescription(true);
- ftXsl.setExtensionListInDescription(true);
- ftXslx.setExtensionListInDescription(true);
- CtuluFileChooser fileChooser = new CtuluFileChooser(true);
- fileChooser.addChoosableFileFilter(ftCsv);
- fileChooser.addChoosableFileFilter(ftXsl);
- fileChooser.addChoosableFileFilter(ftXslx);
- fileChooser.setFileFilter(ftXslx);
- fileChooser.setAcceptAllFileFilterUsed(false);
- fileChooser.setMultiSelectionEnabled(false);
- fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
- return fileChooser;
- }
-
- public String[][] readFile(File file) {
- final String nameToLowerCase = file.getName().toLowerCase();
- if (nameToLowerCase.endsWith("xlsx") || nameToLowerCase.endsWith("xls")) {
- List<String[]> rows = new ArrayList<>();
- InputStream is = null;
- try {
- is = new FileInputStream(file);
- Workbook wb = WorkbookFactory.create(is);
- Sheet sheetAt = wb.getSheetAt(0);
- int maxCol = 0;
- for (Row row : sheetAt) {
- maxCol = Math.max(maxCol, row.getLastCellNum());
- }
- for (Row row : sheetAt) {
- List<String> cols = new ArrayList<>();
- for (int i = 0; i < maxCol; i++) {
- cols.add(getValue(row.getCell(i, Row.CREATE_NULL_AS_BLANK)));
- }
- rows.add(cols.toArray(new String[cols.size()]));
- }
- } catch (Exception ex) {
- Exceptions.printStackTrace(ex);
- } finally {
- CtuluLibFile.close(is);
- }
- final String[][] toArray = rows.toArray(new String[rows.size()][]);
- return toArray;
-
- } else {
- return readCsv(file);
- }
- }
-
- protected String getValue(Cell cell) {
- switch (cell.getCellType()) {
- case Cell.CELL_TYPE_BLANK:
- return "";
- case Cell.CELL_TYPE_NUMERIC:
- return Double.toString(cell.getNumericCellValue());
- case Cell.CELL_TYPE_STRING:
- return cell.getStringCellValue();
- default:
- try {
- return Double.toString(cell.getNumericCellValue());
- } catch (Exception ex) {
- Logger.getLogger(TablerFileReader.class.getName()).log(Level.INFO, "message {0}", ex);
- try {
- return cell.getStringCellValue();
- } catch (Exception ex1) {
- Logger.getLogger(TablerFileReader.class.getName()).log(Level.INFO, "message {0}", ex1);
-
- }
- }
- }
- return StringUtils.EMPTY;
- }
-
- protected String[][] readCsv(File file) {
- Reader reader = null;
- String[][] values = null;
- try {
- reader = new FileReader(file);
- values = new CSVParser(new BufferedReader(reader), ';').getAllValues();
- } catch (Exception ex) {
- Exceptions.printStackTrace(ex);
- } finally {
- CtuluLibFile.close(reader);
- }
- return values;
- }
-
-}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -28,9 +28,17 @@
return sectionController;
}
+ /**
+ * a redefinir si on veut ajouter un item pour l'import de fichier
+ */
+ protected void addImportItem() {
+
+ }
+
@Override
protected void addItems() {
super.addItems();
+ addImportItem();
popupMenu.addSeparator();
openFrt = new OpenFrt(sectionController);
popupMenu.add(openFrt);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -5,7 +5,7 @@
import com.Ostermiller.util.CSVParser;
import java.io.File;
-import org.fudaa.fudaa.crue.common.helper.TablerFileReader;
+import org.fudaa.ctulu.table.CtuluExcelCsvFileReader;
import org.fudaa.fudaa.crue.modelling.calcul.importer.CLimMsImporter;
import org.fudaa.fudaa.crue.views.DonClimMTableModel;
import org.netbeans.api.progress.ProgressHandle;
@@ -41,7 +41,7 @@
}
values = CSVParser.parse(initValues, sep);
} else if (file != null) {
- values = new TablerFileReader().readFile(file);
+ values = new CtuluExcelCsvFileReader(file).readFile();
}
if (values == null) {
return null;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -3,20 +3,19 @@
*/
package org.fudaa.fudaa.crue.modelling.calcul;
-import com.memoire.bu.BuFileFilter;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.MissingResourceException;
import javax.swing.JFileChooser;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
-import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel;
import org.fudaa.ctulu.gui.CtuluPopupListener;
import org.fudaa.ctulu.gui.CtuluTableSimpleExporter;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.common.helper.CrueProgressUtils;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
-import org.fudaa.fudaa.crue.common.helper.TablerFileReader;
import org.fudaa.fudaa.crue.views.DonClimMTableModel;
import org.fudaa.fudaa.crue.views.LoiDisplayer;
import org.fudaa.fudaa.crue.views.LoiDisplayerInstaller;
@@ -54,7 +53,7 @@
if (!tc.isEditable()) {
return;
}
- CtuluFileChooser fileChooser = TablerFileReader.createTablerFileChooser();
+ CtuluFileChooser fileChooser = CtuluFileChooserCsvExcel.createOpenFileChooser();
final int res = fileChooser.showDialog(CtuluUIForNetbeans.DEFAULT.getParentComponent(), NbBundle.getMessage(
ModellingListCLimMsTopExportImportPopupBuilder.class,
"button.import.name"));
@@ -69,9 +68,9 @@
}
}
-
protected JMenuItem createExportMenuItem() throws MissingResourceException {
final JMenuItem menuItemExport = new JMenuItem(NbBundle.getMessage(ModellingListCLimMsTopExportImportPopupBuilder.class, "button.export.name"));
+ menuItemExport.setIcon(EbliResource.EBLI.getToolIcon("crystal_exporter"));
menuItemExport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -85,6 +84,7 @@
final JMenuItem menuItemImport = new JMenuItem(NbBundle.getMessage(ModellingListCLimMsTopExportImportPopupBuilder.class, "button.import.name"));
menuItemImport.setToolTipText(NbBundle.getMessage(ModellingListCLimMsTopExportImportPopupBuilder.class, "button.importClimMs.tooltip"));
menuItemImport.setEnabled(tc.isEditable());
+ menuItemImport.setIcon(EbliResource.EBLI.getToolIcon("crystal_importer"));
menuItemImport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniImportProgressRunnable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniImportProgressRunnable.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniImportProgressRunnable.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -6,7 +6,7 @@
import com.Ostermiller.util.CSVParser;
import java.io.File;
import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.fudaa.crue.common.helper.TablerFileReader;
+import org.fudaa.ctulu.table.CtuluExcelCsvFileReader;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.modelling.calcul.importer.CiniImporter;
import org.netbeans.api.progress.ProgressHandle;
@@ -43,7 +43,7 @@
}
values = CSVParser.parse(initValues, sep);
} else if (file != null) {
- values = new TablerFileReader().readFile(file);
+ values = new CtuluExcelCsvFileReader(file).readFile();
}
if (values == null) {
return null;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponentPopupFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponentPopupFactory.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponentPopupFactory.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -15,12 +15,12 @@
import javax.swing.JPopupMenu;
import javax.swing.KeyStroke;
import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel;
import org.fudaa.ctulu.gui.CtuluTableSimpleExporter;
import org.fudaa.ctulu.table.CtuluTable;
import org.fudaa.ctulu.table.CtuluTableModelDefault;
import org.fudaa.fudaa.crue.common.helper.CrueProgressUtils;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
-import org.fudaa.fudaa.crue.common.helper.TablerFileReader;
import org.fudaa.fudaa.crue.modelling.list.ListNodeAddPopupFactory;
import org.fudaa.fudaa.crue.views.export.OutlineViewExportTableModel;
import org.openide.explorer.view.NodePopupFactory;
@@ -54,11 +54,11 @@
@Override
public JPopupMenu createPopupMenu(int row, int column, Node[] selectedNodes, Component component) {
JPopupMenu res = super.createPopupMenu(row, column, selectedNodes, component);
- if(res.getComponentCount() == 1) {
+ if (res.getComponentCount() == 1) {
// ajout du séparateur uniquement si un item est présent avant
res.addSeparator();
}
-
+
final JMenuItem menuItemPaste = new JMenuItem(NbBundle.getMessage(ModellingListCiniTopComponentPopupFactory.class,
"button.importFromClipboard.name"));
menuItemPaste.setToolTipText(NbBundle.getMessage(ModellingListCiniTopComponentPopupFactory.class, "button.importFromClipboard.tooltip"));
@@ -119,7 +119,7 @@
if (!tc.isEditable()) {
return;
}
- CtuluFileChooser fileChooser = TablerFileReader.createTablerFileChooser();
+ CtuluFileChooser fileChooser = CtuluFileChooserCsvExcel.createOpenFileChooser();
final int res = fileChooser.showDialog(CtuluUIForNetbeans.DEFAULT.getParentComponent(), NbBundle.getMessage(ModellingListCiniTopComponent.class,
"button.import.name"));
if (res == JFileChooser.APPROVE_OPTION) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheBarrageFilEauPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheBarrageFilEauPanel.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheBarrageFilEauPanel.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -44,7 +44,7 @@
*
* @author fred
*/
-public class ModellingEMHBrancheBarrageFilEauPanel extends JPanel implements ModellingEMHBrancheSpecificEditor, Observer {
+public final class ModellingEMHBrancheBarrageFilEauPanel extends JPanel implements ModellingEMHBrancheSpecificEditor, Observer {
ModellingScenarioService modellingScenarioService = Lookup.getDefault().lookup(
ModellingScenarioService.class);
@@ -76,7 +76,7 @@
JPanel top = new JPanel(new BuGridLayout(4, 10, 10));
add(top, BorderLayout.NORTH);
- properties = ItemVariableView.create(DecimalFormatEpsilonEnum.COMPARISON,dcsp, getCcm(), DonCalcSansPrtBrancheNiveauxAssocies.PROP_QLIMINF,
+ properties = ItemVariableView.create(DecimalFormatEpsilonEnum.COMPARISON, dcsp, getCcm(), DonCalcSansPrtBrancheNiveauxAssocies.PROP_QLIMINF,
DonCalcSansPrtBrancheNiveauxAssocies.PROP_QLIMSUP);
for (ItemVariableView propertyEditorPanel : properties) {
propertyEditorPanel.addObserver(this);
@@ -145,7 +145,7 @@
private class SeuilView extends DefaultOutlineViewEditor {
protected void initWith(DonCalcSansPrtBrancheBarrageFilEau dcsp) {
- List<ElemSeuilAduNode> nodes = new ArrayList<ElemSeuilAduNode>();
+ List<ElemSeuilAduNode> nodes = new ArrayList<>();
if (dcsp != null) {
Collection<ElemSeuil> elemSeuilAvecPdc = dcsp.getElemSeuil();
CrueConfigMetier ccm = getCcm();
@@ -164,7 +164,7 @@
}
List<ElemSeuil> getElemSeuil() {
- List<ElemSeuil> res = new ArrayList<ElemSeuil>();
+ List<ElemSeuil> res = new ArrayList<>();
Node[] nodes = getExplorerManager().getRootContext().getChildren().getNodes();
for (Node node : nodes) {
ElemSeuil elemSeuil = node.getLookup().lookup(ElemSeuil.class);
@@ -228,7 +228,7 @@
try {
String toCopy = (String) Toolkit.getDefaultToolkit().getSystemClipboard().getData(DataFlavor.stringFlavor);
String[][] parse = CSVParser.parse(toCopy, '\t');
- List<ElemSeuilAduNode> contents = new ArrayList<ElemSeuilAduNode>();
+ List<ElemSeuilAduNode> contents = new ArrayList<>();
for (String[] strings : parse) {
if (strings.length >= 1) {
ElemSeuil newContent = new ElemSeuil(ccm);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -15,7 +15,9 @@
import org.fudaa.dodico.crue.metier.algo.DonPrtGeoProfilSectionInverser;
import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection;
import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.view.ItemVariableView;
import org.fudaa.fudaa.crue.loi.section.ProfilPopupMenuReceiver;
@@ -33,6 +35,7 @@
private InverseProfil inverseAction;
private SimplifyProfil simplifyAction;
+ EbliActionSimple importAction;
private final ProfilSectionTopComponent topComponent;
public ModellingProfilSectionMenuReceiver(ProfilSectionLoiUiController loiUiController, final ProfilSectionTopComponent topComponent) {
@@ -41,11 +44,25 @@
}
@Override
+ protected void addImportItem() {
+ importAction = new EbliActionSimple(NbBundle.getMessage(ModellingProfilSectionMenuReceiver.class, "tableImportAction"),
+ EbliResource.EBLI.getToolIcon("crystal_importer"), "IMPORT") {
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ topComponent.getLoiUIController().getTableGraphePanel().tableImport();
+ }
+
+ };
+ importAction.setDefaultToolTip("<html>" + EbliLib.getS("Importer depuis un fichier Excel/csv") + "<br><b>" + EbliLib.getS(
+ "Toutes les valeurs actuelles seront remplacées"));
+ popupMenu.add(importAction);
+ }
+
+ @Override
protected void addItems() {
super.addItems();
popupMenu.addSeparator();
inverseAction = new InverseProfil();
-
simplifyAction = new SimplifyProfil();
popupMenu.add(inverseAction);
popupMenu.add(simplifyAction);
@@ -56,6 +73,7 @@
super.updateItemStateBeforeShow();
EGCourbe selectedComponent = getPanel().getGraphe().getSelectedComponent();
final boolean editable = selectedComponent != null && selectedComponent.getModel().isModifiable();
+ importAction.setEnabled(editable);
inverseAction.setEnabled(editable);
simplifyAction.setEnabled(editable);
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties 2016-10-13 08:37:36 UTC (rev 9436)
@@ -66,4 +66,5 @@
simplifySectionProfilAction=Simplifier le profil
seuilSimplifyCasierProfilLabel=Seuil de simplification ProfilCasier
seuilSimplifyProfilSectionLabel=Seuil de simplification ProfilSection
-profileInverseAction=Inverser le profil
\ No newline at end of file
+profileInverseAction=Inverser le profil
+tableImportAction=Importer depuis un fichier Excel/csv
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -6,7 +6,7 @@
import java.io.File;
import java.io.IOException;
import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.fudaa.crue.common.helper.TablerFileReader;
+import org.fudaa.ctulu.table.CtuluExcelCsvFileReader;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -28,7 +28,7 @@
protected void testContent(File f) {
assertNotNull(f);
- String[][] values = new TablerFileReader().readFile(f);
+ String[][] values = new CtuluExcelCsvFileReader(f).readFile();
assertEquals(2, values.length);
assertEquals(5, values[0].length);
assertArrayEquals(new String[]{"A", "", "B", "C", "D"}, values[0]);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportListCLimMsTopExportPopupBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportListCLimMsTopExportPopupBuilder.java 2016-10-13 08:36:59 UTC (rev 9435)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportListCLimMsTopExportPopupBuilder.java 2016-10-13 08:37:36 UTC (rev 9436)
@@ -10,6 +10,7 @@
import javax.swing.JPopupMenu;
import org.fudaa.ctulu.gui.CtuluPopupListener;
import org.fudaa.ctulu.gui.CtuluTableSimpleExporter;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
import org.fudaa.fudaa.crue.views.LoiDisplayer;
import org.fudaa.fudaa.crue.views.LoiDisplayerInstaller;
@@ -37,7 +38,6 @@
menu.add(createExportMenuItem());
}
-
protected void exportTable() {
DonClimMExportTableModel exportModel = new DonClimMExportTableModel(tc.tableModel, tc.getCcm());
CtuluTableSimpleExporter.doExport(';', exportModel, CtuluUIForNetbeans.DEFAULT);
@@ -45,6 +45,7 @@
protected JMenuItem createExportMenuItem() throws MissingResourceException {
final JMenuItem menuItemExport = new JMenuItem(NbBundle.getMessage(ReportListCLimMsTopExportPopupBuilder.class, "button.export.name"));
+ menuItemExport.setIcon(EbliResource.EBLI.getToolIcon("crystal_exporter"));
menuItemExport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
