Author: echatellier Date: 2014-06-19 15:08:44 +0200 (Thu, 19 Jun 2014) New Revision: 231 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/231 Log: Fix null tab title Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 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-06-19 12:40:38 UTC (rev 230) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-06-19 13:08:44 UTC (rev 231) @@ -113,30 +113,7 @@ return DateFormat.getDateInstance(DateFormat.MEDIUM).format(bean); } }); - /*registerDecorator(new Decorator<File>(File.class) { - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - if (bean == null) { - return ""; - } - return ((File) bean).getName(); - } - });*/ - /*registerDecorator(new Decorator<AttachmentFile>(AttachmentFile.class) { - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - if (bean == null) { - return ""; - } - return ((AttachmentFile) bean).getFilename(); - } - });*/ registerMultiJXPathDecorator(HasLabel.class, "${label}$s", SEPARATOR, " - "); - //registerMultiJXPathDecorator(Attachment.class, "${originalFile}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Attachment>(Attachment.class) { private static final long serialVersionUID = 1L; 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-06-19 12:40:38 UTC (rev 230) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-19 13:08:44 UTC (rev 231) @@ -45,6 +45,7 @@ import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; import com.google.common.base.Function; import com.google.common.base.Predicate; +import com.google.common.base.Strings; import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; @@ -992,7 +993,7 @@ if (!ref.isEmpty()) { result = ref + " - " + result; } - return result; + return Strings.nullToEmpty(result); } @Override