From 8b9d90df012b9561fda5142c48a5e26946401fa3 Mon Sep 17 00:00:00 2001
From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 9 May 2019 17:04:06 +0100
Subject: [PATCH] JAL-3247 JAL-3254 Ensure .jvp and .jvl appear first in File
 Associations list (visible in Windows installer)

---
 utils/install4j/auto_file_associations.pl          |   15 ++-
 .../file_associations_auto-Info_plist.xml          |   76 +++++++-------
 .../install4j/file_associations_auto-install4j.xml |  108 ++++++++++----------
 3 files changed, 103 insertions(+), 96 deletions(-)

diff --git a/utils/install4j/auto_file_associations.pl b/utils/install4j/auto_file_associations.pl
index ad08a92..e59044f 100755
--- a/utils/install4j/auto_file_associations.pl
+++ b/utils/install4j/auto_file_associations.pl
@@ -3,7 +3,7 @@
 use strict;
 
 my $fileformats = $ARGV[0];
-$fileformats = "../../src/jalview/io/FileFormats.java" unless $fileformats;
+$fileformats = "../../src/jalview/io/FileFormat.java" unless $fileformats;
 
 # default mimetype will be text/x-$shortname
 # TODO: find an actual extension for mat, see JAL-Xxxxx for outstanding issues too
@@ -38,6 +38,7 @@ my $add_associations = {
 my $add_extensions = {
   blc => ["blc"],
 };
+my @put_first = qw(jalview jvl);
 
 my $mactemplatefile = "file_associations_template-Info_plist.xml";
 my $i4jtemplatefile = "file_associations_template-install4j.xml";
@@ -94,15 +95,19 @@ while(my $line = <IN>) {
       name => $name,
       extensions => \@extensions
     };
+    warn("Adding file association for $shortname\n");
   }
 }
 close(IN);
 
 my %all_associations = (%$file_associations, %$add_associations);
 
