branch develop updated (2970d8fd -> 34f56154)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 2970d8fd Rename fields new f8f830de Extract method to reduce complexity new 87fe2cfa "static" base class members should not be accessed via derived types new 01f4857e Clean pom new 34f56154 Clean runner after execution The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 34f56154c268fb18914c22c62f2f59711e0de150 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 17:18:51 2019 +0200 Clean runner after execution commit 01f4857e59925c0f4d8de2af45508da2c82acce9 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 17:18:28 2019 +0200 Clean pom commit 87fe2cfa8f1e76a617864ea3cc00fe89b00697e6 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 15:25:18 2019 +0200 "static" base class members should not be accessed via derived types commit f8f830de382a926f92c8608e04adf5b7e6ae88bc Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 14:33:14 2019 +0200 Extract method to reduce complexity Summary of changes: .gitlab-ci.yml | 5 +- .../services/service/ReferentielServiceImpl.java | 4 +- .../service/imports/ArchiveImportExportModel.java | 36 +++++------- .../migration/FaxtomailFlywayMigrationService.java | 3 +- .../faxtomail/ui/swing/RunFaxToMail.java | 8 +-- .../swing/actions/AbstractChangeScreenAction.java | 4 +- .../ui/swing/actions/ShowDemandeAction.java | 4 +- .../faxtomail/ui/swing/content/MainUIHandler.java | 4 +- .../swing/content/attachment/ButtonAttachment.java | 4 +- .../content/demande/DemandeListTableFilter.java | 54 +++++++++-------- .../swing/content/demande/DemandeListUIModel.java | 2 +- .../ui/swing/content/demande/DemandeUIHandler.java | 9 +-- .../swing/content/demande/DemandesUIHandler.java | 5 +- .../demande/actions/SaveDemandeAndExitAction.java | 4 +- .../demande/demandgroup/ButtonEmailGroup.java | 4 +- .../demandgroup/DemandGroupHighlightDialog.java | 4 +- .../content/demande/history/ButtonHistory.java | 4 +- .../demande/replies/ButtonDemandReplies.java | 4 +- .../demande/replies/actions/OpenReplyAction.java | 11 ++-- .../demande/takenby/TakenByFormUIHandler.java | 4 +- .../content/pdfeditor/PDFEditorUIHandler.java | 5 +- .../swing/content/pdfeditor/PDFEditorUIModel.java | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 4 +- .../ui/swing/content/search/SearchUIModel.java | 3 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 3 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- .../util/FilterSortableTableHeaderRenderer.java | 9 +-- .../util/toolbar/AbstractToolbarPopupButton.java | 3 +- .../web/FaxToMailApplicationListener.java | 3 +- .../faxtomail/web/action/DemandDetailAction.java | 10 ++-- .../faxtomail/web/job/MailFilterJob.java | 2 +- pom.xml | 67 ---------------------- 32 files changed, 110 insertions(+), 180 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 87fe2cfa8f1e76a617864ea3cc00fe89b00697e6 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 15:25:18 2019 +0200 "static" base class members should not be accessed via derived types --- .../services/service/ReferentielServiceImpl.java | 4 +-- .../service/imports/ArchiveImportExportModel.java | 36 ++++++++-------------- .../migration/FaxtomailFlywayMigrationService.java | 3 +- .../faxtomail/ui/swing/RunFaxToMail.java | 8 +---- .../swing/actions/AbstractChangeScreenAction.java | 4 +-- .../ui/swing/actions/ShowDemandeAction.java | 4 +-- .../faxtomail/ui/swing/content/MainUIHandler.java | 4 +-- .../swing/content/attachment/ButtonAttachment.java | 4 +-- .../swing/content/demande/DemandeListUIModel.java | 2 +- .../ui/swing/content/demande/DemandeUIHandler.java | 9 +++--- .../swing/content/demande/DemandesUIHandler.java | 5 +-- .../demande/actions/SaveDemandeAndExitAction.java | 4 +-- .../demande/demandgroup/ButtonEmailGroup.java | 4 +-- .../demandgroup/DemandGroupHighlightDialog.java | 4 +-- .../content/demande/history/ButtonHistory.java | 4 +-- .../demande/replies/ButtonDemandReplies.java | 4 +-- .../demande/replies/actions/OpenReplyAction.java | 11 ++++--- .../demande/takenby/TakenByFormUIHandler.java | 4 +-- .../content/pdfeditor/PDFEditorUIHandler.java | 5 ++- .../swing/content/pdfeditor/PDFEditorUIModel.java | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 4 +-- .../ui/swing/content/search/SearchUIModel.java | 3 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 3 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- .../util/FilterSortableTableHeaderRenderer.java | 9 +++--- .../util/toolbar/AbstractToolbarPopupButton.java | 3 +- .../web/FaxToMailApplicationListener.java | 3 +- .../faxtomail/web/action/DemandDetailAction.java | 10 +++--- .../faxtomail/web/job/MailFilterJob.java | 2 +- 29 files changed, 77 insertions(+), 87 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java index 66092eaa..6787f6e2 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java @@ -140,8 +140,8 @@ public class ReferentielServiceImpl extends FaxToMailServiceSupport implements R clientBinder.copyExcluding(client, current, TopiaEntity.PROPERTY_TOPIA_ID, - Client.PROPERTY_TOPIA_CREATE_DATE, - Client.PROPERTY_TOPIA_VERSION); + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, + TopiaEntity.PROPERTY_TOPIA_VERSION); // clear current adresses and fax numbers current.setEmailAddresses(null); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java index d2558aa4..6903c78e 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.WaitingState; +import com.franciaflex.faxtomail.persistence.entities.Email; import org.nuiton.csv.Common; import org.nuiton.csv.ValueParserFormatter; import org.nuiton.csv.ext.AbstractImportExportModel; @@ -70,9 +71,9 @@ public class ArchiveImportExportModel extends AbstractImportExportModel<ArchiveI final Map<String, Priority> priorities) { super(separator); - newColumnForImportExport("receptionDate", ArchiveImportExportBean.PROPERTY_RECEPTION_DATE, dateValueParserFormatter); - newColumnForImportExport("projectReference", ArchiveImportExportBean.PROPERTY_PROJECT_REFERENCE); - newColumnForImportExport("sender", ArchiveImportExportBean.PROPERTY_SENDER, new ValueParserFormatter<Object>() { + newColumnForImportExport("receptionDate", Email.PROPERTY_RECEPTION_DATE, dateValueParserFormatter); + newColumnForImportExport("projectReference", Email.PROPERTY_PROJECT_REFERENCE); + newColumnForImportExport("sender", Email.PROPERTY_SENDER, new ValueParserFormatter<Object>() { @Override public Object parse(String value) throws ParseException { value = value.replaceFirst("^.*<(.*)>$", "$1"); @@ -85,42 +86,31 @@ public class ArchiveImportExportModel extends AbstractImportExportModel<ArchiveI return value != null ? value.toString() : ""; } }); - newColumnForImportExport("fax", ArchiveImportExportBean.PROPERTY_FAX, Common.PRIMITIVE_BOOLEAN); - newColumnForImportExport("recipient", ArchiveImportExportBean.PROPERTY_RECIPIENT); - newColumnForImportExport("object", ArchiveImportExportBean.PROPERTY_OBJECT); - newColumnForImportExport("archiveDate", ArchiveImportExportBean.PROPERTY_ARCHIVE_DATE, dateValueParserFormatter); - newColumnForImportExport("companyReference", ArchiveImportExportBean.PROPERTY_COMPANY_REFERENCE); + newColumnForImportExport("fax", Email.PROPERTY_FAX, Common.PRIMITIVE_BOOLEAN); + newColumnForImportExport("recipient", Email.PROPERTY_RECIPIENT); + newColumnForImportExport("object", Email.PROPERTY_OBJECT); + newColumnForImportExport("archiveDate", Email.PROPERTY_ARCHIVE_DATE, dateValueParserFormatter); + newColumnForImportExport("companyReference", Email.PROPERTY_COMPANY_REFERENCE); newColumnForImportExport("originalEmail", ArchiveImportExportBean.PROPERTY_ORIGINAL_EMAIL_CONTENT); - newColumnForImportExport("comment", ArchiveImportExportBean.PROPERTY_COMMENT); - newColumnForImportExport("etatAttente", ArchiveImportExportBean.PROPERTY_WAITING_STATE, new HasLabelValueParserFormatter<WaitingState>() { + newColumnForImportExport("comment", Email.PROPERTY_COMMENT); + newColumnForImportExport("etatAttente", Email.PROPERTY_WAITING_STATE, new HasLabelValueParserFormatter<WaitingState>() { @Override public WaitingState parse(String value) throws ParseException { return waitingStates.get(value); } }); - newColumnForImportExport("demandType", ArchiveImportExportBean.PROPERTY_DEMAND_TYPE, new HasLabelValueParserFormatter<DemandType>() { + newColumnForImportExport("demandType", Email.PROPERTY_DEMAND_TYPE, new HasLabelValueParserFormatter<DemandType>() { @Override public DemandType parse(String value) throws ParseException { return demandTypes.get(value); } }); - newColumnForImportExport("priority", ArchiveImportExportBean.PROPERTY_PRIORITY, new HasLabelValueParserFormatter<Priority>() { + newColumnForImportExport("priority", Email.PROPERTY_PRIORITY, new HasLabelValueParserFormatter<Priority>() { @Override public Priority parse(String value) throws ParseException { return priorities.get(value); } }); -// newMandatoryColumn("mailFolder", ArchiveImportExportBean.PROPERTY_MAIL_FOLDER, new ValueParserFormatter<MailFolder>() { -// @Override -// public MailFolder parse(String value) throws ParseException { -// return mailFolderMap.get(value); -// } -// -// @Override -// public String format(MailFolder value) { -// return value != null ? FaxToMailServiceUtils.getFullMailFolderPath(value) : ""; -// } -// }); newColumnForImportExport("mailFolder", ArchiveImportExportBean.PROPERTY_MAIL_FOLDER_PATHS); newColumnForImportExport("client-code", ArchiveImportExportBean.PROPERTY_CLIENT_CODE); newOptionalColumn("client-brand", ArchiveImportExportBean.PROPERTY_CLIENT_BRAND); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java index 92220a7f..fb200f81 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java @@ -26,6 +26,7 @@ package com.franciaflex.faxtomail.services.service.migration; import org.apache.commons.lang3.StringUtils; import org.flywaydb.core.Flyway; +import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.nuiton.topia.flyway.TopiaFlywayServiceImpl; import org.nuiton.topia.persistence.TopiaApplicationContext; @@ -42,7 +43,7 @@ public class FaxtomailFlywayMigrationService extends TopiaFlywayServiceImpl { protected void setLocations(Flyway flyway, TopiaApplicationContext topiaApplicationContext) { String specificDirectory; - String dialect = (String)topiaApplicationContext.getConfiguration().get(Environment.DIALECT); + String dialect = (String)topiaApplicationContext.getConfiguration().get(AvailableSettings.DIALECT); if (StringUtils.startsWith(dialect, "org.hibernate.dialect.SQLServer")) { specificDirectory = "db/migration/sqlserver"; } else if (StringUtils.startsWith(dialect, "org.hibernate.dialect.PostgreSQL")) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java index 5ec7637a..94816d02 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java @@ -34,7 +34,6 @@ import org.nuiton.jaxx.widgets.extra.SplashScreen; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; -import javax.swing.plaf.FontUIResource; import java.awt.Color; import java.awt.Font; import java.awt.Point; @@ -68,7 +67,7 @@ public class RunFaxToMail { Font font; try { InputStream fontStream = RunFaxToMail.class.getResourceAsStream("/PoetsenOne-Regular.ttf"); - font = FontUIResource.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(30f); + font = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(30f); } catch (Exception e) { if (log.isErrorEnabled()) { @@ -90,8 +89,6 @@ public class RunFaxToMail { // override default exception management (after config init) Thread.setDefaultUncaughtExceptionHandler(new FaxToMailExceptionHandler(context.getErrorHelper())); - // See http://forge.codelutin.com/issues/2055 - //System.setProperty("sun.awt.exception.handler", TuttiExceptionHandler.class.getName()); // prepare context (mainly init configs, i18n) context.init(); @@ -133,9 +130,6 @@ public class RunFaxToMail { context.open(); } -// UIManager.put("Table.alternateRowColor", context.getConfig().getColorAlternateRow()); -// UIManager.put("Table[Disabled+Selected].textBackground", context.getConfig().getColorSelectedRow()); -// UIManager.put("Table[Enabled+Selected].textBackground", context.getConfig().getColorSelectedRow()); UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource.LineBorderUIResource(Color.BLACK)); final MainUI mainUI = new MainUI(context); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java index fa609264..300a08cb 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java @@ -25,7 +25,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; -import jaxx.runtime.SwingUtil; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.context.JAXXContextEntryDef; /** @@ -42,7 +42,7 @@ public abstract class AbstractChangeScreenAction extends AbstractMainUIFaxToMail * Context entry to keep previous screen. */ protected static final JAXXContextEntryDef<FaxToMailScreen> PREVIOUS_SCREEN = - SwingUtil.newContextEntryDef("previousScreen", FaxToMailScreen.class); + JAXXUtil.newContextEntryDef("previousScreen", FaxToMailScreen.class); /** * Screen where to go. diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index 7ddb114a..4cfba191 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -34,7 +34,7 @@ import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -221,7 +221,7 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { if (frame == null) { final DemandesUI screenUI = new DemandesUI(getUI()); String screenTitle = screenUI.getModel().getCurrentDemand().getTitle(); - ImageIcon icon = JAXXWidgetUtil.createActionIcon("email-group"); + ImageIcon icon = SwingUtil.createActionIcon("email-group"); screenUI.getDemandsPanel().setLeftDecoration(new JLabel(icon)); frame = getHandler().openFrame(screenUI, screenTitle, new Dimension(800, 600)); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java index dcf10efc..9dc31f2a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java @@ -33,7 +33,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.RemoveablePropertyChangeListener; import com.google.common.base.Preconditions; import jaxx.runtime.JAXXBinding; -import jaxx.runtime.SwingUtil; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -229,7 +229,7 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext JAXXBinding[] bindings = ui.getDataBindings(); for (JAXXBinding binding : bindings) { - SwingUtil.removeDataBinding(ui, binding.getId()); + JAXXUtil.removeDataBinding(ui, binding.getId()); } ui.setVisible(false); ui.dispose(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java index daf6274d..6c1c8c3b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java @@ -27,7 +27,7 @@ package com.franciaflex.faxtomail.ui.swing.content.attachment; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.util.toolbar.AbstractToolbarPopupButton; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; @@ -88,7 +88,7 @@ public class ButtonAttachment extends AbstractToolbarPopupButton<AttachmentEdito @Override protected AttachmentEditorUI createNewPopup() { return new AttachmentEditorUI(FaxToMailUIContext.getApplicationContext(), - JAXXWidgetUtil.getParentContainer(this, JFrame.class)); + SwingUtil.getParentContainer(this, JFrame.class)); } public String getButtonText(Collection<Attachment> attachments) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index 5158ae7d..fed4e2fb 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -84,7 +84,7 @@ public class DemandeListUIModel extends AbstractSerializableBean { protected boolean canSortResults = false; - protected PaginationParameter paginationParameter = PaginationParameter.of(0, resultPerPage, Email.PROPERTY_TOPIA_CREATE_DATE, false); + protected PaginationParameter paginationParameter = PaginationParameter.of(0, resultPerPage, TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, false); protected PaginationResult<Email> paginationResult = PaginationResult.of(null, 0, paginationParameter); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 4da597a0..c371dd90 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -37,6 +37,7 @@ import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentListener; import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAction; +import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; @@ -112,7 +113,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, DemandeUIModel model = getModel(); String propertyName = evt.getPropertyName(); - if (RangeRowModel.PROPERTY_VALID.equals(propertyName)) { + if (AbstractFaxToMailBeanUIModel.PROPERTY_VALID.equals(propertyName)) { RangeRowModel row = (RangeRowModel) evt.getSource(); Boolean valid = (Boolean) evt.getNewValue(); if (Boolean.TRUE.equals(valid)) { @@ -122,7 +123,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } } - if (RangeRowModel.PROPERTY_VALID.equals(propertyName) + if (AbstractFaxToMailBeanUIModel.PROPERTY_VALID.equals(propertyName) || RangeRow.PROPERTY_QUOTATION_QUANTITY.equals(propertyName) || RangeRow.PROPERTY_PRODUCT_QUANTITY.equals(propertyName) || RangeRow.PROPERTY_SAV_QUANTITY.equals(propertyName)) { @@ -693,7 +694,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } protected void registerValidators(SwingValidator... validators) { - DemandesUI demandesUI = JAXXWidgetUtil.getParent(getUI(), DemandesUI.class); + DemandesUI demandesUI = SwingUtil.getParent(getUI(), DemandesUI.class); DemandesUIHandler handler = demandesUI.getHandler(); handler.clearValidators(); for (SwingValidator validator : validators) { @@ -702,7 +703,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } protected void clearValidators() { - DemandesUI demandesUI = JAXXWidgetUtil.getParent(getUI(), DemandesUI.class); + DemandesUI demandesUI = SwingUtil.getParent(getUI(), DemandesUI.class); DemandesUIHandler handler = demandesUI.getHandler(); handler.clearValidators(); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java index 1c34d869..76f8819c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java @@ -36,6 +36,7 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenMai import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenReplyFormAction; import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenSearchToGroupAction; import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAndExitAction; +import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -71,7 +72,7 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals(DemandeUIModel.PROPERTY_VALID) + if (evt.getPropertyName().equals(AbstractFaxToMailBeanUIModel.PROPERTY_VALID) || evt.getPropertyName().equals(DemandeUIModel.PROPERTY_EDITABLE) || evt.getPropertyName().equals(Email.PROPERTY_ARCHIVE_DATE)) { @@ -84,7 +85,7 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode } - if (evt.getPropertyName().equals(DemandeUIModel.PROPERTY_VALID) + if (evt.getPropertyName().equals(AbstractFaxToMailBeanUIModel.PROPERTY_VALID) || evt.getPropertyName().equals(DemandeUIModel.PROPERTY_EDITABLE) || evt.getPropertyName().equals(Email.PROPERTY_WAITING_STATE)) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAndExitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAndExitAction.java index 81e5ebd6..6d11c833 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAndExitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAndExitAction.java @@ -26,7 +26,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; /** * @author Kevin Morin (Code Lutin) @@ -41,6 +41,6 @@ public class SaveDemandeAndExitAction extends SaveDemandeAction { @Override public void postSuccessAction() { super.postSuccessAction(); - JAXXWidgetUtil.getParent(getUI(), DemandesUI.class).getHandler().closeFrame(); + SwingUtil.getParent(getUI(), DemandesUI.class).getHandler().closeFrame(); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java index d544aa24..3e721ea6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java @@ -27,7 +27,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.toolbar.AbstractToolbarPopupButton; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; import javax.swing.*; import java.beans.PropertyChangeEvent; @@ -69,7 +69,7 @@ public class ButtonEmailGroup extends AbstractToolbarPopupButton<DemandGroupUI> @Override protected DemandGroupUI createNewPopup() { return new DemandGroupUI(FaxToMailUIContext.getApplicationContext(), - JAXXWidgetUtil.getParentContainer(this, JFrame.class)); + SwingUtil.getParentContainer(this, JFrame.class)); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java index 667b6c8e..6ce9d2b0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java @@ -26,7 +26,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.util.CloseButton; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; import javax.swing.*; import java.awt.*; @@ -48,7 +48,7 @@ public class DemandGroupHighlightDialog extends JDialog { protected final Timer timer; public DemandGroupHighlightDialog(FaxToMailUIContext context, ButtonEmailGroup buttonEmailGroup) { - super(JAXXWidgetUtil.getParentContainer(buttonEmailGroup, JFrame.class)); + super(SwingUtil.getParentContainer(buttonEmailGroup, JFrame.class)); this.buttonEmailGroup = buttonEmailGroup; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java index 733b2ae7..204296f4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java @@ -29,7 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.toolbar.AbstractToolbarPopupButton; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.CollectionUtils; import javax.swing.*; @@ -83,7 +83,7 @@ public class ButtonHistory extends AbstractToolbarPopupButton<HistoryListUI> { @Override protected HistoryListUI createNewPopup() { return new HistoryListUI(FaxToMailUIContext.getApplicationContext(), - JAXXWidgetUtil.getParentContainer(this, JFrame.class)); + SwingUtil.getParentContainer(this, JFrame.class)); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java index 6cfb0571..dab9f84b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java @@ -29,7 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.toolbar.AbstractToolbarPopupButton; -import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.CollectionUtils; import javax.swing.*; @@ -91,7 +91,7 @@ public class ButtonDemandReplies extends AbstractToolbarPopupButton<DemandReplie @Override protected DemandRepliesUI createNewPopup() { DemandRepliesUI ui = new DemandRepliesUI(FaxToMailUIContext.getApplicationContext(), - JAXXWidgetUtil.getParentContainer(this, JFrame.class)); + SwingUtil.getParentContainer(this, JFrame.class)); return ui; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java index 53f49f82..5ab8c557 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java @@ -42,6 +42,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.mail.util.MimeMessageUtils; +import javax.mail.Message; import javax.mail.internet.MimeMessage; import javax.swing.JFrame; import javax.swing.SwingUtilities; @@ -92,13 +93,13 @@ public class OpenReplyAction extends AbstractFaxToMailAction<DemandeUIModel, Dem replyModel.setReadonly(true); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(message.getSubject()); - replyModel.setTo(StringUtils.join(message.getRecipients(MimeMessage.RecipientType.TO), " ; ")); + replyModel.setTo(StringUtils.join(message.getRecipients(Message.RecipientType.TO), " ; ")); replyModel.setFrom(message.getFrom()[0].toString()); - if (ArrayUtils.isNotEmpty(message.getRecipients(MimeMessage.RecipientType.CC))) { - replyModel.setCc(StringUtils.join(message.getRecipients(MimeMessage.RecipientType.CC), " ; ")); + if (ArrayUtils.isNotEmpty(message.getRecipients(Message.RecipientType.CC))) { + replyModel.setCc(StringUtils.join(message.getRecipients(Message.RecipientType.CC), " ; ")); } - if (ArrayUtils.isNotEmpty(message.getRecipients(MimeMessage.RecipientType.BCC))) { - replyModel.setCci(StringUtils.join(message.getRecipients(MimeMessage.RecipientType.BCC), " ; ")); + if (ArrayUtils.isNotEmpty(message.getRecipients(Message.RecipientType.BCC))) { + replyModel.setCci(StringUtils.join(message.getRecipients(Message.RecipientType.BCC), " ; ")); } if (message.isMimeType("multipart/*")) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java index e5764878..77223f42 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUIHandler.java @@ -27,7 +27,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.takenby; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.nuiton.jaxx.application.swing.util.Cancelable; -import org.nuiton.validator.bean.simple.SimpleBeanValidator; +import org.nuiton.validator.bean.AbstractValidator; import javax.swing.JComponent; import java.awt.Component; @@ -44,7 +44,7 @@ public class TakenByFormUIHandler extends AbstractFaxToMailUIHandler<TakenByForm // users initBeanFilterableComboBox(ui.getTakenByComboBox(), getModel().getUsers(), getModel().getTakenBy()); - getValidator().addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { + getValidator().addPropertyChangeListener(AbstractValidator.VALID_PROPERTY, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { getModel().setValid((Boolean) evt.getNewValue()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index 731a9bff..32df4a88 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -39,12 +39,11 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.actions.GenerateAnno import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.itextpdf.text.DocumentException; +import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ComponentMover; import jaxx.runtime.swing.ComponentResizer; import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.pdfbox.pdmodel.PDDocument; @@ -457,7 +456,7 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo protected void updateStamps(Collection<Stamp> stamps) { PDFEditorUI ui = getUI(); JAXXButtonGroup actionGroup = ui.getActionGroup(); - Icon stampIcon = JAXXWidgetUtil.createImageIcon("stamp.png"); + Icon stampIcon = SwingUtil.createImageIcon("stamp.png"); JToolBar toolbar = ui.getToolbar(); int i = toolbar.getComponentIndex(ui.getActionGroupSeparator()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java index 65951b68..c8f7edcb 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java @@ -213,7 +213,7 @@ public class PDFEditorUIModel extends AbstractFaxToMailBeanUIModel<Attachment, P public void setTopiaId(String id) { Object oldValue = getTopiaId(); editObject.setTopiaId(id); - firePropertyChange(Attachment.PROPERTY_TOPIA_ID, oldValue, id); + firePropertyChange(TopiaEntity.PROPERTY_TOPIA_ID, oldValue, id); } public Page[] getPages() { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index 52d885ba..593f4645 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -47,7 +47,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.Cancelable; -import org.nuiton.validator.bean.simple.SimpleBeanValidator; +import org.nuiton.validator.bean.AbstractValidator; import javax.swing.ComboBoxEditor; import javax.swing.JComboBox; @@ -269,7 +269,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo JComboBox addAttachmentFile = ui.getAddAttachmentFile(); addAttachmentFile.setEditor(new FileComboBoxEditor()); - getValidator().addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { + getValidator().addPropertyChangeListener(AbstractValidator.VALID_PROPERTY, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java index f6243710..b37b43b4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java @@ -33,6 +33,7 @@ import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; @@ -444,7 +445,7 @@ public class SearchUIModel extends AbstractFaxToMailBeanUIModel<SearchFilter, Se } public void resetPaginationParameter() { - setPaginationParameter(PaginationParameter.of(0, resultPerPage, Email.PROPERTY_TOPIA_CREATE_DATE, false)); + setPaginationParameter(PaginationParameter.of(0, resultPerPage, TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, false)); } public void setPaginationResult(PaginationResult<Email> paginationResult) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 992384bc..3200f186 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -55,6 +55,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.nuiton.util.beans.BeanUtil; +import org.nuiton.validator.bean.AbstractValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.AbstractAction; @@ -185,7 +186,7 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> protected void listenValidatorValid(SimpleBeanValidator validator, final AbstractFaxToMailBeanUIModel model) { - validator.addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { + validator.addPropertyChangeListener(AbstractValidator.VALID_PROPERTY, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { if (log.isDebugEnabled()) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 322016c3..5031e78a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -1060,7 +1060,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - FaxToMailUIUtil.openLink(e.getURL()); + ApplicationUIUtil.openLink(e.getURL()); } } }); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FilterSortableTableHeaderRenderer.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FilterSortableTableHeaderRenderer.java index 48ed28d8..8c5ca9cb 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FilterSortableTableHeaderRenderer.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FilterSortableTableHeaderRenderer.java @@ -26,8 +26,8 @@ package com.franciaflex.faxtomail.ui.swing.util; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; +import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.CompoundIcon; -import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.table.filter.FilterTableHeaderRenderer; import jaxx.runtime.swing.table.filter.TableFilter; import org.jdesktop.swingx.table.TableColumnExt; @@ -37,6 +37,7 @@ import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JTable; +import javax.swing.SwingConstants; import java.awt.Component; import java.awt.Image; @@ -55,10 +56,10 @@ public class FilterSortableTableHeaderRenderer extends FilterTableHeaderRenderer super(tableFilter); this.demandeListUIModel = demandeListUIModel; - ImageIcon icon = JAXXWidgetUtil.createImageIcon("sort_table_asc.png"); + ImageIcon icon = SwingUtil.createImageIcon("sort_table_asc.png"); sortAscIcon = new ImageIcon(icon.getImage().getScaledInstance(12, 12, Image.SCALE_SMOOTH)); - icon = JAXXWidgetUtil.createImageIcon("sort_table_desc.png"); + icon = SwingUtil.createImageIcon("sort_table_desc.png"); sortDescIcon = new ImageIcon(icon.getImage().getScaledInstance(12, 12, Image.SCALE_SMOOTH)); } @@ -88,7 +89,7 @@ public class FilterSortableTableHeaderRenderer extends FilterTableHeaderRenderer } else { label.setIcon(new CompoundIcon(sortIcon, originalIcon)); } - label.setHorizontalTextPosition(JLabel.TRAILING); + label.setHorizontalTextPosition(SwingConstants.TRAILING); } return label; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/toolbar/AbstractToolbarPopupButton.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/toolbar/AbstractToolbarPopupButton.java index 61b4d185..246e01d2 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/toolbar/AbstractToolbarPopupButton.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/toolbar/AbstractToolbarPopupButton.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.ui.swing.util.toolbar; */ import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXWidgetUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -117,7 +116,7 @@ public abstract class AbstractToolbarPopupButton<UI extends AbstractToolbarPopup @Override public void stateChanged(ChangeEvent e) { - JFrame buttonFrame = JAXXWidgetUtil.getParentContainer(AbstractToolbarPopupButton.this, JFrame.class); + JFrame buttonFrame = SwingUtil.getParentContainer(AbstractToolbarPopupButton.this, JFrame.class); if (isSelected()) { if (!popup.isVisible()) { popup.openEditor(AbstractToolbarPopupButton.this); diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java index 56bc5bc9..7480c97c 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java @@ -26,6 +26,7 @@ package com.franciaflex.faxtomail.web; import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.web.job.AbstractFaxToMailJob; import com.franciaflex.faxtomail.web.job.ClientUpdateJob; import com.franciaflex.faxtomail.web.job.EDIManagementJob; import com.franciaflex.faxtomail.web.job.MailFilterJob; @@ -74,7 +75,7 @@ public class FaxToMailApplicationListener implements ServletContextListener { JobDataMap data = new JobDataMap(); - data.put(MailFilterJob.APPLICATION_CONTEXT, applicationContext); + data.put(AbstractFaxToMailJob.APPLICATION_CONTEXT, applicationContext); JobDetail mailFilteringJob = JobBuilder.newJob(MailFilterJob.class) .usingJobData(data) diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java index 3e5d3c49..e7ba3e28 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java @@ -240,17 +240,17 @@ public class DemandDetailAction extends FaxToMailActionSupport { replyModel.setId(reply.getTopiaId()); replyModel.setSubject(message.getSubject()); - String toRecipient = message.getRecipients(MimeMessage.RecipientType.TO)[0].toString(); + String toRecipient = message.getRecipients(Message.RecipientType.TO)[0].toString(); replyModel.setToRecipients(Lists.newArrayList(toRecipient)); replyModel.setSender(message.getFrom()[0].toString()); - if (ArrayUtils.isNotEmpty(message.getRecipients(MimeMessage.RecipientType.CC))) { - String ccRecipient = message.getRecipients(MimeMessage.RecipientType.CC)[0].toString(); + if (ArrayUtils.isNotEmpty(message.getRecipients(Message.RecipientType.CC))) { + String ccRecipient = message.getRecipients(Message.RecipientType.CC)[0].toString(); replyModel.setCcRecipients(Lists.newArrayList(ccRecipient)); } - if (ArrayUtils.isNotEmpty(message.getRecipients(MimeMessage.RecipientType.BCC))) { - String bccRecipient = message.getRecipients(MimeMessage.RecipientType.BCC)[0].toString(); + if (ArrayUtils.isNotEmpty(message.getRecipients(Message.RecipientType.BCC))) { + String bccRecipient = message.getRecipients(Message.RecipientType.BCC)[0].toString(); replyModel.setBccRecipients(Lists.newArrayList(bccRecipient)); } diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java index 46e62a3b..9f6b1cde 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java @@ -243,7 +243,7 @@ public class MailFilterJob extends AbstractFaxToMailJob { if (allRecipients != null) { recipientAddresses.addAll(Arrays.asList(allRecipients)); } - Set<String> recipients = new HashSet<String>( + Set<String> recipients = new HashSet<>( Collections2.transform(recipientAddresses, new Function<Address, String>() { @Override public String apply(Address address) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 01f4857e59925c0f4d8de2af45508da2c82acce9 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 17:18:28 2019 +0200 Clean pom --- pom.xml | 67 ----------------------------------------------------------------- 1 file changed, 67 deletions(-) diff --git a/pom.xml b/pom.xml index 44e93c3b..afb5778e 100644 --- a/pom.xml +++ b/pom.xml @@ -146,9 +146,6 @@ <!-- issues status to include in changelog --> <!--<redmine.statusIds>18,19,3,10,11</redmine.statusIds>--> - <!-- Tell sonar where to look for the coverage file. Property inherited by submodules --> - <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath> - </properties> <repositories> @@ -896,22 +893,6 @@ <goal>report</goal> </goals> </execution> - <execution> - <id>merge</id> - <goals> - <goal>merge</goal> - </goals> - <configuration> - <fileSets> - <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet"> - <directory>${project.basedir}</directory> - <includes> - <include>**/*.exec</include> - </includes> - </fileSet> - </fileSets> - </configuration> - </execution> </executions> </plugin> </plugins> @@ -931,54 +912,6 @@ </reporting> <profiles> - - <profile> - <id>check-release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <build> - <plugins> - <!--<plugin>--> - <!--<artifactId>maven-enforcer-plugin</artifactId>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>check-release-properties</id>--> - <!--<goals>--> - <!--<goal>enforce</goal>--> - <!--</goals>--> - <!--<phase>initialize</phase>--> - <!--<configuration>--> - <!--<rules>--> - <!--<requireProperty>--> - <!--<property>jreVersion</property>--> - <!--<message>You must set a jreVersion property!</message>--> - <!--</requireProperty>--> - <!--<requireProperty>--> - <!--<property>dbVersion</property>--> - <!--<message>You must set a dbVersion property!</message>--> - <!--</requireProperty>--> - <!--<requireProperty>--> - <!--<property>reportVersion</property>--> - <!--<message>You must set a reportVersion property!</message>--> - <!--</requireProperty>--> - <!--</rules>--> - <!--<ignoreCache>true</ignoreCache>--> - <!--<failFast>true</failFast>--> - <!--<fail>true</fail>--> - - <!--</configuration>--> - <!--</execution>--> - <!--</executions>--> - <!--</plugin>--> - </plugins> - </build> - - </profile> <profile> <id>license-profile</id> <activation> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 34f56154c268fb18914c22c62f2f59711e0de150 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 25 17:18:51 2019 +0200 Clean runner after execution --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5359e06e..cccf024e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,13 +9,14 @@ build:compile-only: when: manual script: - mvn clean package -Dmaven.test.skip + - rm * .git* -rf || true build:with-tests: image: registry.nuiton.org/codelutin/dockerfiles:maven-release stage: build script: - mvn clean package - - rm * .git* -rf + - rm * .git* -rf || true except: - /^master.*$/ - /^release\/.*$/ @@ -26,6 +27,7 @@ check-releasable: stage: check-releasable script: - mvn clean verify -e -U -DperformRelease -Dredmine.skipGenerateChanges -Dmaven.javadoc.skip + - rm * .git* -rf || true only: - /^develop.*$/ except: @@ -37,5 +39,6 @@ sonar_job: script: - export MAVEN_OPTS="-Xmx1024m" - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=com.franciaflex:faxtomail -Dsonar.exclusions='**/faxtomail-ui-swing/**/*.css','**/js/libs/*','**/target/*','**/generated*/*' + - rm * .git* -rf || true only: - schedules -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm