Bug fix - "Select hosted genomes" did not download.

igvteam · Feb 10, 2025 · 066f3af · 066f3af
1 parent eb810fb
commit 066f3af
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/src/main/java/org/broad/igv/ucsc/hub/Hub.java b/src/main/java/org/broad/igv/ucsc/hub/Hub.java
@@ -125,9 +125,6 @@ public GenomeConfig getGenomeConfig() {
         if (genomeStanza.hasProperty("chromAliasBb")) {
             config.setChromAliasBbURL(genomeStanza.getProperty("chromAliasBb"));
         }
-        if (genomeStanza.hasProperty("twoBitBptURL")) {
-            config.setTwoBitBptURL(genomeStanza.getProperty("twoBitBptURL"));
-        }
         if (genomeStanza.hasProperty("twoBitBptUrl")) {
             config.setTwoBitBptURL(genomeStanza.getProperty("twoBitBptUrl"));
         }

diff --git a/src/main/java/org/broad/igv/ui/IGVMenuBar.java b/src/main/java/org/broad/igv/ui/IGVMenuBar.java
@@ -307,7 +307,6 @@ JMenu createFileMenu(Genome genome) {
         // Track hubs
         if (genome.getTrackHubs().size() > 0) {
             menuItems.add(new JSeparator());
-            menuItems.add(new JLabel("Track Hubs"));
             for (Hub trackHub : genome.getTrackHubs()) {
                 menuAction = new SelectHubTracksAction(trackHub.getShortLabel(), igv, trackHub);
                 menuAction.setToolTipText(trackHub.getLongLabel());
@@ -441,8 +440,8 @@ private JMenu createGenomesMenu() {
 
         JMenu menu = new JMenu("Genomes");
 
-        loadGenomeFromServerMenuItem = new JMenuItem("Select Hosted Genome...");
-        loadGenomeFromServerMenuItem.addActionListener(e -> HostedGenomeSelectionDialog.selectHostedGenome());
+        loadGenomeFromServerMenuItem = new JMenuItem("Download Hosted Genome...");
+        loadGenomeFromServerMenuItem.addActionListener(e -> HostedGenomeSelectionDialog.downloadHostedGenome());
         loadGenomeFromServerMenuItem.setToolTipText(LOAD_GENOME_SERVER_TOOLTIP);
         menu.add(loadGenomeFromServerMenuItem);
 

diff --git a/src/main/java/org/broad/igv/ui/commandbar/GenomeComboBox.java b/src/main/java/org/broad/igv/ui/commandbar/GenomeComboBox.java
@@ -96,7 +96,7 @@ public void actionPerformed(ActionEvent actionEvent) {
                 if (genomeListItem != null && genomeListItem.getPath() != null) {
 
                     if (genomeListItem == GenomeListItem.DOWNLOAD_ITEM) {
-                        HostedGenomeSelectionDialog.selectHostedGenome();
+                        HostedGenomeSelectionDialog.downloadHostedGenome();
                     } else {
 
                         try {

diff --git a/src/main/java/org/broad/igv/ui/commandbar/HostedGenomeSelectionDialog.java b/src/main/java/org/broad/igv/ui/commandbar/HostedGenomeSelectionDialog.java
@@ -88,7 +88,7 @@ public class HostedGenomeSelectionDialog extends org.broad.igv.ui.IGVDialog {
      * Open a selection list to load a genome from the server.   This method is static because its used by multiple
      * UI elements  (menu bar and genome selection pulldown).
      */
-    public static void selectHostedGenome() {
+    public static void downloadHostedGenome() {
 
         Runnable showDialog = () -> {
 
@@ -109,11 +109,7 @@ public static void selectHostedGenome() {
                 boolean downloadSequence = dialog.isDownloadSequence();
                 boolean downloadAnnotations = dialog.isDownloadAnnotations();
 
-                File downloadPath = null;
-                if (downloadSequence || downloadAnnotations || selectedItem.getPath().endsWith(".genome")) {
-                    downloadPath = GenomeManager.getInstance().downloadGenome(selectedItem, downloadSequence, downloadAnnotations);
-                }
-
+                File downloadPath = GenomeManager.getInstance().downloadGenome(selectedItem, downloadSequence, downloadAnnotations);
 
                 try {
                     if (downloadPath != null) {