git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'releases/Release_2_10_0_Branch'
[jalview.git]
/
src
/
jalview
/
gui
/
StructureChooser.java
diff --git
a/src/jalview/gui/StructureChooser.java
b/src/jalview/gui/StructureChooser.java
index
014a8a5
..
9c9cd1d
100644
(file)
--- a/
src/jalview/gui/StructureChooser.java
+++ b/
src/jalview/gui/StructureChooser.java
@@
-81,6
+81,8
@@
public class StructureChooser extends GStructureChooser implements
private boolean isValidPBDEntry;
private boolean isValidPBDEntry;
+ private boolean cachedPDBExists;
+
public StructureChooser(SequenceI[] selectedSeqs, SequenceI selectedSeq,
AlignmentPanel ap)
{
public StructureChooser(SequenceI[] selectedSeqs, SequenceI selectedSeq,
AlignmentPanel ap)
{
@@
-102,7
+104,7
@@
public class StructureChooser extends GStructureChooser implements
}
// ensure a filter option is in force for search
}
// ensure a filter option is in force for search
- populateFilterComboBox(true);
+ populateFilterComboBox(true, cachedPDBExists);
Thread discoverPDBStructuresThread = new Thread(new Runnable()
{
@Override
Thread discoverPDBStructuresThread = new Thread(new Runnable()
{
@Override
@@
-118,7
+120,7
@@
public class StructureChooser extends GStructureChooser implements
startTime);
fetchStructuresMetaData();
// revise filter options if no results were found
startTime);
fetchStructuresMetaData();
// revise filter options if no results were found
- populateFilterComboBox(isStructuresDiscovered());
+ populateFilterComboBox(isStructuresDiscovered(), cachedPDBExists);
updateProgressIndicator(null, startTime);
mainFrame.setVisible(true);
updateCurrentView();
updateProgressIndicator(null, startTime);
mainFrame.setVisible(true);
updateCurrentView();
@@
-237,7
+239,7
@@
public class StructureChooser extends GStructureChooser implements
}
}
}
}
}
}
-
+ cachedPDBExists = !entries.isEmpty();
PDBEntryTableModel tableModelx = new PDBEntryTableModel(entries);
tbl_local_pdb.setModel(tableModelx);
}
PDBEntryTableModel tableModelx = new PDBEntryTableModel(entries);
tbl_local_pdb.setModel(tableModelx);
}
@@
-524,7
+526,8
@@
public class StructureChooser extends GStructureChooser implements
* Populates the filter combo-box options dynamically depending on discovered
* structures
*/
* Populates the filter combo-box options dynamically depending on discovered
* structures
*/
- protected void populateFilterComboBox(boolean haveData)
+ protected void populateFilterComboBox(boolean haveData,
+ boolean cachedPDBExists)
{
/*
* temporarily suspend the change listener behaviour
{
/*
* temporarily suspend the change listener behaviour
@@
-549,8
+552,14
@@
public class StructureChooser extends GStructureChooser implements
VIEWS_ENTER_ID));
cmb_filterOption.addItem(new FilterOption("From File", "-",
VIEWS_FROM_FILE));
VIEWS_ENTER_ID));
cmb_filterOption.addItem(new FilterOption("From File", "-",
VIEWS_FROM_FILE));
- cmb_filterOption.addItem(new FilterOption("Cached PDB Entries", "-",
- VIEWS_LOCAL_PDB));
+ FilterOption cachedOption = new FilterOption("Cached PDB Entries", "-",
+ VIEWS_LOCAL_PDB);
+ cmb_filterOption.addItem(cachedOption);
+
+ if (/*!haveData &&*/cachedPDBExists)
+ {
+ cmb_filterOption.setSelectedItem(cachedOption);
+ }
cmb_filterOption.addItemListener(this);
}
cmb_filterOption.addItemListener(this);
}