From fd2070e8a14d4b604dbfaaea3a5adaf4bb5a850e Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 7 Dec 2021 12:39:06 +0000
Subject: [PATCH] JAL-3930 Added a customizedId="JALVIEW" to launcher for use
 by file associations. Better for response.varfile
 installation of Jalview

---
 .../file_associations_auto-install4j8.xml          |   50 ++++++++++----------
 .../file_associations_template-install4j8.xml      |    2 +-
 utils/install4j/install4j8_template.install4j      |    8 ++--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/utils/install4j/file_associations_auto-install4j8.xml b/utils/install4j/file_associations_auto-install4j8.xml
index 0d80644..a4bdc49 100644
--- a/utils/install4j/file_associations_auto-install4j8.xml
+++ b/utils/install4j/file_associations_auto-install4j8.xml
@@ -18,7 +18,7 @@
                     <serializedBean>
                       <property name="description" type="string">Jalview File</property>
                       <property name="extension" type="string">jvp</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -63,7 +63,7 @@
                     <serializedBean>
                       <property name="description" type="string">Jalview Launch File</property>
                       <property name="extension" type="string">jvl</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-Launch.icns</string>
@@ -108,7 +108,7 @@
                     <serializedBean>
                       <property name="description" type="string">CIF File</property>
                       <property name="extension" type="string">cif</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -153,7 +153,7 @@
                     <serializedBean>
                       <property name="description" type="string">mmCIF File</property>
                       <property name="extension" type="string">mcif,mmcif</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -198,7 +198,7 @@
                     <serializedBean>
                       <property name="description" type="string">PDB File</property>
                       <property name="extension" type="string">ent,pdb</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -243,7 +243,7 @@
                     <serializedBean>
                       <property name="description" type="string">AMSA File</property>
                       <property name="extension" type="string">amsa</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -288,7 +288,7 @@
                     <serializedBean>
                       <property name="description" type="string">Jalview Annotations File</property>
                       <property name="extension" type="string">annotations,jvannotations</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -333,7 +333,7 @@
                     <serializedBean>
                       <property name="description" type="string">BioJSON File</property>
                       <property name="extension" type="string">biojson</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -378,7 +378,7 @@
                     <serializedBean>
                       <property name="description" type="string">BLC File</property>
                       <property name="extension" type="string">blc</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -423,7 +423,7 @@
                     <serializedBean>
                       <property name="description" type="string">Clustal File</property>
                       <property name="extension" type="string">aln</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -468,7 +468,7 @@
                     <serializedBean>
                       <property name="description" type="string">ENA Flatfile File</property>
                       <property name="extension" type="string">txt</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -513,7 +513,7 @@
                     <serializedBean>
                       <property name="description" type="string">Fasta File</property>
                       <property name="extension" type="string">fa,fasta</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -558,7 +558,7 @@
                     <serializedBean>
                       <property name="description" type="string">Jalview Features File</property>
                       <property name="extension" type="string">features,jvfeatures</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -603,7 +603,7 @@
                     <serializedBean>
                       <property name="description" type="string">GenBank Flatfile File</property>
                       <property name="extension" type="string">gb,gbk</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -648,7 +648,7 @@
                     <serializedBean>
                       <property name="description" type="string">Generic Features Format v2 File</property>
                       <property name="extension" type="string">gff2</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -693,7 +693,7 @@
                     <serializedBean>
                       <property name="description" type="string">Generic Features Format v3 File</property>
                       <property name="extension" type="string">gff3</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -738,7 +738,7 @@
                     <serializedBean>
                       <property name="description" type="string">JnetFile File</property>
                       <property name="extension" type="string">concise,jnet</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -783,7 +783,7 @@
                     <serializedBean>
                       <property name="description" type="string">MSF File</property>
                       <property name="extension" type="string">msf</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -828,7 +828,7 @@
                     <serializedBean>
                       <property name="description" type="string">PFAM File</property>
                       <property name="extension" type="string">pfam</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -873,7 +873,7 @@
                     <serializedBean>
                       <property name="description" type="string">PHYLIP File</property>
                       <property name="extension" type="string">phy</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -918,7 +918,7 @@
                     <serializedBean>
                       <property name="description" type="string">PileUp File</property>
                       <property name="extension" type="string">pileup</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -963,7 +963,7 @@
                     <serializedBean>
                       <property name="description" type="string">PIR File</property>
                       <property name="extension" type="string">pir</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -1008,7 +1008,7 @@
                     <serializedBean>
                       <property name="description" type="string">RNAML File</property>
                       <property name="extension" type="string">rnaml</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -1053,7 +1053,7 @@
                     <serializedBean>
                       <property name="description" type="string">Substitution Matrix File</property>
                       <property name="extension" type="string">mat</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
