Author: mfortun Date: 2011-05-27 11:29:11 +0200 (Fri, 27 May 2011) New Revision: 924 Url: http://nuiton.org/repositories/revision/wikitty/924 Log: * improvement for the default value of the wikittypub name field Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-26 16:17:49 UTC (rev 923) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-27 09:29:11 UTC (rev 924) @@ -187,34 +187,39 @@ list.add(element.trim()); } - wikitty.setField(ext, fieldName, list); + value = list; + } - } else { + // TODO mfortun-2011-05-27 find a better way to do + // that ? - // TODO mfortun-2011-05-26 need to handle if - // value == null and filename == null - wikitty.setField(ext, fieldName, value); + // if extension is pub data, and the field try to + // set the name check if value is null, if so try to + // fill the name field with the file name value, if + // null, exception when try to set + if (ext.equals(WikittyPubData.EXT_WIKITTYPUBDATA) + && fieldName + .equals(WikittyPubData.FIELD_WIKITTYPUBDATA_NAME) + && value == null) { + + String extension = "." + + FileUtil.extension(uploadFileName); + String fileName = FileUtil.basename( + uploadFileName, extension); + + value = fileName; + } + wikitty.setField(ext, fieldName, value); + // si w est un WikittyPubData on essai de mettre a // jour si besoin les champs mimetype et name + // et extension if (ext.equals(WikittyPubData.EXT_WIKITTYPUBDATA) && fieldName .equals(WikittyPubData.FIELD_WIKITTYPUBDATA_CONTENT)) { - if (null == WikittyPubDataHelper - .getName(wikitty)) { - String extension = "." - + FileUtil - .extension(uploadFileName); - String fileName = FileUtil.basename( - uploadFileName, extension); - - WikittyPubDataHelper.setName(wikitty, - fileName); - - } - if (null == WikittyPubDataHelper .getFileExtension(wikitty)) { WikittyPubDataHelper.setFileExtension(