Author: echatellier Date: 2014-08-06 10:16:34 +0200 (Wed, 06 Aug 2014) New Revision: 476 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/476 Log: Update libs. Fix build. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-08-06 06:00:57 UTC (rev 475) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-08-06 08:16:34 UTC (rev 476) @@ -49,7 +49,7 @@ import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import com.google.common.base.Charsets; import com.google.common.collect.Maps; Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-08-06 06:00:57 UTC (rev 475) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-08-06 08:16:34 UTC (rev 476) @@ -25,7 +25,6 @@ model.tagValue.constantPrefix=PROPERTY_ model.tagValue.hibernateAttributeType.java.lang.String=text model.tagValue.useEnumerationName=true -model.tagValue.doNotGenerateBooleanGetMethods=true # EtatAttente com.franciaflex.faxtomail.persistence.entities.EtatAttente.attribute.label.tagvalue.naturalId=true @@ -48,7 +47,7 @@ com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.brand.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.type.tagvalue.notNull=true -#�EdiReturn +#\u00a0EdiReturn com.franciaflex.faxtomail.persistence.entities.EdiReturn.attribute.rangeRowTopiaId.tagvalue.notNull=true # EmailAccount @@ -67,7 +66,7 @@ # AttachmentFile com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.filename.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true -# il faut mettre une valeur > � 8000 pour que la mapping g�n�re un type varbinary(max) +# il faut mettre une valeur > \u00e0 8000 pour que la mapping g\u00e9n\u00e8re un type varbinary(max) com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagValue.hibernateAttributeType=binary com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.length=9999999 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-06 06:00:57 UTC (rev 475) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-06 08:16:34 UTC (rev 476) @@ -244,7 +244,7 @@ if (attachment != null) { JLabel label = getAttachmentNameLabel(); - String actionIconName = Boolean.TRUE.equals(attachment.getAddedByUser()) ? "user" : "email"; + String actionIconName = attachment.isAddedByUser() ? "user" : "email"; Icon icon = SwingUtil.createActionIcon(actionIconName); label.setIcon(icon); } @@ -271,7 +271,7 @@ if (attachment != null) { JLabel label = attachmentItem.getAttachmentNameLabel(); - String actionIconName = Boolean.TRUE.equals(attachment.getAddedByUser()) ? "user" : "email"; + String actionIconName = attachment.isAddedByUser() ? "user" : "email"; Icon icon = SwingUtil.createActionIcon(actionIconName); label.setIcon(icon); } 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-06 06:00:57 UTC (rev 475) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-06 08:16:34 UTC (rev 476) @@ -224,14 +224,6 @@ return entity; } - public Boolean getFax() { - return editObject.getFax(); - } - - public void setFax(Boolean fax) { - editObject.setFax(fax); - } - public String getTopiaId() { return editObject.getTopiaId(); } @@ -328,7 +320,7 @@ } public void setFax(boolean fax) { - Object oldValue = isFax(); + boolean oldValue = isFax(); editObject.setFax(fax); firePropertyChanged(Email.PROPERTY_FAX, oldValue, fax); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-06 06:00:57 UTC (rev 475) +++ trunk/pom.xml 2014-08-06 08:16:34 UTC (rev 476) @@ -96,21 +96,21 @@ <!-- libraries version --> - <nuitonI18nVersion>3.2</nuitonI18nVersion> - <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> - <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonConfigVersion>3.0-alpha-4</nuitonConfigVersion> + <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-2</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-4</nuitonUtilsVersion> - <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> + <nuitonUtilsVersion>3.0-rc-5</nuitonUtilsVersion> + <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion> - <eugeneVersion>3.0-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.13</eugeneVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion> <h2Version>1.3.176</h2Version> - <jaxxVersion>2.8.7</jaxxVersion> + <jaxxVersion>2.9</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15.1</xworkVersion>