- Faxtomail-commits - mailman.cloud.codelutin.com

r564 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: kmorin Date: 2014-08-14 17:25:29 +0200 (Thu, 14 Aug 2014) New Revision: 564 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/564 Log: fixes #5380 La taille de la police est mauvaise quand on g?\195?\169n?\195?\168re apr?\195?\168s un zoom fix lazy Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-14 15:25:29 UTC (rev 564) @@ -367,7 +367,7 @@ String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query.toString(); String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( 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/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 15:25:29 UTC (rev 564) @@ -125,7 +125,8 @@ cb.saveState(); JTextArea textArea = note.getNoteText(); float fontSize = textArea.getFont().getSize2D() / zoom; - BaseFont font = BaseFont.createFont(BaseFont.HELVETICA_OBLIQUE, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); + BaseFont titleFont = BaseFont.createFont(BaseFont.HELVETICA_OBLIQUE, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); + BaseFont font = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); String text = note.getText(); String[] rows = text.split("\n"); @@ -150,7 +151,7 @@ yyy += height - insets.top / zoom; } - showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, font, fontSize); + showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, titleFont, fontSize); for (String s : rows) { if (s.isEmpty()) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -30,9 +30,10 @@ } #removeButton { - text: "X"; - //borderPainted: { false }; - //border: { null }; - //opaque : { false }; - //background: { null }; + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -29,9 +29,10 @@ } #removeButton { - text: "X"; - //borderPainted: { false }; - //border: { null }; - //opaque : { false }; - //background: { null }; + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -29,9 +29,10 @@ } #removeButton { - text: "X"; - //borderPainted: { false }; - //border: { null }; - //opaque : { false }; - //background: { null }; + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -32,16 +32,17 @@ #noteTitle { font: { Font.decode(BaseFont.HELVETICA).deriveFont(Font.ITALIC) }; - font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom()) }; text: { getTitle() }; } #removeButton { - text: "X"; - /*borderPainted: { false }; - border: { null }; - opaque : { false }; - background: { null }; */ + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } #noteText { @@ -49,7 +50,7 @@ opaque : { false }; background: { null }; font: { Font.decode(BaseFont.HELVETICA) }; - font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom()) }; lineWrap: { false }; wrapStyleWord: { false }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 15:25:29 UTC (rev 564) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id='notePanel' layout='{new BorderLayout()}'> +<JPanel id='notePanel' layout='{new BorderLayout()}' onComponentResized="pack()"> <import> java.awt.Color @@ -41,13 +41,18 @@ protected void textTyped() { setText(getNoteText().getText()); + pack(); + } + protected void pack() { JPanel container = getParentContainer(JPanel.class); Point location = getLocation(); - Insets insets = container.getInsets(); + Insets containerInsets = container.getInsets(); Dimension size = getPreferredSize(); - setBounds(location.x + insets.left, location.y + insets.top, - size.width, size.height); + setBounds(location.x + containerInsets.left, + location.y + containerInsets.top, + size.width + 10, // no real logical reason for 10, but otherwise, the text is sometimes cut in the end + size.height); } protected void removeNote() { @@ -60,7 +65,6 @@ <String id="title" javaBean="null"/> <String id="text" javaBean=""/> - <Float id="originalZoom" javaBean="1.0f"/> <Float id="zoom" javaBean="1.0f"/> <JPanel id="noteHeader" @@ -75,6 +79,6 @@ <JTextArea id="noteText" constraints="BorderLayout.CENTER" - onKeyTyped="textTyped()"/> + onKeyReleased="textTyped()"/> </JPanel> \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 15:25:29 UTC (rev 564) @@ -291,7 +291,6 @@ public void addNote(int x, int y) { PDFEditorNoteUI note = new PDFEditorNoteUI(); - note.setOriginalZoom(getModel().getZoom()); note.setZoom(getModel().getZoom()); String title = decorate(new Date()) + " - " + getContext().getCurrentUser().getTrigraph(); note.setTitle(title); @@ -587,13 +586,13 @@ public void zoomOut() { PDFEditorUIModel model = getModel(); float zoom = model.getZoom(); - model.setZoom(zoom - 0.25f); + model.setZoom(zoom - 0.5f); } public void zoomIn() { PDFEditorUIModel model = getModel(); float zoom = model.getZoom(); - model.setZoom(zoom + 0.25f); + model.setZoom(zoom + 0.5f); } public void rotateClockwise() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-08-14 15:25:29 UTC (rev 564) @@ -236,7 +236,7 @@ } public void setZoom(float zoom) { - if (zoom > 0) { + if (zoom >= 1f && zoom <= 15f) { Object oldValue = getZoom(); this.zoom = zoom; firePropertyChanged(PROPERTY_ZOOM, oldValue, zoom); Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 15:25:29 UTC (rev 564) @@ -1,3 +1,4 @@ +\ X\ = \ |\ = /= \:=

