diff --git a/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/JavaFxAntGenerator.java b/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/JavaFxAntGenerator.java index e07ee73b0273..331199b72d0d 100644 --- a/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/JavaFxAntGenerator.java +++ b/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/JavaFxAntGenerator.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.FileInputStream; @@ -111,8 +112,8 @@ public class JavaFxAntGenerator { createJarTag.add(createResourcesTag(preloaderFiles, false, allButPreloader, allButSelf, all)); - List manifestAttributes = packager.getCustomManifestAttributes(); - if (manifestAttributes != null) { + final List manifestAttributes = getManifestAttributes(packager); + if (!manifestAttributes.isEmpty()) { final SimpleTag manifestTag = new SimpleTag("manifest"); for (JavaFxManifestAttribute pair : manifestAttributes) { manifestTag.add(new SimpleTag("attribute", @@ -164,6 +165,28 @@ public class JavaFxAntGenerator { return topLevelTagsCollector; } + @NotNull + private static List getManifestAttributes(@NotNull AbstractJavaFxPackager packager) { + final List manifestAttributes = new ArrayList(); + final String title = packager.getTitle(); + if (title != null) { + manifestAttributes.add(new JavaFxManifestAttribute("Implementation-Title", title)); + } + final String version = packager.getVersion(); + if (version != null) { + manifestAttributes.add(new JavaFxManifestAttribute("Implementation-Version", version)); + } + final String vendor = packager.getVendor(); + if (vendor != null) { + manifestAttributes.add(new JavaFxManifestAttribute("Implementation-Vendor", vendor)); + } + final List customManifestAttributes = packager.getCustomManifestAttributes(); + if (customManifestAttributes != null) { + manifestAttributes.addAll(customManifestAttributes); + } + return manifestAttributes; + } + private static SimpleTag appendApplicationIconPath(List topLevelTagsCollector, JavaFxPackagerConstants.NativeBundles bundle, JavaFxApplicationIcons appIcons,