X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2Fstructurechooser%2FThreeDBStructureChooserQuerySource.java;fp=src%2Fjalview%2Fgui%2Fstructurechooser%2FThreeDBStructureChooserQuerySource.java;h=cdf456ce6030ad5b05e09b82bd56a641d063a160;hb=7d69b23263d8a00ca20c0bb4ff2c8f4f3a9e6c0c;hp=7a311f87c8c206d2ab406e88401eb06be185c78f;hpb=a20d02a5acd820192158d03c4623365018848737;p=jalview.git diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java index 7a311f8..cdf456c 100644 --- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java +++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java @@ -23,6 +23,7 @@ import jalview.fts.core.FTSDataColumnPreferences; import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; import jalview.fts.core.FTSRestRequest; import jalview.fts.core.FTSRestResponse; +import jalview.fts.service.threedbeacons.TDB_FTSData; import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient; import jalview.jbgui.FilterOption; @@ -251,9 +252,11 @@ public class ThreeDBStructureChooserQuerySource { int prov_idx = lastTdbRequest.getFieldIndex("Provider"); boolean hasPDBe=false; - for (FTSData row : tdbEntries) + for (FTSData _row : tdbEntries) { - String provider = (String) row.getSummaryData()[prov_idx]; + // tdb returns custom object + TDB_FTSData row = (TDB_FTSData) _row; + String provider = (String) row.getProvider(); FilterOption providerOpt = new FilterOption( "3DB Provider - " + provider, FILTER_SOURCE_PREFIX + provider, VIEWS_FILTER, false, this); @@ -547,4 +550,20 @@ public class ThreeDBStructureChooserQuerySource return upResponse; } + public TDB_FTSData getFTSDataFor(JTable restable, int selectedRow, + Collection discoveredStructuresSet) + { + int idColumnIndex = restable.getColumn("Model id").getModelIndex(); + + String modelId = (String) restable.getValueAt(selectedRow, idColumnIndex); + for (FTSData row:discoveredStructuresSet) + { + if (row instanceof TDB_FTSData && ((TDB_FTSData)row).getModelId().equals(modelId)) + { + return ((TDB_FTSData)row); + } + } + return null; + } + } \ No newline at end of file