@@ -1098,7 +1098,7 @@
                     <serializedBean>
                       <property name="description" type="string">Stockholm File</property>
                       <property name="extension" type="string">stk,sto</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>Jalview-File.icns</string>
diff --git a/utils/install4j/file_associations_template-install4j8.xml b/utils/install4j/file_associations_template-install4j8.xml
index 5a311f1..c8e94a1 100644
--- a/utils/install4j/file_associations_template-install4j8.xml
+++ b/utils/install4j/file_associations_template-install4j8.xml
@@ -18,7 +18,7 @@
                     <serializedBean>
                       <property name="description" type="string">$$NAME$$ File</property>
                       <property name="extension" type="string">$$EXTENSION$$</property>
-                      <property name="launcherId" type="string">737</property>
+                      <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>$$ICONFILE$$.icns</string>
diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index a14900c..b0828eb 100644
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -145,7 +145,7 @@
     </components>
   </files>
   <launchers>
-    <launcher name="Jalview Launcher" id="737" menuName="${compiler:JALVIEW_APPLICATION_NAME}" icnsFile="${compiler:JALVIEW_DIR}/${compiler:MAC_ICONS_FILE}" customMacBundleIdentifier="true" macBundleIdentifier="${compiler:BUNDLE_ID}" fileset="734" useCustomMacosExecutableName="true" customMacosExecutableName="${compiler:JALVIEW_APPLICATION_NAME}">
+    <launcher name="Jalview Launcher" id="737" customizedId="JALVIEW" menuName="${compiler:JALVIEW_APPLICATION_NAME}" icnsFile="${compiler:JALVIEW_DIR}/${compiler:MAC_ICONS_FILE}" customMacBundleIdentifier="true" macBundleIdentifier="${compiler:BUNDLE_ID}" fileset="734" useCustomMacosExecutableName="true" customMacosExecutableName="${compiler:JALVIEW_APPLICATION_NAME}">
       <executable name="${compiler:EXECUTABLE_NAME}" iconSet="true" iconFile="${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE}" redirectStdout="true" executableMode="gui" changeWorkingDirectory="false" singleInstance="true" checkConsoleParameter="true">
         <versionInfo include="true" fileDescription="${compiler:sys.fullName}" legalCopyright="${compiler:COPYRIGHT_MESSAGE}" internalName="${compiler:INTERNAL_ID}" productName="${compiler:sys.fullName}" />
       </executable>
@@ -533,19 +533,19 @@ return console.askOkCancel(message, true);
               </group>
               <action id="2350" beanClass="com.install4j.runtime.beans.actions.desktop.UrlHandlerAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="launcherId" type="string">737</property>
+                  <property name="launcherId" type="string">JALVIEW</property>
                   <property name="scheme" type="string">jalview</property>
                 </serializedBean>
               </action>
               <action id="2450" beanClass="com.install4j.runtime.beans.actions.desktop.UrlHandlerAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="launcherId" type="string">737</property>
+                  <property name="launcherId" type="string">JALVIEW</property>
                   <property name="scheme" type="string">jalviews</property>
                 </serializedBean>
               </action>
               <action id="2641" beanClass="com.install4j.runtime.beans.actions.desktop.UrlHandlerAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="launcherId" type="string">737</property>
+                  <property name="launcherId" type="string">JALVIEW</property>
                   <property name="scheme" type="string">${compiler:EXTRA_SCHEME}</property>
                 </serializedBean>
               </action>
-- 
1.7.10.2