Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9312] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2016-03-09 15:22:13
|
Revision: 9312
http://sourceforge.net/p/fudaa/svn/9312
Author: deniger
Date: 2016-03-09 15:22:09 +0000 (Wed, 09 Mar 2016)
Log Message:
-----------
CRUE-634
CRUE-692
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties 2016-03-09 15:22:09 UTC (rev 9312)
@@ -22,9 +22,9 @@
LBL_WindowTransparencyHint=Maintenir la touche [Ctrl+clavier num\u00e9rique 0] pour rendre transparente une fen\u00eatre minimis\u00e9e
CTL_CloseModeAction=Fermer le groupe
CTL_MinimizeModeAction=Minimiser le groupe
-CTL_MinimizeWindowAction=Minimiser
LBL_CloseAllDocumentsAction=Tout Fermer
CTL_CloseAllButThisAction=Fermer les autres vues
CTL_MoveWindowLeftContextAction=D\u00e9placer \u00e0 gauche
CTL_MoveWindowRightContextAction=D\u00e9placer \u00e0 droite
+
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -15,11 +15,17 @@
public abstract class CrueSwingWorker<R> extends SwingWorker<R, Object> {
private final ProgressHandle ph;
+ private final String progressName;
public CrueSwingWorker(String progessName) {
+ this.progressName = progessName;
this.ph = ProgressHandleFactory.createHandle(progessName);
}
+ public String getProgressName() {
+ return progressName;
+ }
+
@Override
protected R doInBackground() throws Exception {
ph.start();
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -153,25 +153,34 @@
NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.ERROR_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
- NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), panelInfo, null, NotificationDisplayer.Priority.SILENT);
+ NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), panelInfo,
+ null, NotificationDisplayer.Priority.SILENT);
}
public static void showWarn(String title, String msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.WARNING_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
+ NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/avertissement.png"), msg,
+ null, NotificationDisplayer.Priority.SILENT);
}
public static void showWarn(String msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.WARNING_MESSAGE);
nd.setTitle(org.openide.util.NbBundle.getMessage(DialogHelper.class, "Warn"));
DialogDisplayer.getDefault().notify(nd);
+ NotificationDisplayer.getDefault().notify(msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/avertissement.png"), msg,
+ null, NotificationDisplayer.Priority.SILENT);
}
public static void showInfo(String title, Object msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.INFORMATION_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
+ if (msg instanceof String) {
+ NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"),
+ (String) msg, null, NotificationDisplayer.Priority.SILENT);
+ }
}
public static void showInfo(final String title, final Object msg, boolean later) {
@@ -221,7 +230,8 @@
return showQuestion(dialogDescriptor, classToSave);
}
- public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective, boolean bDisplayHelpButton) {
+ public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective,
+ boolean bDisplayHelpButton) {
DialogDescriptor descriptor = new DialogDescriptor(message, title);
if (helpId != null) {
SysdocUrlBuilder.installDialogHelpCtx(descriptor, helpId, perspective, bDisplayHelpButton);
@@ -246,7 +256,7 @@
public static UserSaveAnswer confirmSaveOrNot() {
return confirmSaveOrNot(
NbBundle.getMessage(DialogHelper.class, "SaveDialog.Title"), NbBundle.getMessage(DialogHelper.class,
- "SaveDialog.Content"),
+ "SaveDialog.Content"),
NbBundle.getMessage(DialogHelper.class, "SaveDialog.SaveAction"),
NbBundle.getMessage(DialogHelper.class, "SaveDialog.DontSaveAction"));
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -16,10 +16,12 @@
import org.fudaa.ctulu.ProgressionFuAdapter;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.PopupMenuReceiver;
+import org.fudaa.fudaa.crue.common.CrueIconsProvider;
import org.jdesktop.swingx.JXTree;
import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
+import org.openide.awt.NotificationDisplayer;
import org.openide.windows.WindowManager;
/**
@@ -46,6 +48,8 @@
NotifyDescriptor nd = new NotifyDescriptor(_msg, _titre, NotifyDescriptor.DEFAULT_OPTION, NotifyDescriptor.ERROR_MESSAGE,
new Object[]{NotifyDescriptor.OK_OPTION}, NotifyDescriptor.OK_OPTION);
DialogDisplayer.getDefault().notify(nd);
+ NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), _msg,
+ null, NotificationDisplayer.Priority.SILENT);
}
@@ -88,11 +92,14 @@
public void message(String _titre, String _msg, boolean _tempo) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.INFORMATION_MESSAGE);
DialogDisplayer.getDefault().notify(nd);
+ NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"),
+ _msg, null, NotificationDisplayer.Priority.SILENT);
}
@Override
public boolean question(String _titre, String _text) {
- NotifyDescriptor nd = new NotifyDescriptor(_text, _titre, NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.QUESTION_MESSAGE, null, NotifyDescriptor.OK_OPTION);
+ NotifyDescriptor nd = new NotifyDescriptor(_text, _titre, NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.QUESTION_MESSAGE, null,
+ NotifyDescriptor.OK_OPTION);
Object notify = DialogDisplayer.getDefault().notify(nd);
return NotifyDescriptor.YES_OPTION.equals(notify);
}
@@ -102,6 +109,8 @@
NotifyDescriptor nd = new NotifyDescriptor(_msg, _titre, NotifyDescriptor.DEFAULT_OPTION, NotifyDescriptor.WARNING_MESSAGE,
new Object[]{NotifyDescriptor.OK_OPTION}, NotifyDescriptor.OK_OPTION);
DialogDisplayer.getDefault().notify(nd);
+ NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/avertissement.png"), _msg,
+ null, NotificationDisplayer.Priority.SILENT);
}
public static JXTreeTableExtended createTreeTable(final DefaultTreeTableModel model, PopupMenuReceiver receiver) {
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -202,6 +202,7 @@
toolbar.add(new JSeparator());
toolbar.add(new CourbeVisibiltyUIAction(graphe).buildToolButton(EbliComponentFactory.INSTANCE));
EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
+ tableAction.setUi(CtuluUIForNetbeans.DEFAULT);
tableAction.setAddOptions(false);
tableAction.setAddCheckbox(true);
tableAction.setShowColumnToExport(false);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -82,7 +82,7 @@
preferredID = ReportVisualTopComponent.TOPCOMPONENT_ID)
public final class ReportVisualTopComponent extends AbstractReportTimeTopComponent implements LookupListener, ExplorerManager.Provider,
CtuluImageProducer, ReportTopComponentConfigurable<ReportPlanimetryConfig>, PropertyChangeListener {
-
+
public static final String TOPCOMPONENT_ID = "ReportVisualTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
@@ -94,8 +94,9 @@
private Lookup.Result<Long> resultatEMHsSelected;
private final ExplorerManager em = new ExplorerManager();
ReportPlanimetryConfig reportPlanimetryConfig = new ReportPlanimetryConfig();
+ private boolean runOpenedAndZoomSet = false;
private final ReportPlanimetryConfigurer reportPlanimetryConfigurer = new ReportPlanimetryConfigurer();
-
+
public ReportVisualTopComponent() {
initComponents();
setDefaultName();
@@ -107,27 +108,27 @@
ActionMap map = this.getActionMap();
associateLookup(ExplorerUtils.createLookup(em, map));
}
-
+
@Override
protected String getHelpCtxId() {
return SysdocUrlBuilder.getTopComponentHelpCtxId("vuePlanimetrie", PerspectiveEnum.REPORT);
}
-
+
@Override
public ReportPlanimetryConfig getReportConfig() {
return reportPlanimetryConfig;
}
-
+
@Override
public boolean isClosable() {
return false;
}
-
+
@Override
public void rangeChanged() {
setReportConfig(getReportConfig(), false);
}
-
+
@Override
public void setReportConfig(ReportPlanimetryConfig newConfig, boolean fromTemplate) {
super.updating = true;
@@ -154,27 +155,27 @@
}
}
private ReportViewLineInfo info;
-
+
@Override
public void setReportInfo(ReportViewLineInfo info) {
this.info = info;
}
-
+
@Override
public AbstractReportTopComponent getTopComponent() {
return this;
}
-
+
@Override
public void updateFrameName() {
setName(info == null ? "" : info.getNom());
updateTopComponentName();
}
-
+
public ReportPlanimetryConfigurer getReportPlanimetryConfigurer() {
return reportPlanimetryConfigurer;
}
-
+
private void updateConfigurer() {
if (panel != null) {
final PlanimetryController planimetryController = panel.getPlanimetryController();
@@ -199,22 +200,22 @@
panel.getVueCalque().repaint(0);
}
}
-
+
@Override
public BufferedImage produceImage(Map params) {
return panel.produceImage(params);
}
-
+
@Override
public BufferedImage produceImage(int w, int h, Map params) {
return panel.produceImage(w, h, params);
}
-
+
@Override
public Dimension getDefaultImageDimension() {
return panel.getDefaultImageDimension();
}
-
+
@Override
protected void componentActivated() {
super.componentActivated();
@@ -223,19 +224,19 @@
panel.requestFocusInWindow();
}
}
-
+
@Override
protected void componentDeactivated() {
super.componentDeactivated();
ExplorerUtils.activateActions(em, false);
}
-
+
@Override
public ExplorerManager getExplorerManager() {
return em;
}
Map<String, Long> calcByName;
-
+
@Override
public void selectedTimeChanged() {
if (reportService.getRunCourant() != null & panel != null) {
@@ -248,11 +249,11 @@
panel.getPlanimetryController().setEditedCalcul(calcSelected);
}
}
-
+
@Override
public void timeFormatChanged() {
}
-
+
@Override
public void setEditable(boolean b) {
this.editable = b;
@@ -261,7 +262,7 @@
planimetryVisuPanel.getPlanimetryController().setEditable(b, false);
}
}
-
+
@Override
public void setModified(boolean modified) {
super.setModified(modified);
@@ -271,7 +272,7 @@
}
}
}
-
+
@Override
protected void runLoadedHandler() {
if (reportVisuService.getPlanimetryVisuPanel() != null) {
@@ -279,11 +280,11 @@
}
}
VisuConfiguration initConfiguration;
-
+
protected void scenarioVisuLoaded() {
- final double[][] repere = panel == null ? null : panel.getVueCalque().getRepere();
+ final double[][] repere = (panel == null) ? null : panel.getVueCalque().getRepere();
this.removeAll();
-
+
panel = reportVisuService.getPlanimetryVisuPanel();
List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
for (BCalque bCalque : mainLayers) {
@@ -308,18 +309,21 @@
main.add(bottom, BorderLayout.SOUTH);
this.repaint();
super.revalidate();
+
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
- if (repere != null) {
+ if (repere != null && isOpened() && runOpenedAndZoomSet) {
panel.getVueCalque().setRepere(repere);
-
+
} else {
panel.restaurer();
}
-
+ if (isOpened()) {
+ runOpenedAndZoomSet = true;
+ }
selectedTimeChanged();
-
+
panel.getPlanimetryController()
.setEditable(editable);
}
@@ -328,20 +332,20 @@
}
private final Set<String> ignoreProperties = new TreeSet<String>(Arrays.asList("versEcran", "versReel"));
VisuChangerListener modificationChangeListener = new VisuChangerListener();
-
+
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (panel != null && !updating) {
reportPlanimetryConfig.setVisibility(panel.getPlanimetryController().getLayerVisibility());
reportViewServiceContrat.changesDoneIn(ReportVisualTopComponent.this);
-
+
}
-
+
}
private PlanimetryVisuPanel panel;
private LayerSelectionListener selectionListener = null;
SelectedEMHsLookupListener selectedEMHsLookupListener;
-
+
public void buildCalcMapIfNeeded() {
if (calcByName == null) {
calcByName = new HashMap<String, Long>();
@@ -352,7 +356,7 @@
}
}
}
-
+
@Override
public void clearReportModifications() {
updating = true;
@@ -364,13 +368,13 @@
}
clearModificationState();
updating = false;
-
+
}
-
+
private void setDefaultName() throws MissingResourceException {
setName(NbBundle.getMessage(ReportVisualTopComponent.class, TOPCOMPONENT_ACTION));
}
-
+
private void restoreDefaultConfigurationData() {
ReportTemplateFileProvider template = new ReportTemplateFileProvider();
reportPlanimetryConfig = (ReportPlanimetryConfig) template.loadTemplate(ReportContentType.PLANIMETRY);
@@ -384,20 +388,20 @@
setDefaultName();
setModified(false);
}
-
+
private void clearModificationState() {
setModified(false);
-
+
}
-
+
private class LayerSelectionListener implements ZSelectionListener {
-
+
@Override
public void selectionChanged(ZSelectionEvent _evt) {
selectionChangedInPanel();
}
}
-
+
protected void selectionChangedInPanel() {
if (updating) {
return;
@@ -424,12 +428,12 @@
//met à jour la sélection des EMHs.
reportSelectedEMHService.setSelectedEMHs(selected);
}
-
+
protected JComponent createToolbar(PlanimetryVisuPanel panel) {
SaveTemplateAction action = new SaveTemplateAction(this);
return PlanimetryVisuPanelBuilder.buildTopComponent(panel, action.buildButton(EbliComponentFactory.INSTANCE));
}
-
+
@Override
protected void runUnloadedHandler() {
updating = true;
@@ -442,14 +446,15 @@
bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
}
}
-
+
panel = null;
calcByName = null;
+ runOpenedAndZoomSet = false;
this.removeAll();
-
+
this.add(new JLabel(NbBundle.getMessage(ReportVisualTopComponent.class, "TopComponent.NoScenarioLoadedInformations")));
super.revalidate();
-
+
this.repaint();
updating = false;
}
@@ -476,7 +481,7 @@
}
}
VisuPanelLookupListener visuLookupListener;
-
+
@Override
protected void componentOpenedHandler() {
if (resultatVisuPanel == null) {
@@ -495,16 +500,16 @@
}
if (info != null) {
updateFrameName();
-
+
}
-
+
}
-
+
private class SelectedEMHsLookupListener implements LookupListener {
-
+
@Override
public void resultChanged(LookupEvent ev) {
-
+
if (panel == null || WindowManager.getDefault().getRegistry().getActivated() == ReportVisualTopComponent.this) {
return;
}
@@ -515,14 +520,14 @@
Collection<Long> uids = new ArrayList<Long>(allItems.size());
for (Long uid : allItems) {
uids.add(uid);
-
+
}
updating = true;
panel.setSelectedEMHFromUids(uids);
updating = false;
}
}
-
+
@Override
protected void componentClosedDefinitlyHandler() {
if (resultatVisuPanel != null) {
@@ -534,12 +539,12 @@
resultatEMHsSelected = null;
}
}
-
+
@Override
public void componentClosedTemporarily() {
super.componentClosedTemporarily();
}
-
+
void writeProperties(java.util.Properties p) {
// better to version settings since initial version as advocated at
// http://wiki.apidesign.org/wiki/PropertyFiles
@@ -547,16 +552,16 @@
// TODO store your settings
}
-
+
void readProperties(java.util.Properties p) {
// TODO read your settings according to their version
}
-
+
private class VisuChangerListener implements PropertyChangeListener, Observer {
-
+
public VisuChangerListener() {
}
-
+
@Override
public void update(Observable o, Object arg) {
if (!updating && "visible".equals(arg)) {
@@ -564,16 +569,16 @@
reportViewServiceContrat.changesDoneIn(ReportVisualTopComponent.this);
}
}
-
+
@Override
public void propertyChange(PropertyChangeEvent evt) {
-
+
if (panel == null) {
return;
}
if (evt.getSource() == panel.getCqLegend() && (!editable || ignoreProperties.contains(evt.getPropertyName()))) {
return;
-
+
}
if (updating) {
return;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -81,7 +81,8 @@
List<ResultatTimeKey> times = reportService.getTimeContent().getTimes();
ReportTimeChooser timeChooser = new ReportTimeChooser(times, reportService.getReportTimeFormatter().getResulatKeyTempsSimuToStringTransformer());
pn.add(timeChooser.getPanel());
- final CtuluFileChooser fileChooser = new CtuluFileChooserWriter(CtuluUIForNetbeans.DEFAULT, Arrays.<CtuluWriter>asList(new CtuluTableCsvWriter()));
+ final CtuluFileChooser fileChooser = new CtuluFileChooserWriter(CtuluUIForNetbeans.DEFAULT, Arrays.
+ <CtuluWriter>asList(new CtuluTableCsvWriter()));
final CtuluFileChooserPanel fileChooserPanel = new CtuluFileChooserPanel() {
@Override
protected CtuluFileChooser createFileChooser() {
@@ -93,7 +94,8 @@
pnSouth.add(fileChooserPanel);
pn.add(pnSouth, BorderLayout.SOUTH);
pn.setBorder(BuBorders.EMPTY3333);
- final DialogDescriptor dialogDescriptor = new DialogDescriptor(pn, NbBundle.getMessage(ReportExportHelper.class, "Export.DialogTitle"), true, new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION},
+ final DialogDescriptor dialogDescriptor = new DialogDescriptor(pn, NbBundle.getMessage(ReportExportHelper.class, "Export.DialogTitle"), true,
+ new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION},
NotifyDescriptor.OK_OPTION,
DialogDescriptor.DEFAULT_ALIGN,
HelpCtx.DEFAULT_HELP,
@@ -106,7 +108,7 @@
listener.setNode(node);
listener.setTimeChooser(timeChooser);
dialogDescriptor.setButtonListener(listener);
- SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, "exporterResultats", PerspectiveEnum.REPORT,false);
+ SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, "exporterResultats", PerspectiveEnum.REPORT, false);
final Dialog dialog = DialogDisplayer.getDefault().createDialog(dialogDescriptor);
listener.setDialog((JDialog) dialog);
dialog.pack();
@@ -199,18 +201,24 @@
}
dialog.dispose();
- SwingWorker<Boolean, Object> worker = new CrueSwingWorker<Boolean>(NbBundle.getMessage(ReportExportHelper.class,
+ final CrueSwingWorker<Boolean> worker = new CrueSwingWorker<Boolean>(NbBundle.getMessage(ReportExportHelper.class,
"Export.Task.Name")) {
@Override
protected Boolean doProcess() throws Exception {
ReportExportWriter writer = new ReportExportWriter();
- writer.write(fileWithExt, selected, contentByEMH, reportService.getReportTimeFormatter());
- return Boolean.TRUE;
+ return writer.write(fileWithExt, selected, contentByEMH, reportService.getReportTimeFormatter());
}
@Override
protected void done(Boolean res) {
- DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(ReportExportHelper.class, "Export.OperationFinish", fileChooserPanel.getFileWithExt().getAbsolutePath()));
+ if (Boolean.TRUE.equals(res)) {
+ DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(ReportExportHelper.class, "Export.OperationFinish", fileChooserPanel.
+ getFileWithExt().getAbsolutePath()));
+ } else {
+ DialogHelper.showError(NbBundle.getMessage(ReportExportHelper.class, "Export.DialogTitle"), org.openide.util.NbBundle.getMessage(
+ ReportExportHelper.class, "Exportg.OperationFailed",
+ fileChooserPanel.getFileWithExt().getAbsolutePath()));
+ }
}
};
worker.execute();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -5,6 +5,7 @@
import com.Ostermiller.util.CSVPrinter;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
@@ -35,9 +36,10 @@
public ReportExportWriter() {
}
- public void write(File f, List<ResultatTimeKey> times, List<ReportExportContentByEMH> content, ReportTimeFormatter timeFormatter) {
+ public boolean write(File f, List<ResultatTimeKey> times, List<ReportExportContentByEMH> content, ReportTimeFormatter timeFormatter) {
CSVPrinter writer = null;
ReportRunKey runKey = reportResultProviderService.getReportService().getRunCourant().getRunKey();
+ boolean ok = false;
try {
writer = new CSVPrinter(new FileOutputStream(f));
writer.changeQuote('"');
@@ -68,12 +70,17 @@
for (String string : variables) {
PropertyNature variable = reportResultProviderService.getPropertyNature(string);
ReportVariableKey createVariableKey = reportResultProviderService.createVariableKey(string);
- Double value = reportResultProviderService.getValue(resultatKey, new ReportRunVariableKey(runKey, createVariableKey), reportExportContentByEMH.emh.getNom());
- writer.write(TransformerEMHHelper.formatFromNature(variable, value, reportResultProviderService.getReportService().getCcm(), DecimalFormatEpsilonEnum.COMPARISON));
+ Double value = reportResultProviderService.getValue(resultatKey, new ReportRunVariableKey(runKey, createVariableKey),
+ reportExportContentByEMH.emh.getNom());
+ writer.write(TransformerEMHHelper.formatFromNature(variable, value, reportResultProviderService.getReportService().getCcm(),
+ DecimalFormatEpsilonEnum.COMPARISON));
}
}
writer.writeln();
+ ok = true;
}
+ } catch (FileNotFoundException ex) {
+
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
} finally {
@@ -85,6 +92,7 @@
}
}
}
+ return ok;
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -10,6 +10,7 @@
import org.fudaa.ebli.courbe.EGCourbe;
import org.fudaa.ebli.courbe.EGTableAction;
import org.fudaa.ebli.courbe.EGTableGraphePanel;
+import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
import org.fudaa.fudaa.crue.loi.common.LoiConstanteCourbeModel;
import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.openide.util.NbBundle;
@@ -19,9 +20,10 @@
* @author Frederic Deniger
*/
public final class ReportLongitudinalCourbesUiResController extends CourbesUiResController {
-
+
public ReportLongitudinalCourbesUiResController() {
EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
+ tableAction.setUi(CtuluUIForNetbeans.DEFAULT);
tableAction.setAddOptions(false);
tableAction.setAddCheckbox(false);
tableAction.setShowColumnToExport(false);
@@ -30,34 +32,34 @@
setUseVariableForAxeH(true);
getGraphe().setExportDataBuilder(new ReportLongitudinalExportDataBuilder());
}
-
+
@Override
protected AbstractTableModel createTableModel() {
return new ReportLongitudinalTableModel(getTableGraphePanel());
}
-
+
@Override
protected void configureTablePanel() {
super.configureTablePanel();
tableGraphePanel.getTable().getColumnModel().getColumn(0).setCellRenderer(new CtuluCellTextRenderer());
}
-
+
protected static class ReportLongitudinalTableModel extends EGTableGraphePanel.SpecTableModel {
-
+
public static final int COLUMN_BRANCHE = 0;
public static final int COLUMN_SECTION = 1;
-
+
public ReportLongitudinalTableModel(EGTableGraphePanel graphePanel) {
super(graphePanel);
xColIndex = 2;
yColIndex = 3;
}
-
+
@Override
public int getColumnCount() {
return 4;
}
-
+
@Override
public Object getValueAt(int _rowIndex, int _columnIndex) {
if (_columnIndex == COLUMN_SECTION || _columnIndex == COLUMN_BRANCHE) {
@@ -75,7 +77,7 @@
}
return super.getValueAt(_rowIndex, _columnIndex);
}
-
+
@Override
public String getColumnName(int _column) {
if (_column == COLUMN_SECTION) {
@@ -86,7 +88,7 @@
}
return super.getColumnName(_column);
}
-
+
@Override
public Class getColumnClass(int _columnIndex) {
if (_columnIndex <= COLUMN_SECTION) {
@@ -94,7 +96,7 @@
}
return Double.class;
}
-
+
@Override
public void setValueAt(Object _value, int _rowIndex, int _columnIndex) {
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java 2016-03-09 15:22:09 UTC (rev 9312)
@@ -9,6 +9,7 @@
import org.fudaa.ebli.courbe.EGCourbe;
import org.fudaa.ebli.courbe.EGTableAction;
import org.fudaa.ebli.courbe.EGTableGraphePanel;
+import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.openide.util.NbBundle;
@@ -21,6 +22,7 @@
public ReportTemporalCourbesUiResController() {
EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0);
tableAction.setAddOptions(false);
+ tableAction.setUi(CtuluUIForNetbeans.DEFAULT);
tableAction.setAddCheckbox(true);
tableAction.setShowColumnToExport(false);
tableAction.setDisplayAll(true);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties 2016-03-09 15:19:34 UTC (rev 9311)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties 2016-03-09 15:22:09 UTC (rev 9312)
@@ -8,8 +8,8 @@
Export.NoVariable.Error=Aucune variable s\u00e9lection\u00e9e
Export.NoTime.Error=Aucun pas de temps s\u00e9lection\u00e9
Export.FileNotWritable.Error=Le fichier n'est pas disponible en \u00e9criture
-Export.Task.Name=Exportation en cours
-Export.OperationFinish=Exportation termin\u00e9e: {0}
+Export.Task.Name=Export en cours
+Export.OperationFinish=Export termin\u00e9: {0}
ReportExportNodeAction.DisplayName=Exporter
Export.ChooseFile.LabelName=Fichier CSV:
DefaultExportType=type export: action exporter perspective Rapports
@@ -18,3 +18,4 @@
ExportEnded=Export termin\u00e9 vers le fichier {0}
cantWriteToFile.error=Il est impossible d''\u00e9crire dans le fichier {0}.\nRaison: {1}
cantWriteToFileUsedByAnotherProcess.error=il est probablement ouvert par une autre application (Excel)
+Exportg.OperationFailed=L''export vers le fichier {0} a \u00e9chou\u00e9.\n Il est probablement en cours d''utilisation par un autre process (Excel).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
