[Faxtomail-commits] 02/05: bad merge?

20 Apr 2017

This is an automated email from the git hooks/post-receive script.

New commit to branch faxtomail-2.3.x in repository faxtomail.

See https://gitlab.nuiton.org/codelutin/faxtomail.git

commit f5c47607960dd7aa0bc9a1124c4e6865b7fcde49
Merge: d6962e3 4eef05e
Author: Maven Release <maven-release@codelutin.com>
Date:   Thu Apr 20 10:44:40 2017 +0200

    bad merge?

 faxtomail-persistence/pom.xml                      |   2 +-
 .../faxtomail/beans/QuantitiesByRange.java         |  19 +-
 .../entities/AbstractFaxToMailTopiaDao.java        |  32 ++
 .../persistence/entities/EmailFilter.java          |   3 +-
 .../persistence/entities/EmailTopiaDao.java        | 446 +++++++++++++--------
 .../faxtomail/persistence/entities/MailAction.java |   1 +
 .../faxtomail/persistence/entities/MailField.java  |  68 ++--
 .../src/main/resources/faxToMail.properties        |   2 +-
 faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35324 -> 36206 bytes
 faxtomail-service/pom.xml                          |   2 +-
 .../faxtomail/services/DecoratorService.java       |   1 +
 .../faxtomail/services/DecoratorServiceImpl.java   |   1 +
 .../services/service/EmailServiceImpl.java         |  63 +--
 ..._4_170316_1__add_canViewOriginalAttachments.sql |   4 +
 .../h2/V2_4_170316_2__add_mustTakeToEditDemand.sql |   4 +
 .../V2_4_170316_3__add_displayHelpOnMessages.sql   |   4 +
 ...17_1__add_computeQuantitiesSubtotalsByState.sql |   4 +
 ...0328_1__add_displayOnlyUserTrigraphInTables.sql |   4 +
 .../h2/V2_4_170328_2__add_show_actions_config.sql  |   5 +
 .../V2_4_170330_1__add_canChangeOrderInTable.sql   |   4 +
 ...ttachments_mailContentWithInlineAttachments.sql |  11 +
 .../V2_4_170403_1__add_showAttachmentPreview.sql   |   4 +
 ..._4_170316_1__add_canViewOriginalAttachments.sql |   6 +
 .../V2_4_170316_2__add_mustTakeToEditDemand.sql    |   6 +
 .../V2_4_170316_3__add_displayHelpOnMessages.sql   |   6 +
 ...17_1__add_computeQuantitiesSubtotalsByState.sql |   6 +
 ...0328_1__add_displayOnlyUserTrigraphInTables.sql |   6 +
 .../V2_4_170328_2__add_show_actions_config.sql     |   7 +
 .../V2_4_170330_1__add_canChangeOrderInTable.sql   |   6 +
 ...ttachments_mailContentWithInlineAttachments.sql |  15 +
 .../V2_4_170403_1__add_showAttachmentPreview.sql   |   5 +
 .../services/service/EmailServiceTest.java         |   2 +-
 faxtomail-ui-swing/pom.xml                         |   2 +-
 .../faxtomail/ui/swing/FaxToMailUIContext.java     |   6 +
 .../faxtomail/ui/swing/RunFaxToMail.java           |   9 +-
 .../ui/swing/actions/ShowDemandeAction.java        |  70 ++--
 .../faxtomail/ui/swing/content/MainUIHandler.java  |  13 +-
 .../content/attachment/AttachmentCellEditor.java   |  12 +-
 .../content/attachment/AttachmentCellRenderer.java |   8 -
 .../content/attachment/AttachmentEditorUI.jaxx     |  10 +-
 .../attachment/AttachmentEditorUIHandler.java      |  45 ++-
 .../attachment/AttachmentEditorUIModel.java        |  36 +-
 .../ui/swing/content/attachment/AttachmentItem.css |  11 +-
 .../swing/content/attachment/AttachmentItem.jaxx   |   8 +-
 .../content/attachment/AttachmentModelAware.java   |   4 +
 .../swing/content/attachment/ButtonAttachment.java |   9 +
 .../content/demande/DemandeListTableFilter.java    |   4 +-
 .../ui/swing/content/demande/DemandeListUI.css     |  10 +
 .../ui/swing/content/demande/DemandeListUI.jaxx    |   3 +-
 .../content/demande/DemandeListUIHandler.java      | 142 +++++--
 .../swing/content/demande/DemandeListUIModel.java  | 107 ++++-
 .../ui/swing/content/demande/DemandeUIHandler.java |  40 +-
 .../ui/swing/content/demande/DemandeUIModel.java   |  28 ++
 .../ui/swing/content/demande/DemandesUI.css        |   8 +
 .../ui/swing/content/demande/DemandesUI.jaxx       |  38 +-
 .../swing/content/demande/DemandesUIHandler.java   |  30 +-
 .../ui/swing/content/demande/DemandesUIModel.java  |  36 ++
 .../actions/ComputeQuantitiesByRangeAction.java    |  38 +-
 .../demande/actions/LoadFolderEmailsAction.java    |  32 +-
 ...yFormAction.java => OpenForwardFormAction.java} |  17 +-
 .../demande/actions/OpenReplyFormAction.java       |   1 +
 ...tion.java => SaveAndOpenForwardFormAction.java} |  17 +-
 .../actions/SaveAndOpenReplyFormAction.java        |   2 +-
 .../actions/OpenGroupedDemandAction.java           |  72 ++--
 .../demande/replies/DemandRepliesUIHandler.java    |   1 +
 .../demande/replies/actions/OpenReplyAction.java   |   5 +-
 .../content/pdfeditor/PDFEditorUIHandler.java      |   5 +-
 .../print/AttachmentToPrintChooserUIHandler.java   |  20 +-
 .../ui/swing/content/reply/ReplyFormUI.css         |  10 +-
 .../ui/swing/content/reply/ReplyFormUI.jaxx        |  33 +-
 .../ui/swing/content/reply/ReplyFormUIHandler.java |  67 +++-
 .../ui/swing/content/reply/ReplyFormUIModel.java   |  12 +
 .../content/search/SearchToGroupUIHandler.java     |   5 +
 .../ui/swing/content/search/SearchUIHandler.java   |   5 +
 .../transmit/MailFolderChooserUIHandler.java       |  16 +-
 .../util/AbstractFaxToMailDemandListHandler.java   |   9 +-
 .../ui/swing/util/AbstractFaxToMailUIHandler.java  |  43 +-
 .../swing/util/DemandeListUISwingSessionState.java |  99 +++++
 .../faxtomail/ui/swing/util/DemandeTableModel.java |  65 +--
 .../faxtomail/ui/swing/util/FaxToMailUIUtil.java   | 134 +++++--
 .../util/FilterSortableTableHeaderRenderer.java    |  97 +++++
 .../ui/swing/util/FolderTreeSwingSessionState.java | 106 +++++
 .../i18n/faxtomail-ui-swing_fr_FR.properties       |  10 +
 .../src/main/resources/icons/sort_table_asc.png    | Bin 0 -> 219 bytes
 .../src/main/resources/icons/sort_table_desc.png   | Bin 0 -> 208 bytes
 faxtomail-ui-web/pom.xml                           |   2 +-
 .../i18n/faxtomail-ui-web_fr_FR.properties         |   1 +
 .../WEB-INF/content/admin/configuration-input.jsp  | 275 +++++++++++--
 .../src/main/webapp/js/configuration.js            |  60 ++-
 pom.xml                                            |   8 +-
 90 files changed, 2069 insertions(+), 636 deletions(-)