-for my $fa (sort keys %all_associations) {
-  my $shortname = $fa;
-  my $a = $all_associations{$fa};
+for my $shortname (@put_first, sort keys %all_associations) {
+  my $a = $all_associations{$shortname};
+  if (ref($a) ne "HASH") {
+    next;
+  }
+
   my $name = $a->{name};
   my $extensions = $a->{extensions};
   my $mimetype = $mimetypes->{$shortname};
@@ -146,6 +151,8 @@ for my $fa (sort keys %all_associations) {
 
     print IA $i4jextentry;
   }
+
+  delete $all_associations{$shortname};
 }
 
 close(IA);
diff --git a/utils/install4j/file_associations_auto-Info_plist.xml b/utils/install4j/file_associations_auto-Info_plist.xml
index 8be95e6..da2633b 100644
--- a/utils/install4j/file_associations_auto-Info_plist.xml
+++ b/utils/install4j/file_associations_auto-Info_plist.xml
@@ -4,6 +4,44 @@
 <dict>
 <key>CFBundleTypeExtensions</key>
 <array>
+<string>jvp</string>
+</array>
+<key>CFBundleTypeName</key>
+<string>Jalview File</string>
+<key>CFBundleTypeIconFile</key>
+<string>Jalview-File.icns</string>
+<key>CFBundleTypeRole</key>
+<string>Editor</string>
+<key>CFBundleTypeMIMETypes</key>
+<array>
+<string>application/x-jalview+xml+zip</string>
+</array>
+<key>LSIsAppleDefaultForType</key>
+<true/>
+</dict>
+
+<dict>
+<key>CFBundleTypeExtensions</key>
+<array>
+<string>jvl</string>
+</array>
+<key>CFBundleTypeName</key>
+<string>Jalview Version Locator File</string>
+<key>CFBundleTypeIconFile</key>
+<string>Jalview-Version-Locator.icns</string>
+<key>CFBundleTypeRole</key>
+<string>Editor</string>
+<key>CFBundleTypeMIMETypes</key>
+<array>
+<string>application/x-jalview-jvl+text</string>
+</array>
+<key>LSIsAppleDefaultForType</key>
+<true/>
+</dict>
+
+<dict>
+<key>CFBundleTypeExtensions</key>
+<array>
 <string>amsa</string>
 </array>
 <key>CFBundleTypeName</key>
@@ -179,25 +217,6 @@
 <dict>
 <key>CFBundleTypeExtensions</key>
 <array>
-<string>jvp</string>
-</array>
-<key>CFBundleTypeName</key>
-<string>Jalview File</string>
-<key>CFBundleTypeIconFile</key>
-<string>Jalview-File.icns</string>
-<key>CFBundleTypeRole</key>
-<string>Editor</string>
-<key>CFBundleTypeMIMETypes</key>
-<array>
-<string>application/x-jalview+xml+zip</string>
-</array>
-<key>LSIsAppleDefaultForType</key>
-<true/>
-</dict>
-
-<dict>
-<key>CFBundleTypeExtensions</key>
-<array>
 <string>concise</string>
 <string>jnet</string>
 </array>
@@ -218,25 +237,6 @@
 <dict>
 <key>CFBundleTypeExtensions</key>
 <array>
-<string>jvl</string>
-</array>
-<key>CFBundleTypeName</key>
-<string>Jalview Version Locator File</string>
-<key>CFBundleTypeIconFile</key>
-<string>Jalview-Version-Locator.icns</string>
-<key>CFBundleTypeRole</key>
-<string>Editor</string>
-<key>CFBundleTypeMIMETypes</key>
-<array>
-<string>application/x-jalview-jvl+text</string>
-</array>
-<key>LSIsAppleDefaultForType</key>
-<true/>
-</dict>
-
-<dict>
-<key>CFBundleTypeExtensions</key>
-<array>
 <string>cif</string>
 </array>
 <key>CFBundleTypeName</key>
diff --git a/utils/install4j/file_associations_auto-install4j.xml b/utils/install4j/file_associations_auto-install4j.xml
index c7b07ee..192b5d2 100644
--- a/utils/install4j/file_associations_auto-install4j.xml
+++ b/utils/install4j/file_associations_auto-install4j.xml
@@ -1,12 +1,12 @@
-              <action name="" id="10000" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .amsa file association">
+              <action name="" id="10000" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvp file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>AMSA File</string>
+                        <string>Jalview File</string>
                       </void>
                       <void property="extension">
-                        <string>amsa</string>
+                        <string>jvp</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -33,22 +33,22 @@
                 <condition />
               </action>
 
-              <action name="" id="10001" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .annotations file association">
+              <action name="" id="10001" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvl file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Jalview Annotations File</string>
+                        <string>Jalview Version Locator File</string>
                       </void>
                       <void property="extension">
-                        <string>annotations</string>
+                        <string>jvl</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
                       </void>
                       <void property="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-File.icns</string>
+                          <string>Jalview-Version-Locator.icns</string>
                         </object>
                       </void>
                       <void property="macRole">
@@ -59,7 +59,7 @@
                       </void>
                       <void property="windowsIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-File.ico</string>
+                          <string>Jalview-Version-Locator.ico</string>
                         </object>
                       </void>
                     </object>
@@ -68,15 +68,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10002" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvannotations file association">
+              <action name="" id="10002" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .amsa file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Jalview Annotations File</string>
+                        <string>AMSA File</string>
                       </void>
                       <void property="extension">
-                        <string>jvannotations</string>
+                        <string>amsa</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -103,15 +103,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10003" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .biojson file association">
+              <action name="" id="10003" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .annotations file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>BioJSON File</string>
+                        <string>Jalview Annotations File</string>
                       </void>
                       <void property="extension">
-                        <string>biojson</string>
+                        <string>annotations</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -138,15 +138,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10004" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .BLC file association">
+              <action name="" id="10004" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvannotations file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>BLC File</string>
+                        <string>Jalview Annotations File</string>
                       </void>
                       <void property="extension">
-                        <string>BLC</string>
+                        <string>jvannotations</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -173,15 +173,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10005" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .blc file association">
+              <action name="" id="10005" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .biojson file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>BLC File</string>
+                        <string>BioJSON File</string>
                       </void>
                       <void property="extension">
-                        <string>blc</string>
+                        <string>biojson</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -208,15 +208,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10006" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .aln file association">
+              <action name="" id="10006" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .BLC file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Clustal File</string>
+                        <string>BLC File</string>
                       </void>
                       <void property="extension">
-                        <string>aln</string>
+                        <string>BLC</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -243,15 +243,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10007" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .fa file association">
+              <action name="" id="10007" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .blc file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Fasta File</string>
+                        <string>BLC File</string>
                       </void>
                       <void property="extension">
-                        <string>fa</string>
+                        <string>blc</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -278,15 +278,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10008" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .fasta file association">
+              <action name="" id="10008" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .aln file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Fasta File</string>
+                        <string>Clustal File</string>
                       </void>
                       <void property="extension">
-                        <string>fasta</string>
+                        <string>aln</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -313,15 +313,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10009" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .features file association">
+              <action name="" id="10009" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .fa file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Jalview Features File</string>
+                        <string>Fasta File</string>
                       </void>
                       <void property="extension">
-                        <string>features</string>
+                        <string>fa</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -348,15 +348,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10010" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvfeatures file association">
+              <action name="" id="10010" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .fasta file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Jalview Features File</string>
+                        <string>Fasta File</string>
                       </void>
                       <void property="extension">
-                        <string>jvfeatures</string>
+                        <string>fasta</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -383,15 +383,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10011" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .gff2 file association">
+              <action name="" id="10011" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .features file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Generic Features Format v2 File</string>
+                        <string>Jalview Features File</string>
                       </void>
                       <void property="extension">
-                        <string>gff2</string>
+                        <string>features</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -418,15 +418,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10012" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .gff3 file association">
+              <action name="" id="10012" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvfeatures file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Generic Features Format v3 File</string>
+                        <string>Jalview Features File</string>
                       </void>
                       <void property="extension">
-                        <string>gff3</string>
+                        <string>jvfeatures</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -453,15 +453,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10013" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvp file association">
+              <action name="" id="10013" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .gff2 file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Jalview File</string>
+                        <string>Generic Features Format v2 File</string>
                       </void>
                       <void property="extension">
-                        <string>jvp</string>
+                        <string>gff2</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -488,15 +488,15 @@
                 <condition />
               </action>
 
-              <action name="" id="10014" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .concise file association">
+              <action name="" id="10014" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .gff3 file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>JnetFile File</string>
+                        <string>Generic Features Format v3 File</string>
                       </void>
                       <void property="extension">
-                        <string>concise</string>
+                        <string>gff3</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -523,7 +523,7 @@
                 <condition />
               </action>
 
-              <action name="" id="10015" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jnet file association">
+              <action name="" id="10015" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .concise file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
@@ -531,7 +531,7 @@
                         <string>JnetFile File</string>
                       </void>
                       <void property="extension">
-                        <string>jnet</string>
+                        <string>concise</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
@@ -558,22 +558,22 @@
                 <condition />
               </action>
 
-              <action name="" id="10016" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvl file association">
+              <action name="" id="10016" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jnet file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
                       <void property="description">
-                        <string>Jalview Version Locator File</string>
+                        <string>JnetFile File</string>
                       </void>
                       <void property="extension">
-                        <string>jvl</string>
+                        <string>jnet</string>
                       </void>
                       <void property="launcherId">
                         <string>737</string>
                       </void>
                       <void property="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-Version-Locator.icns</string>
+                          <string>Jalview-File.icns</string>
                         </object>
                       </void>
                       <void property="macRole">
@@ -584,7 +584,7 @@
                       </void>
                       <void property="windowsIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-Version-Locator.ico</string>
+                          <string>Jalview-File.ico</string>
                         </object>
                       </void>
                     </object>
-- 
1.7.10.2