use displayname as shortcutname by default

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/model/WindowsConfig.java

@@ -1,14 +1,14 @@
 package io.github.fvarrui.javapackager.model;
 
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
+import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.UUID;
 
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.utils.ObjectUtils;
 
 /**
  * JavaPackager Windows specific configuration
@@ -337,18 +337,20 @@ public String toString() {
 	 * @param packager Packager
 	 */
 	public void setDefaults(Packager packager) {
-		this.setHeaderType(ObjectUtils.defaultIfNull(this.getHeaderType(), HeaderType.gui));
+		this.setHeaderType(defaultIfNull(this.getHeaderType(), HeaderType.gui));
 		this.setFileVersion(defaultIfBlank(this.getFileVersion(), "1.0.0.0"));
 		this.setTxtFileVersion(defaultIfBlank(this.getTxtFileVersion(), "" + packager.getVersion()));
 		this.setProductVersion(defaultIfBlank(this.getProductVersion(), "1.0.0.0"));
-		this.setShortcutName(defaultIfBlank(this.getShortcutName(), packager.getName()));
+		this.setShortcutName(defaultIfBlank(this.getShortcutName(), packager.getDisplayName()));
 		this.setTxtProductVersion(defaultIfBlank(this.getTxtProductVersion(), "" + packager.getVersion()));
 		this.setCompanyName(defaultIfBlank(this.getCompanyName(), packager.getOrganizationName()));
+		this.setTrademarks(defaultIfBlank(this.getTrademarks(), packager.getOrganizationName()));
 		this.setCopyright(defaultIfBlank(this.getCopyright(), packager.getOrganizationName()));
 		this.setFileDescription(defaultIfBlank(this.getFileDescription(), packager.getDescription()));
 		this.setProductName(defaultIfBlank(this.getProductName(), packager.getName()));
 		this.setInternalName(defaultIfBlank(this.getInternalName(), packager.getName()));
 		this.setOriginalFilename(defaultIfBlank(this.getOriginalFilename(), packager.getName() + ".exe"));
 		this.setMsiUpgradeCode(defaultIfBlank(this.getMsiUpgradeCode(), UUID.randomUUID().toString()));
 	}
+	
 }