Author: tchemit Date: 2014-01-29 18:40:19 +0100 (Wed, 29 Jan 2014) New Revision: 1536 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1536 Log: fix icon for psion import Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-29 17:37:18 UTC (rev 1535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-29 17:40:19 UTC (rev 1536) @@ -92,9 +92,6 @@ SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); List<String> missingCategories = Lists.newArrayList(); -// if (!sampleCategoryModel.containsCategoryId(enumerationFile.PMFM_ID_SIZE_CATEGORY)) { -// missingCategories.add("<li>" + persistenceService.getSizeCategoryCaracteristic().getParameterName() + "</li>"); -// } if (!sampleCategoryModel.containsCategoryId(enumerationFile.PMFM_ID_SEX)) { missingCategories.add("<li>" + persistenceService.getSexCaracteristic().getParameterName() + "</li>"); } @@ -111,24 +108,6 @@ UIManager.getIcon("error") ); } -// if (result) { -// -// SpeciesBatchUIModel speciesBatchUIModel = getUI().getModel(); -// if (speciesBatchUIModel.getRowCount() > 0) { -// String htmlMessage = String.format( -// AbstractTuttiUIHandler.CONFIRMATION_FORMAT, -// _("tutti.editSpeciesBatch.action.importPsion.existingData.message"), -// _("tutti.editSpeciesBatch.action.importPsion.existingData.help")); -// -// int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), -// htmlMessage, -// _("tutti.editSpeciesBatch.action.importPsion.existingData.title"), -// JOptionPane.OK_CANCEL_OPTION, -// JOptionPane.WARNING_MESSAGE); -// -// result = answer == JOptionPane.OK_OPTION; -// } -// } if (result) { // choose file to import