Author: kmorin Date: 2014-08-14 10:51:29 +0200 (Thu, 14 Aug 2014) New Revision: 558 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/558 Log: correction validation Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-14 08:27:36 UTC (rev 557) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-14 08:51:29 UTC (rev 558) @@ -574,7 +574,7 @@ .addNull(Email.PROPERTY_ARCHIVE_DATE) .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED) .addAllFetches(Email.PROPERTY_PRIORITY, - Email.PROPERTY_DEMAND_TYPE, + Email.PROPERTY_DEMAND_TYPE + "." + DemandType.PROPERTY_FIELDS, Email.PROPERTY_CLIENT, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_ETAT_ATTENTE, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 08:27:36 UTC (rev 557) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 08:51:29 UTC (rev 558) @@ -880,38 +880,39 @@ * @return validity */ public boolean isValid(String field) { - boolean result = getDemandType() == null; + DemandType demandType = getDemandType(); + boolean result = demandType == null; if (!result) { if (PROPERTY_CLIENT_CODE.equals(field)) { - result = !getDemandType().containsFields(MailField.CLIENT) + result = !demandType.containsFields(MailField.CLIENT) || StringUtils.isNotBlank(getClientCode()); } else if (PROPERTY_VALID_RANGE_ROW_MODELS.equals(field)) { - result = !getDemandType().containsFields(MailField.RANGE_ROW) + result = !demandType.containsFields(MailField.RANGE_ROW) || CollectionUtils.isNotEmpty(getValidRangeRowModels()); } else if (Email.PROPERTY_PROJECT_REFERENCE.equals(field)) { - result = !getDemandType().containsFields(MailField.PROJECT_REFERENCE) + result = !demandType.containsFields(MailField.PROJECT_REFERENCE) || StringUtils.isNotBlank(getProjectReference()); } else if (Email.PROPERTY_OBJECT.equals(field)) { - result = !getDemandType().containsFields(MailField.OBJECT) + result = !demandType.containsFields(MailField.OBJECT) || StringUtils.isNotBlank(getObject()); } else if (Email.PROPERTY_COMMENT.equals(field)) { - result = !getDemandType().containsFields(MailField.COMMENT) + result = !demandType.containsFields(MailField.COMMENT) || StringUtils.isNotBlank(getComment()); } else if (Email.PROPERTY_COMPANY_REFERENCE.equals(field)) { - result = !getDemandType().containsFields(MailField.COMPANY_REFERENCE) + result = !demandType.containsFields(MailField.COMPANY_REFERENCE) || StringUtils.isNotBlank(getCompanyReference()); } else if (Email.PROPERTY_PRIORITY.equals(field)) { - result = !getDemandType().containsFields(MailField.PRIORITY) + result = !demandType.containsFields(MailField.PRIORITY) || getPriority() != null; } else if (Email.PROPERTY_ETAT_ATTENTE.equals(field)) { - result = !getDemandType().containsFields(MailField.ETAT_ATTENTE) + result = !demandType.containsFields(MailField.ETAT_ATTENTE) || getEtatAttente() != null; } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-14 08:27:36 UTC (rev 557) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-14 08:51:29 UTC (rev 558) @@ -59,6 +59,7 @@ import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorResult; @@ -83,6 +84,8 @@ private static final Log log = LogFactory.getLog(AbstractFaxToMailDemandListHandler.class); + protected NuitonValidator<DemandeUIModel> demandeUIModelNuitonValidator = NuitonValidatorFactory.newValidator(DemandeUIModel.class);; + public void initDemandeTable(final JXTable table, boolean sortable) { // table.setAutoResizeMode(JTable.AUTO_RESIZE_NEXT_COLUMN); @@ -131,7 +134,7 @@ int viewRow = adapter.row; int modelRow = adapter.convertRowIndexToModel(viewRow); DemandeUIModel row = ((AbstractApplicationTableModel<DemandeUIModel>) table.getModel()).getEntry(modelRow); - return !row.isValid() && row.getTakenBy()!= null; + return !row.isValid() && row.getTakenBy() != null; } }; Color color = new Color(255, 51, 51); @@ -293,7 +296,7 @@ } public boolean isDemandeValid(DemandeUIModel d) { - NuitonValidatorResult result = NuitonValidatorFactory.newValidator(DemandeUIModel.class).validate(d); + NuitonValidatorResult result = demandeUIModelNuitonValidator.validate(d); return result.isValid(); }