Author: vsalaun Date: 2011-05-20 16:29:19 +0200 (Fri, 20 May 2011) New Revision: 3138 Url: http://chorem.org/repositories/revision/lima/3138 Log: #359 correction sur le type de message lors de l'import/export Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2011-05-20 14:26:33 UTC (rev 3137) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2011-05-20 14:29:19 UTC (rev 3138) @@ -46,6 +46,7 @@ import javax.swing.JComboBox; import javax.swing.JFileChooser; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingWorker; @@ -188,10 +189,18 @@ } else { if (importMode){ - DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + JOptionPane.showMessageDialog( + waitView, + _("lima.importexport.import.terminated"), + _("lima.importexport.import"), + JOptionPane.INFORMATION_MESSAGE); } else { - DialogHelper.showMessageDialog(_("lima.importexport.export.terminated")); + JOptionPane.showMessageDialog( + waitView, + _("lima.importexport.export.terminated"), + _("lima.importexport.export"), + JOptionPane.INFORMATION_MESSAGE); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2011-05-20 14:26:33 UTC (rev 3137) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2011-05-20 14:29:19 UTC (rev 3138) @@ -50,6 +50,7 @@ response[0]); //default button title } + /** @deprecated */ public static void showMessageDialog(String message) { JFrame f = new JFrame(); f.setIconImage(Resource.getIcon("icons/lima.png").getImage());