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
JAL-2071 further refactoring, optimisation, and house keeping for the generic Free...
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureChooser.java
diff --git
a/src/jalview/jbgui/GStructureChooser.java
b/src/jalview/jbgui/GStructureChooser.java
index
8430557
..
a5b03d8
100644
(file)
--- a/
src/jalview/jbgui/GStructureChooser.java
+++ b/
src/jalview/jbgui/GStructureChooser.java
@@
-22,13
+22,14
@@
package jalview.jbgui;
import jalview.datamodel.SequenceI;
package jalview.jbgui;
import jalview.datamodel.SequenceI;
+import jalview.fts.api.FTSDataColumnI;
+import jalview.fts.core.FTSDataColumnPreferences;
+import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
+import jalview.fts.service.pdb.PDBFTSRestClient;
import jalview.gui.AlignmentPanel;
import jalview.gui.Desktop;
import jalview.gui.JvSwingUtils;
import jalview.gui.AlignmentPanel;
import jalview.gui.Desktop;
import jalview.gui.JvSwingUtils;
-import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
import jalview.util.MessageManager;
import jalview.util.MessageManager;
-import jalview.ws.dbsources.PDBRestClient;
-import jalview.ws.dbsources.PDBRestClient.PDBDocField;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.BorderLayout;
import java.awt.CardLayout;
@@
-195,10
+196,10
@@
public abstract class GStructureChooser extends JPanel implements
private JTabbedPane pnl_filter = new JTabbedPane();
private JTabbedPane pnl_filter = new JTabbedPane();
- private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
- PreferenceSource.STRUCTURE_CHOOSER);
+ private FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences(
+ PreferenceSource.STRUCTURE_CHOOSER, PDBFTSRestClient.getInstance());
- protected PDBDocField[] previousWantedFields;
+ protected FTSDataColumnI[] previousWantedFields;
public GStructureChooser()
{
public GStructureChooser()
{
@@
-473,9
+474,9
@@
public abstract class GStructureChooser extends JPanel implements
btn_cancel.setEnabled(false);
btn_view.setVisible(false);
btn_cancel.setVisible(false);
btn_cancel.setEnabled(false);
btn_view.setVisible(false);
btn_cancel.setVisible(false);
- previousWantedFields = PDBDocFieldPreferences
- .getStructureSummaryFields().toArray(
- new PDBRestClient.PDBDocField[0]);
+ previousWantedFields = PDBFTSRestClient.getInstance()
+ .getAllDefaulDisplayedDataColumns()
+ .toArray(new FTSDataColumnI[0]);
}
if (sourceTabbedPane.getTitleAt(index)
.equals(foundStructureSummary))
}
if (sourceTabbedPane.getTitleAt(index)
.equals(foundStructureSummary))
@@
-527,8
+528,10
@@
public abstract class GStructureChooser extends JPanel implements
return true;
}
return true;
}
- return Arrays.equals(PDBDocFieldPreferences.getStructureSummaryFields()
- .toArray(new PDBRestClient.PDBDocField[0]),
+ return Arrays.equals(
+ PDBFTSRestClient.getInstance()
+ .getAllDefaulDisplayedDataColumns()
+ .toArray(new FTSDataColumnI[0]),
previousWantedFields) ? false : true;
}
previousWantedFields) ? false : true;
}