diff --cc faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java
index 90900be,a3d0154..0e73da1

--- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java
+++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java
@@@ -410,11 -423,12 +423,17 @@@ public class EmailTopiaDao extends Abst
                  Email.PROPERTY_WAITING_STATE,
                  Email.PROPERTY_TAKEN_BY,
                  Email.PROPERTY_LAST_ATTACHMENT_OPENER,
++<<<<<<< HEAD
 +                Email.PROPERTY_LAST_PRINTING_USER
 +                ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )";
++=======
+                 Email.PROPERTY_LAST_PRINTING_USER,
+                 Email.PROPERTY_LAST_ATTACHMENT_OPENER
+                 ) + " WHERE " + EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )";
++>>>>>>> refs/heads/release/2.4
  
          // code copied from topia to perform search
-         PaginationResult<String> pageResult = findPage(hqlForFetchStep1, args, pagination);
+         PaginationResult<String> pageResult = findPage(EMAIL_IDENTIFIER, hqlForFetchStep1, args, pagination);
          List<String> step1ResultTopiaIds = pageResult.getElements();
  
          List<Email> sortedEntities;
@@@ -545,7 -595,7 +600,11 @@@
                  Email.PROPERTY_TAKEN_BY,
                  Email.PROPERTY_LAST_ATTACHMENT_OPENER,
                  Email.PROPERTY_LAST_PRINTING_USER
++<<<<<<< HEAD
 +        ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )";
++=======
+         ) + " WHERE " + EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )";
++>>>>>>> refs/heads/release/2.4
  
          if (log.isTraceEnabled()) {
              log.trace("getEmailForFolder 2 - " + hqlForFetchStep2);

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Faxtomail-commits] 02/05: bad merge?

codelutin.com scm