1 0

r563 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: kmorin Date: 2014-08-14 15:16:09 +0200 (Thu, 14 Aug 2014) New Revision: 563 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/563 Log: correction fermeture onglet appelle closeui Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-14 13:15:53 UTC (rev 562) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-14 13:16:09 UTC (rev 563) @@ -514,7 +514,6 @@ @Override public boolean onHideTab(int currentIndex, int newIndex) { closeButtonPopups(); - onCloseUI(); return true; } @@ -524,6 +523,10 @@ @Override public boolean onRemoveTab() { - return quitUI(); + boolean result = quitUI(); + if (result) { + onCloseUI(); + } + return result; } }

1 0

r562 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: echatellier Date: 2014-08-14 15:15:53 +0200 (Thu, 14 Aug 2014) New Revision: 562 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/562 Log: Correction du d?\195?\169verrouillage des demandes non group?\195?\169es Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.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 12:28:57 UTC (rev 561) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-14 13:15:53 UTC (rev 562) @@ -722,19 +722,18 @@ // if no lock found, create new one if (mailLock == null) { - mailLock = new MailLockImpl(); - mailLock.setLockBy(currentUser); - mailLock.setLockOn(email); - mailLock = mailLockDao.create(mailLock); - - if (log.isDebugEnabled()) { - log.debug("[LOCK] " + emailId + " locked by " + currentUser.getLogin()); - } - + // dévérouillage automatique des mails qui ne font pas partit du même group que celui du mail // qui vient d'être locké - List<MailLock> mailLocksToRemove = mailLockDao.forLockByEquals(currentUser) - .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()).findAll(); + List<MailLock> mailLocksToRemove; + if (email.getEmailGroup() != null) { + // si le mail courant à un group, ont déverrouilles tous les mails + // qui ne porte pas sur le même groupe + mailLocksToRemove = mailLockDao.forLockByEquals(currentUser) + .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()).findAll(); + } else { + mailLocksToRemove = mailLockDao.forLockByEquals(currentUser).findAll(); + } if (log.isDebugEnabled()) { for (MailLock mailLockToRemove : mailLocksToRemove) { log.debug("[UNLOCK] " + mailLockToRemove.getLockOn().getTopiaId() + " unlocked (automatic)"); @@ -742,6 +741,16 @@ } mailLockDao.deleteAll(mailLocksToRemove); + // ajout d'un nouveau lock + mailLock = new MailLockImpl(); + mailLock.setLockBy(currentUser); + mailLock.setLockOn(email); + mailLock = mailLockDao.create(mailLock); + + if (log.isDebugEnabled()) { + log.debug("[LOCK] " + emailId + " locked by " + currentUser.getLogin()); + } + getPersistenceContext().commit(); } else if (!mailLock.getLockBy().equals(currentUser)) {

1 0

