This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f8f830de382a926f92c8608e04adf5b7e6ae88bc Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 14:33:14 2019 +0200 Extract method to reduce complexity --- .../content/demande/DemandeListTableFilter.java | 54 ++++++++++++---------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java index 134d55b4..06a242ed 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java @@ -79,103 +79,103 @@ public class DemandeListTableFilter extends AbstractTableFilter<JXTable> { switch (property) { case Email.PROPERTY_DEMAND_STATUS: - emailFilter.setDemandStatus(!filtered ? null : new HashSet<DemandStatus>((Collection)items)); + emailFilter.setDemandStatus(getFilterProperty(items, filtered, DemandStatus.class)); break; case Email.PROPERTY_RECEPTION_DATE: - emailFilter.setReceptionDates(!filtered ? null : new HashSet<Date>((Collection) items)); + emailFilter.setReceptionDates(getFilterProperty(items, filtered, Date.class)); break; case Email.PROPERTY_RECIPIENT: - emailFilter.setRecipients(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setRecipients(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_SENDER: - emailFilter.setSenders(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setSenders(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_OBJECT: - emailFilter.setDemandObjects(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setDemandObjects(getFilterProperty(items, filtered, String.class)); break; case DemandeUIModel.PROPERTY_CLIENT_CODE: - emailFilter.setClientCodes(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setClientCodes(getFilterProperty(items, filtered, String.class)); break; case DemandeUIModel.PROPERTY_CLIENT_NAME: - emailFilter.setClientNames(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setClientNames(getFilterProperty(items, filtered, String.class)); break; case DemandeUIModel.PROPERTY_CLIENT_BRAND: - emailFilter.setClientBrands(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setClientBrands(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_DEMAND_TYPE: - emailFilter.setDemandTypes(!filtered ? null : new HashSet<DemandType>((Collection) items)); + emailFilter.setDemandTypes(getFilterProperty(items, filtered, DemandType.class)); break; case Email.PROPERTY_EDI_ERROR: - emailFilter.setEdiCodeNumbers(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setEdiCodeNumbers(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_WAITING_STATE: - emailFilter.setWaitingStates(!filtered ? null : new HashSet<WaitingState>((Collection) items)); + emailFilter.setWaitingStates(getFilterProperty(items, filtered, WaitingState.class)); break; case Email.PROPERTY_TAKEN_BY: - emailFilter.setTakenBys(!filtered ? null : new HashSet<FaxToMailUser>((Collection) items)); + emailFilter.setTakenBys(getFilterProperty(items, filtered, FaxToMailUser.class)); break; case Email.PROPERTY_PRIORITY: - emailFilter.setPriorities(!filtered ? null : new HashSet<Priority>((Collection) items)); + emailFilter.setPriorities(getFilterProperty(items, filtered, Priority.class)); break; case Email.PROPERTY_PROJECT_REFERENCE: - emailFilter.setProjectReferences(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setProjectReferences(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_COMPANY_REFERENCE: - emailFilter.setLocalReferences(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setLocalReferences(getFilterProperty(items, filtered, String.class)); break; case DemandeUIModel.PROPERTY_REFERENCE: - emailFilter.setReferences(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setReferences(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_RANGE_ROW: - emailFilter.setRanges(!filtered ? null : new HashSet<Range>((Collection) items)); + emailFilter.setRanges(getFilterProperty(items, filtered, Range.class)); break; case DemandeUIModel.PROPERTY_PF_NB: - emailFilter.setProductsQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); + emailFilter.setProductsQuantities(getFilterProperty(items, filtered, Long.class)); break; case DemandeUIModel.PROPERTY_SAV_NB: - emailFilter.setSavQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); + emailFilter.setSavQuantities(getFilterProperty(items, filtered, Long.class)); break; case DemandeUIModel.PROPERTY_QUOTATION_NB: - emailFilter.setQuotationQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); + emailFilter.setQuotationQuantities(getFilterProperty(items, filtered, Long.class)); break; case Email.PROPERTY_LAST_ATTACHMENT_OPENER: - emailFilter.setLastAttachmentOpeners(!filtered ? null : new HashSet<FaxToMailUser>((Collection) items)); + emailFilter.setLastAttachmentOpeners(getFilterProperty(items, filtered, FaxToMailUser.class)); break; case Email.PROPERTY_COMMENT: - emailFilter.setComments(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setComments(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_SUBJECT: - emailFilter.setSubjects(!filtered ? null : new HashSet<String>((Collection) items)); + emailFilter.setSubjects(getFilterProperty(items, filtered, String.class)); break; case Email.PROPERTY_LAST_PRINTING_DATE: - emailFilter.setLastPrintingDates(!filtered ? null : new HashSet<Date>((Collection) items)); + emailFilter.setLastPrintingDates(getFilterProperty(items, filtered, Date.class)); break; case Email.PROPERTY_LAST_PRINTING_USER: - emailFilter.setLastPrintingUsers(!filtered ? null : new HashSet<FaxToMailUser>((Collection) items)); + emailFilter.setLastPrintingUsers(getFilterProperty(items, filtered, FaxToMailUser.class)); break; } @@ -183,6 +183,10 @@ public class DemandeListTableFilter extends AbstractTableFilter<JXTable> { return true; } + private <T> HashSet<T> getFilterProperty(Collection items, boolean filtered, Class<T> clazz) { + return !filtered ? null : new HashSet<T>(items); + } + @Override public void modelChanged(TableModel model) { fireFilterChange(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.