X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureChooser.java;h=5ea68fb5e2f825d838b7dc0233fc008eb08ca0ba;hp=2e7019ab14fb1504fcd370b239459e7e44a1f3d6;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hpb=9018c06add8548b4921a4c21f21a1b85a0bea1de diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java index 2e7019a..5ea68fb 100644 --- a/src/jalview/gui/StructureChooser.java +++ b/src/jalview/gui/StructureChooser.java @@ -21,11 +21,30 @@ package jalview.gui; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.Executors; + +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.JTable; +import javax.swing.SwingUtilities; +import javax.swing.table.AbstractTableModel; + import jalview.api.structures.JalviewStructureDisplayI; import jalview.bin.Cache; import jalview.bin.Jalview; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.DBRefSource; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.fts.api.FTSData; @@ -35,6 +54,7 @@ import jalview.fts.core.FTSDataColumnPreferences; import jalview.fts.core.FTSRestRequest; import jalview.fts.core.FTSRestResponse; import jalview.fts.service.pdb.PDBFTSRestClient; +import jalview.fts.service.threedbeacons.TDB_FTSData; import jalview.gui.structurechooser.PDBStructureChooserQuerySource; import jalview.gui.structurechooser.StructureChooserQuerySource; import jalview.gui.structurechooser.ThreeDBStructureChooserQuerySource; @@ -45,28 +65,10 @@ import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; import jalview.ws.DBRefFetcher; +import jalview.ws.DBRefFetcher.FetchFinishedListenerI; +import jalview.ws.seqfetcher.DbSourceProxy; import jalview.ws.sifts.SiftsSettings; -import java.awt.event.ItemEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.Vector; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.SwingUtilities; -import javax.swing.table.AbstractTableModel; - /** * Provides the behaviors for the Structure chooser Panel * @@ -103,25 +105,76 @@ public class StructureChooser extends GStructureChooser private Collection lastDiscoveredStructuresSet; + private boolean canQueryTDB = false; + + private boolean notQueriedTDBYet = true; + + List seqsWithoutSourceDBRef = null; + private static StructureViewer lastTargetedView = null; public StructureChooser(SequenceI[] selectedSeqs, SequenceI selectedSeq, AlignmentPanel ap) { // which FTS engine to use - data = StructureChooserQuerySource - .getQuerySourceFor(selectedSeqs); + data = StructureChooserQuerySource.getQuerySourceFor(selectedSeqs); initDialog(); - + this.ap = ap; this.selectedSequence = selectedSeq; this.selectedSequences = selectedSeqs; this.progressIndicator = (ap == null) ? null : ap.alignFrame; init(); - + } /** + * sets canQueryTDB if protein sequences without a canonical uniprot ref or at + * least one structure are discovered. + */ + private void populateSeqsWithoutSourceDBRef() + { + seqsWithoutSourceDBRef = new ArrayList(); + boolean needCanonical = false; + for (SequenceI seq : selectedSequences) + { + if (seq.isProtein()) + { + int dbRef = ThreeDBStructureChooserQuerySource + .checkUniprotRefs(seq.getDBRefs()); + if (dbRef < 0) + { + if (dbRef == -1) + { + // need to retrieve canonicals + needCanonical = true; + seqsWithoutSourceDBRef.add(seq); + } + else + { + // could be a sequence with pdb ref + if (seq.getAllPDBEntries() == null + || seq.getAllPDBEntries().size() == 0) + { + seqsWithoutSourceDBRef.add(seq); + } + } + } + } + } + // retrieve database refs for protein sequences + if (!seqsWithoutSourceDBRef.isEmpty()) + { + canQueryTDB = true; + if (needCanonical) + { + // triggers display of the 'Query TDB' button + notQueriedTDBYet = true; + } + } + }; + + /** * Initializes parameters used by the Structure Chooser Panel */ protected void init() @@ -132,101 +185,191 @@ public class StructureChooser extends GStructureChooser } chk_superpose.setSelected(Cache.getDefault(AUTOSUPERIMPOSE, true)); + btn_queryTDB.addActionListener(new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent e) + { + promptForTDBFetch(false); + } + }); + + Executors.defaultThreadFactory().newThread(new Runnable() + { + public void run() + { + populateSeqsWithoutSourceDBRef(); + initialStructureDiscovery(); + } + + }).start(); + + } + + // called by init + private void initialStructureDiscovery() + { + // check which FTS engine to use + data = StructureChooserQuerySource.getQuerySourceFor(selectedSequences); // ensure a filter option is in force for search populateFilterComboBox(true, cachedPDBExists); - // todo change to futures I guess - final Runnable discoverPDBStructures = new Runnable() + // looks for any existing structures already loaded + // for the sequences (the cached ones) + // then queries the StructureChooserQuerySource to + // discover more structures. + // + // Possible optimisation is to only begin querying + // the structure chooser if there are no cached structures. + + long startTime = System.currentTimeMillis(); + updateProgressIndicator( + MessageManager.getString("status.loading_cached_pdb_entries"), + startTime); + loadLocalCachedPDBEntries(); + updateProgressIndicator(null, startTime); + updateProgressIndicator( + MessageManager.getString("status.searching_for_pdb_structures"), + startTime); + fetchStructuresMetaData(); + // revise filter options if no results were found + populateFilterComboBox(isStructuresDiscovered(), cachedPDBExists); + discoverStructureViews(); + updateProgressIndicator(null, startTime); + mainFrame.setVisible(true); + updateCurrentView(); + } + + /** + * raises dialog for Uniprot fetch followed by 3D beacons search + * + * @param ignoreGui + * - when true, don't ask, just fetch + */ + public void promptForTDBFetch(boolean ignoreGui) + { + final long progressId = System.currentTimeMillis(); + + // final action after prompting and discovering db refs + final Runnable strucDiscovery = new Runnable() { @Override public void run() { - // looks for any existing structures already loaded - // for the sequences (the cached ones) - // then queries the StructureChooserQuerySource to - // discover more structures. - // - // Possible optimisation is to only begin querying - // the structure chooser if there are no cached structures. - - long startTime = System.currentTimeMillis(); - updateProgressIndicator(MessageManager - .getString("status.loading_cached_pdb_entries"), startTime); - loadLocalCachedPDBEntries(); - updateProgressIndicator(null, startTime); - updateProgressIndicator(MessageManager.getString( - "status.searching_for_pdb_structures"), startTime); - fetchStructuresMetaData(); - // revise filter options if no results were found - populateFilterComboBox(isStructuresDiscovered(), cachedPDBExists); - discoverStructureViews(); - updateProgressIndicator(null, startTime); - mainFrame.setVisible(true); - updateCurrentView(); + mainFrame.setEnabled(false); + cmb_filterOption.setEnabled(false); + progressBar.setProgressBar( + MessageManager.getString("status.searching_3d_beacons"), + progressId); + btn_queryTDB.setEnabled(false); + // TODO: warn if no accessions discovered + populateSeqsWithoutSourceDBRef(); + // redo initial discovery - this time with 3d beacons + // Executors. + previousWantedFields = null; + lastSelected = (FilterOption) cmb_filterOption.getSelectedItem(); + cmb_filterOption.setSelectedItem(null); + cachedPDBExists = false; // reset to initial + initialStructureDiscovery(); + if (!isStructuresDiscovered()) + { + progressBar.setProgressBar(MessageManager.getString( + "status.no_structures_discovered_from_3d_beacons"), + progressId); + btn_queryTDB.setToolTipText(MessageManager.getString( + "status.no_structures_discovered_from_3d_beacons")); + btn_queryTDB.setEnabled(false); + pnl_queryTDB.setVisible(false); + } + else + { + cmb_filterOption.setSelectedIndex(0); // select 'best' + btn_queryTDB.setVisible(false); + pnl_queryTDB.setVisible(false); + progressBar.setProgressBar(null, progressId); + } + mainFrame.setEnabled(true); + cmb_filterOption.setEnabled(true); } }; - final List seqsWithoutSourceDBRef = new ArrayList(); - final Runnable discoverCanonicalDBrefs = new Runnable() + final FetchFinishedListenerI afterDbRefFetch = new FetchFinishedListenerI() { + @Override - public void run() + public void finished() { - long progressId = System.currentTimeMillis(); - - int y = seqsWithoutSourceDBRef.size(); - setProgressBar(MessageManager.formatMessage( - "status.fetching_dbrefs_for_sequences_without_valid_refs", - y), progressId); - SequenceI[] seqWithoutSrcDBRef = seqsWithoutSourceDBRef - .toArray(new SequenceI[y]); - DBRefFetcher dbRefFetcher = new DBRefFetcher(seqWithoutSrcDBRef); - dbRefFetcher.fetchDBRefs(true); - - setProgressBar("Fetch complete.", progressId); // todo i18n + // filter has been selected, so we set flag to remove ourselves + notQueriedTDBYet = false; + // new thread to discover structures - via 3d beacons + Executors.defaultThreadFactory().newThread(strucDiscovery).start(); - SwingUtilities.invokeLater(discoverPDBStructures); } }; - Executors.defaultThreadFactory().newThread(new Runnable() + // fetch db refs if OK pressed + final Runnable discoverCanonicalDBrefs = new Runnable() { + @Override public void run() { + populateSeqsWithoutSourceDBRef(); - for (SequenceI seq : selectedSequences) + final int y = seqsWithoutSourceDBRef.size(); + if (y > 0) { - if (seq.isProtein()) - { - int dbRef = ThreeDBStructureChooserQuerySource - .checkUniprotRefs(seq.getDBRefs()); - if (dbRef < 0) - { - seqsWithoutSourceDBRef.add(seq); - } - } + final SequenceI[] seqWithoutSrcDBRef = seqsWithoutSourceDBRef + .toArray(new SequenceI[y]); + DBRefFetcher dbRefFetcher = new DBRefFetcher(seqWithoutSrcDBRef, + progressBar, new DbSourceProxy[] + { new jalview.ws.dbsources.Uniprot() }, null, false); + dbRefFetcher.addListener(afterDbRefFetch); + // ideally this would also gracefully run with callbacks + dbRefFetcher.fetchDBRefs(true); } - // retrieve database refs for protein sequences - if (!seqsWithoutSourceDBRef.isEmpty()) + else { - JvOptionPane.newOptionDialog(Desktop.getDesktop()) - .setResponseHandler(0, discoverCanonicalDBrefs) - .setResponseHandler(1, discoverPDBStructures) - .showDialog(MessageManager.formatMessage("label.fetch_references_for",seqsWithoutSourceDBRef.size()), MessageManager.getString( - "label.fetch_uniprot_references"), - JvOptionPane.YES_NO_OPTION, - JvOptionPane.PLAIN_MESSAGE, null, new Object[] - { MessageManager.getString("action.ok"), - MessageManager.getString("action.cancel") }, - MessageManager.getString("action.ok")); - } else { - // get structures directly - Executors.defaultThreadFactory().newThread(discoverPDBStructures).start(); + // call finished action directly + afterDbRefFetch.finished(); } - }; - }).start();; + } + }; + final Runnable revertview = new Runnable() + { + public void run() + { + if (lastSelected != null) + { + cmb_filterOption.setSelectedItem(lastSelected); + } + }; + }; + if (ignoreGui) + { + Executors.defaultThreadFactory().newThread(discoverCanonicalDBrefs) + .start(); + return; + } + // need cancel and no to result in the discoverPDB action - mocked is + // 'cancel' TODO: mock should be OK + JvOptionPane.newOptionDialog(this) + .setResponseHandler(JvOptionPane.OK_OPTION, + discoverCanonicalDBrefs) + .setResponseHandler(JvOptionPane.CANCEL_OPTION, revertview) + .setResponseHandler(JvOptionPane.NO_OPTION, revertview) + .showDialog( + MessageManager.formatMessage( + "label.fetch_references_for_3dbeacons", + seqsWithoutSourceDBRef.size()), + MessageManager.getString("label.3dbeacons"), + JvOptionPane.YES_NO_OPTION, JvOptionPane.PLAIN_MESSAGE, + null, new Object[] + { MessageManager.getString("action.ok"), + MessageManager.getString("action.cancel") }, + MessageManager.getString("action.ok")); } /** @@ -322,8 +465,9 @@ public class StructureChooser extends GStructureChooser resultList = data.fetchStructuresMetaData(seq, wantedFields, selectedFilterOpt, !chk_invertFilter.isSelected()); // null response means the FTSengine didn't yield a query for this - // consider designing a special exception if we really wanted to be OOCrazy - if (resultList==null) + // consider designing a special exception if we really wanted to be + // OOCrazy + if (resultList == null) { continue; } @@ -348,9 +492,9 @@ public class StructureChooser extends GStructureChooser { getResultTable() .setModel(data.getTableModel(discoveredStructuresSet)); - + noOfStructuresFound = discoveredStructuresSet.size(); - lastDiscoveredStructuresSet=discoveredStructuresSet; + lastDiscoveredStructuresSet = discoveredStructuresSet; mainFrame.setTitle(MessageManager.formatMessage( "label.structure_chooser_no_of_structures", noOfStructuresFound, totalTime)); @@ -423,8 +567,9 @@ public class StructureChooser extends GStructureChooser FTSRestResponse resultList; try { - resultList = data.selectFirstRankedQuery(seq, discoveredStructuresSet,wantedFields, - fieldToFilterBy, !chk_invertFilter.isSelected()); + resultList = data.selectFirstRankedQuery(seq, + discoveredStructuresSet, wantedFields, fieldToFilterBy, + !chk_invertFilter.isSelected()); } catch (Exception e) { @@ -449,7 +594,7 @@ public class StructureChooser extends GStructureChooser reorderedStructuresSet.addAll(discoveredStructuresSet); getResultTable() .setModel(data.getTableModel(reorderedStructuresSet)); - + FTSRestResponse.configureTableColumn(getResultTable(), wantedFields, tempUserPrefs); getResultTable().getColumn("Ref Sequence").setPreferredWidth(120); @@ -496,7 +641,7 @@ public class StructureChooser extends GStructureChooser // StructureChooser // works jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY")); + Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle( MessageManager.formatMessage("label.select_pdb_file_for", @@ -509,7 +654,7 @@ public class StructureChooser extends GStructureChooser if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION) { selectedPdbFileName = chooser.getSelectedFile().getPath(); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", selectedPdbFileName); + Cache.setProperty("LAST_DIRECTORY", selectedPdbFileName); validateSelections(); } } @@ -523,6 +668,7 @@ public class StructureChooser extends GStructureChooser { populateFilterComboBox(haveData, cachedPDBExist, null); } + /** * Populates the filter combo-box options dynamically depending on discovered * structures @@ -530,45 +676,55 @@ public class StructureChooser extends GStructureChooser protected void populateFilterComboBox(boolean haveData, boolean cachedPDBExist, FilterOption lastSel) { - + /* * temporarily suspend the change listener behaviour */ cmb_filterOption.removeItemListener(this); - int selSet=-1; + int selSet = -1; cmb_filterOption.removeAllItems(); if (haveData) { - List filters = data.getAvailableFilterOptions(VIEWS_FILTER); - data.updateAvailableFilterOptions(VIEWS_FILTER, filters, lastDiscoveredStructuresSet); - int p=0; - for (FilterOption filter:filters) + List filters = data + .getAvailableFilterOptions(VIEWS_FILTER); + data.updateAvailableFilterOptions(VIEWS_FILTER, filters, + lastDiscoveredStructuresSet); + int p = 0; + for (FilterOption filter : filters) { - if (lastSel!=null && filter.equals(lastSel)) { - selSet=p; + if (lastSel != null && filter.equals(lastSel)) + { + selSet = p; } p++; cmb_filterOption.addItem(filter); } } + cmb_filterOption.addItem( new FilterOption(MessageManager.getString("label.enter_pdb_id"), - "-", VIEWS_ENTER_ID, false,null)); + "-", VIEWS_ENTER_ID, false, null)); cmb_filterOption.addItem( new FilterOption(MessageManager.getString("label.from_file"), - "-", VIEWS_FROM_FILE, false,null)); + "-", VIEWS_FROM_FILE, false, null)); + if (canQueryTDB && notQueriedTDBYet) + { + btn_queryTDB.setVisible(true); + pnl_queryTDB.setVisible(true); + } if (cachedPDBExist) { FilterOption cachedOption = new FilterOption( MessageManager.getString("label.cached_structures"), "-", - VIEWS_LOCAL_PDB, false,null); + VIEWS_LOCAL_PDB, false, null); cmb_filterOption.addItem(cachedOption); - if (selSet==-1) { + if (selSet == -1) + { cmb_filterOption.setSelectedItem(cachedOption); } } - if (selSet>-1) + if (selSet > -1) { cmb_filterOption.setSelectedIndex(selSet); } @@ -582,24 +738,39 @@ public class StructureChooser extends GStructureChooser { FilterOption selectedFilterOpt = ((FilterOption) cmb_filterOption .getSelectedItem()); + + if (lastSelected == selectedFilterOpt) + { + // don't need to do anything, probably + return; + } + // otherwise, record selection + // and update the layout and dialog accordingly + lastSelected = selectedFilterOpt; + layout_switchableViews.show(pnl_switchableViews, selectedFilterOpt.getView()); String filterTitle = mainFrame.getTitle(); mainFrame.setTitle(frameTitle); chk_invertFilter.setVisible(false); + if (selectedFilterOpt.getView() == VIEWS_FILTER) { mainFrame.setTitle(filterTitle); // TDB Query has no invert as yet - chk_invertFilter.setVisible(selectedFilterOpt.getQuerySource() instanceof PDBStructureChooserQuerySource); - - if (data!=selectedFilterOpt.getQuerySource() || data.needsRefetch(selectedFilterOpt)) + chk_invertFilter.setVisible(selectedFilterOpt + .getQuerySource() instanceof PDBStructureChooserQuerySource); + + if (data != selectedFilterOpt.getQuerySource() + || data.needsRefetch(selectedFilterOpt)) { data = selectedFilterOpt.getQuerySource(); // rebuild the views completely, since prefs will also change tabRefresh(); return; - } else { + } + else + { filterResultSet(selectedFilterOpt.getValue()); } } @@ -667,6 +838,45 @@ public class StructureChooser extends GStructureChooser .setEnabled(selectedCount > 1 || targetView.getItemCount() > 0); } + @Override + protected boolean showPopupFor(int selectedRow, int x, int y) + { + FilterOption selectedFilterOpt = ((FilterOption) cmb_filterOption + .getSelectedItem()); + String currentView = selectedFilterOpt.getView(); + + if (currentView == VIEWS_FILTER + && data instanceof ThreeDBStructureChooserQuerySource) + { + + TDB_FTSData row = ((ThreeDBStructureChooserQuerySource) data) + .getFTSDataFor(getResultTable(), selectedRow, + discoveredStructuresSet); + String pageUrl = row.getModelViewUrl(); + JPopupMenu popup = new JPopupMenu("3D Beacons"); + JMenuItem viewUrl = new JMenuItem("View model web page"); + viewUrl.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + Desktop.showUrl(pageUrl); + } + }); + popup.add(viewUrl); + SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + popup.show(getResultTable(), x, y); + } + }); + return true; + } + // event not handled by us + return false; + } + /** * Validates inputs from the Manual PDB entry panel */ @@ -739,6 +949,8 @@ public class StructureChooser extends GStructureChooser validateSelections(); } + private FilterOption lastSelected = null; + /** * Handles the state change event for the 'filter' combo-box and 'invert' * check-box @@ -846,7 +1058,8 @@ public class StructureChooser extends GStructureChooser int[] selectedRows = restable.getSelectedRows(); PDBEntry[] pdbEntriesToView = new PDBEntry[selectedRows.length]; List selectedSeqsToView = new ArrayList<>(); - pdbEntriesToView = data.collectSelectedRows(restable,selectedRows,selectedSeqsToView); + pdbEntriesToView = data.collectSelectedRows(restable, + selectedRows, selectedSeqsToView); SequenceI[] selectedSeqs = selectedSeqsToView .toArray(new SequenceI[selectedSeqsToView.size()]); @@ -865,8 +1078,9 @@ public class StructureChooser extends GStructureChooser List selectedSeqsToView = new ArrayList<>(); for (int row : selectedRows) { - PDBEntry pdbEntry = ((PDBEntryTableModel) tbl_local_pdb.getModel()).getPDBEntryAt(row).getPdbEntry(); - + PDBEntry pdbEntry = ((PDBEntryTableModel) tbl_local_pdb + .getModel()).getPDBEntryAt(row).getPdbEntry(); + pdbEntriesToView[count++] = pdbEntry; SequenceI selectedSeq = (SequenceI) tbl_local_pdb .getValueAt(row, refSeqColIndex); @@ -893,7 +1107,8 @@ public class StructureChooser extends GStructureChooser if (pdbIdStr.split(":").length > 1) { pdbEntry.setId(pdbIdStr.split(":")[0]); - pdbEntry.setChainCode(pdbIdStr.split(":")[1].toUpperCase()); + pdbEntry.setChainCode( + pdbIdStr.split(":")[1].toUpperCase(Locale.ROOT)); } else { @@ -1120,7 +1335,7 @@ public class StructureChooser extends GStructureChooser // TODO move this pdb id search into the PDB specific // FTSSearchEngine // for moment, it will work fine as is because it is self-contained - String searchTerm = text.toLowerCase(); + String searchTerm = text.toLowerCase(Locale.ROOT); searchTerm = searchTerm.split(":")[0]; // System.out.println(">>>>> search term : " + searchTerm); List wantedFields = new ArrayList<>(); @@ -1167,7 +1382,7 @@ public class StructureChooser extends GStructureChooser public void run() { fetchStructuresMetaData(); - //populateFilterComboBox(true, cachedPDBExists); + // populateFilterComboBox(true, cachedPDBExists); filterResultSet( ((FilterOption) cmb_filterOption.getSelectedItem()) @@ -1270,8 +1485,8 @@ public class StructureChooser extends GStructureChooser { if (pdbEntry.hasProvider()) { - return pdbEntry.getProvider()+":"+pdbEntry.getId(); - } + return pdbEntry.getProvider() + ":" + pdbEntry.getId(); + } return pdbEntry.toString(); } @@ -1316,6 +1531,32 @@ public class StructureChooser extends GStructureChooser protected void setFTSDocFieldPrefs(FTSDataColumnPreferences newPrefs) { data.setDocFieldPrefs(newPrefs); - + + } + + /** + * + * @return true when all initialisation threads have finished and dialog is + * visible + */ + public boolean isDialogVisible() + { + return mainFrame != null && data != null && cmb_filterOption != null + && mainFrame.isVisible() + && cmb_filterOption.getSelectedItem() != null; + } + + /** + * + * @return true if the 3D-Beacons query button will/has been displayed + */ + public boolean isCanQueryTDB() + { + return canQueryTDB; + } + + public boolean isNotQueriedTDBYet() + { + return notQueriedTDBYet; } }