r561 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/content/attachment java/com/franciaflex/faxtomail/ui/swing/content/demande resources/i18n resources/icons
by echatellier＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: echatellier Date: 2014-08-14 14:28:57 +0200 (Thu, 14 Aug 2014) New Revision: 561 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/561 Log: Ajout d'une icone diff?\195?\169rente pour l'icone d'ouverture de la PJ edit?\195?\169e Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-08-14 12:28:57 UTC (rev 561) @@ -43,9 +43,16 @@ actionIcon: "edit"; toolTipText: "faxtomail.attachmentEditor.action.edit.tip"; enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; - // visible: { isEditable() }; + visible: { isEditable() }; } +#openEditedAttachmentButton { + actionIcon: "folder_edit"; + toolTipText: "faxtomail.attachmentEditor.action.openedited.tip"; + enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; + visible: { !isEditable() }; +} + #removeAttachmentButton { actionIcon: "delete"; toolTipText: "faxtomail.attachmentEditor.action.remove.tip"; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-08-14 12:28:57 UTC (rev 561) @@ -40,6 +40,8 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openAttachmentButton' onActionPerformed='handler.openAttachment(attachment)'/> + <JButton id='openEditedAttachmentButton' + onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='editAttachmentButton' onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='removeAttachmentButton' Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-08-14 12:28:57 UTC (rev 561) @@ -27,7 +27,6 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import java.io.Serializable; -import java.util.Collection; import java.util.List; /** @@ -39,12 +38,6 @@ String PROPERTY_ATTACHMENT = "attachment"; - String PROPERTY_OBJECT_ID = "objectId"; - -// AttachementObjectTypeEnum getObjectType(); - -// Integer getObjectId(); - List<Attachment> getAttachment(); void addAllAttachment(List<Attachment> attachments); 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 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 12:28:57 UTC (rev 561) @@ -47,7 +47,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -72,7 +71,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Set; Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 12:28:57 UTC (rev 561) @@ -42,6 +42,7 @@ faxtomail.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes faxtomail.attachmentEditor.action.edit.tip=Editer la pièce jointe faxtomail.attachmentEditor.action.open.tip=Ouvrir la pièce jointe +faxtomail.attachmentEditor.action.openedited.tip=Ouvrir la pièce jointe éditée faxtomail.attachmentEditor.action.remove.tip=Supprimer la pièce jointe faxtomail.attachmentEditor.action.tip=Pièces jointes faxtomail.attachmentEditor.attachments.empty=Aucune pièce jointe Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r560 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: kmorin Date: 2014-08-14 14:11:12 +0200 (Thu, 14 Aug 2014) New Revision: 560 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/560 Log: correction d?\195?\169tection de modif d'une pj Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-14 10:49:00 UTC (rev 559) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-14 12:11:12 UTC (rev 560) @@ -446,10 +446,9 @@ @Override public boolean quitUI() { - BeanMonitor monitor = getMonitor(); boolean result = quitScreen2( true, - monitor.wasModified(), + getModel().isModify(), t("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave"), t("faxtomail.demande.askSaveBeforeLeaving.save"), getContext().getActionFactory().createLogicAction(this, SaveDemandeAction.class)

1 0

r559 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/attachment content/pdfeditor
by kmorin＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: kmorin Date: 2014-08-14 12:49:00 +0200 (Thu, 14 Aug 2014) New Revision: 559 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/559 Log: refs #5380 La taille de la police est mauvaise quand on g?\195?\169n?\195?\168re apr?\195?\168s un zoom fix lazy Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 10:49:00 UTC (rev 559) @@ -129,25 +129,25 @@ String text = note.getText(); String[] rows = text.split("\n"); - int rowHeight = textArea.getHeight() / rows.length; + int rowHeight = (int) ((textArea.getHeight() / rows.length) / zoom); int xxx = x; int yyy = y; if (rotation == 0) { xxx += insets.left; - yyy += height - rowHeight - insets.top; + yyy += height - rowHeight - insets.top / zoom; } else if (rotation == 90) { - xxx += rowHeight + insets.top; + xxx += rowHeight + insets.top / zoom; yyy += insets.left; } else if (rotation == 180) { - xxx += width - insets.right; - yyy += rowHeight - insets.top; + xxx += width - insets.right / zoom; + yyy += rowHeight - insets.top / zoom; } else if (rotation == 270) { - xxx += width - rowHeight - insets.left; - yyy += height - insets.top; + xxx += width - rowHeight - insets.left / zoom; + yyy += height - insets.top / zoom; } showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, font, fontSize); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-14 10:49:00 UTC (rev 559) @@ -30,13 +30,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Set; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-14 10:49:00 UTC (rev 559) @@ -34,6 +34,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; @@ -121,7 +122,7 @@ context.getCurrentUser(), new Date(), filename); - model.fromEntity(email); + model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); } } @@ -134,7 +135,7 @@ context.getCurrentUser(), new Date(), FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFileName())); - model.fromEntity(email); + model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); } }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 10:49:00 UTC (rev 559) @@ -32,7 +32,7 @@ #noteTitle { font: { Font.decode(BaseFont.HELVETICA).deriveFont(Font.ITALIC) }; - font-size: { (int)(DEFAULT_FONT_SIZE * getZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; text: { getTitle() }; } @@ -49,7 +49,7 @@ opaque : { false }; background: { null }; font: { Font.decode(BaseFont.HELVETICA) }; - font-size: { (int)(DEFAULT_FONT_SIZE * getZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; lineWrap: { false }; wrapStyleWord: { false }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 10:49:00 UTC (rev 559) @@ -60,6 +60,7 @@ <String id="title" javaBean="null"/> <String id="text" javaBean=""/> + <Float id="originalZoom" javaBean="1.0f"/> <Float id="zoom" javaBean="1.0f"/> <JPanel id="noteHeader" Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 10:49:00 UTC (rev 559) @@ -30,6 +30,8 @@ import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; import java.awt.geom.Rectangle2D; import java.awt.image.RenderedImage; import java.beans.PropertyChangeEvent; @@ -289,6 +291,8 @@ public void addNote(int x, int y) { PDFEditorNoteUI note = new PDFEditorNoteUI(); + note.setOriginalZoom(getModel().getZoom()); + note.setZoom(getModel().getZoom()); String title = decorate(new Date()) + " - " + getContext().getCurrentUser().getTrigraph(); note.setTitle(title); addPanel(note, x, y);

1 0

r558 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

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(); }

1 0

r557 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit
by echatellier＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: echatellier Date: 2014-08-14 10:27:36 +0200 (Thu, 14 Aug 2014) New Revision: 557 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/557 Log: Retrait total de la gestion des types de demande pour le d?\195?\169placement Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-08-14 08:22:58 UTC (rev 556) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-08-14 08:27:36 UTC (rev 557) @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; -import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; @@ -56,7 +55,7 @@ List<MailFolder> getMailFolders(Collection<String> ids); - Collection<MailFolder> getFoldersWithEtatAttenteAndDemandType(Set<EtatAttente> etatAttentes, Set<DemandType> demandTypes); + Collection<MailFolder> getFoldersWithEtatAttente(Set<EtatAttente> etatAttentes); Map<String, Long> getMailFoldersUsage(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-08-14 08:22:58 UTC (rev 556) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-08-14 08:27:36 UTC (rev 557) @@ -246,11 +246,10 @@ } /** - * Retourne les dossiers qui ont l'ensemble des etats d'attente et l'ensemble des types de - * demande compatible avec ceux en argument. + * Retourne les dossiers qui ont l'ensemble des etats d'attente compatible avec ceux en argument. */ @Override - public Set<MailFolder> getFoldersWithEtatAttenteAndDemandType(Set<EtatAttente> requiredEtatAttentes, Set<DemandType> requiredDemandTypes) { + public Set<MailFolder> getFoldersWithEtatAttente(Set<EtatAttente> requiredEtatAttentes) { Set<MailFolder> result = new HashSet<>(); MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); @@ -258,7 +257,7 @@ for (MailFolder root : roots) { Collection<MailFolder> mailFolders = getFoldersWithEtatAttente(root, new HashSet<EtatAttente>(), - new HashSet<DemandType>(), requiredEtatAttentes, requiredDemandTypes); + new HashSet<DemandType>(), requiredEtatAttentes); result.addAll(mailFolders); } @@ -268,8 +267,7 @@ protected Collection<MailFolder> getFoldersWithEtatAttente(MailFolder folder, Collection<EtatAttente> parentEtatAttente, Collection<DemandType> parentDemandType, - Set<EtatAttente> requiredEtatAttentes, - Set<DemandType> requiredDemandTypes) { + Set<EtatAttente> requiredEtatAttentes) { Collection<EtatAttente> etatAttentes = folder.getEtatAttentes(); if (CollectionUtils.isEmpty(etatAttentes)) { etatAttentes = parentEtatAttente; @@ -289,23 +287,16 @@ if (children != null) { for (MailFolder child : children) { Collection<MailFolder> subMailFolders = getFoldersWithEtatAttente(child, - parentEtatAttente, parentDemandType, requiredEtatAttentes, requiredDemandTypes); + parentEtatAttente, parentDemandType, requiredEtatAttentes); result.addAll(subMailFolders); } } // pour qu'un dossier soit sélectionné il faut que les dossiers ait des etat d'attentes (ou ses parents) // que les etats d'attente requis ne soit pas vide - // ET - // qu'un dossier ait des types de demandes et que les types de demande requis ne soit pas - // vide if ((CollectionUtils.isEmpty(etatAttentes) || CollectionUtils.isEmpty(requiredEtatAttentes) || - etatAttentes.containsAll(requiredEtatAttentes)) - && - CollectionUtils.isEmpty(demandTypes) || - CollectionUtils.isEmpty(requiredDemandTypes) || - demandTypes.containsAll(requiredDemandTypes)) { + etatAttentes.containsAll(requiredEtatAttentes))) { result.add(folder); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-08-14 08:22:58 UTC (rev 556) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-08-14 08:27:36 UTC (rev 557) @@ -72,7 +72,6 @@ // on recupere seulement les dossiers qui accepte l'ensemble des états d'attentes de l'ensemble des demandes Set<EtatAttente> allEtatsAttentes = new HashSet<EtatAttente>(); - Set<DemandType> allDemandTypes = new HashSet<DemandType>(); for (DemandeUIModel demande : model.getDemandeUIModels()) { if (demande.getEtatAttente() != null) { allEtatsAttentes.add(demande.getEtatAttente()); @@ -83,8 +82,8 @@ Collection<MailFolder> foldersWithEtatAttente = null; // foldersWithEtatAttente reste à null dans le cas ou l'arbre ne doit pas être filtré // sinon l'appel peut renvoyer une liste de vide dans le cas où aucun dossier n'est selectionnable - if (!allEtatsAttentes.isEmpty() || !allDemandTypes.isEmpty()) { - foldersWithEtatAttente = serviceContext.getMailFolderService().getFoldersWithEtatAttenteAndDemandType(allEtatsAttentes, allDemandTypes); + if (!allEtatsAttentes.isEmpty()) { + foldersWithEtatAttente = serviceContext.getMailFolderService().getFoldersWithEtatAttente(allEtatsAttentes); } // init tree

1 0

r556 - trunk/faxtomail-ui-swing/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: echatellier Date: 2014-08-14 10:22:58 +0200 (Thu, 14 Aug 2014) New Revision: 556 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/556 Log: Fix i18n Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 07:35:48 UTC (rev 555) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 08:22:58 UTC (rev 556) @@ -249,7 +249,7 @@ faxtomail.reply.attachment.label=%1$s (%2$s ko) faxtomail.reply.attachments.add.label=Ajouter des pièces jointes faxtomail.reply.attachments.title=Pièces-jointes (%1$s / %2$s ko autorisés) -faxtomail.reply.forward=Tranfer de la réponse \: %s +faxtomail.reply.forward=Transfert de la réponse \: %s faxtomail.reply.forwardsubject=Tr\: %s faxtomail.reply.label.cc=Copie \: faxtomail.reply.label.cci=Copie cachée \:

1 0

r555 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions faxtomail-service/src/main/resources/db/migration/h2 faxtomail-service/src/main/resources/db/migration/postgres faxtomail-service/src/main/resources/db/migration/sq
by echatellier＠users.forge.codelutin.com Aug. 14, 2014

Aug. 14, 2014

Author: echatellier Date: 2014-08-14 09:35:48 +0200 (Thu, 14 Aug 2014) New Revision: 555 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/555 Log: Add svn keywords Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_442__move_object_to_folder_configuration.sql trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_448__add_mail_folder_level_configuration.sql trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_454__add_ldap_config.sql trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_520__add_performance_indexes.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_442__move_object_to_folder_configuration.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_448__add_mail_folder_level_configuration.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_454__add_ldap_config.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_520__add_performance_indexes.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_442__move_object_to_folder_configuration.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_448__add_mail_folder_level_configuration.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_454__add_ldap_config.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_520__add_performance_indexes.sql trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java trunk/faxtomail-service/src/test/resources/archives/archives.csv trunk/faxtomail-service/src/test/resources/archives/att1.txt trunk/faxtomail-service/src/test/resources/archives/att2.txt trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/resources/icons/action-hline.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-vline.png trunk/faxtomail-ui-web/src/main/webapp/js/select2.js Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_442__move_object_to_folder_configuration.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_448__add_mail_folder_level_configuration.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_454__add_ldap_config.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/h2/V1_0_0_520__add_performance_indexes.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_442__move_object_to_folder_configuration.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_448__add_mail_folder_level_configuration.sql ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_454__add_ldap_config.sql ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/postgres/V1_0_0_520__add_performance_indexes.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_442__move_object_to_folder_configuration.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_448__add_mail_folder_level_configuration.sql ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_454__add_ldap_config.sql ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_0_0_520__add_performance_indexes.sql ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id: AbstractFaxToMailServiceTest.java 477 2014-08-06 08:46:09Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-service/src/test/java/c… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/archives/archives.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/archives/att1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/archives/att2.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.services.service.EmailService; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; import org.nuiton.jaxx.application.swing.ApplicationUI; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java 2014-08-13 17:19:46 UTC (rev 554) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java 2014-08-14 07:35:48 UTC (rev 555) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-hline.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-vline.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/select2.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0