git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4f2ee90
)
JAL-1482 refactor setTableData to more sensible name for feature settings api
author
Jim Procter
<jprocter@dundee.ac.uk>
Wed, 18 Feb 2015 11:08:00 +0000
(11:08 +0000)
committer
James Procter
<jprocter@ls30857.local>
Fri, 5 Jun 2015 11:27:08 +0000
(12:27 +0100)
src/jalview/api/FeatureSettingsControllerI.java
patch
|
blob
|
history
src/jalview/appletgui/FeatureSettings.java
patch
|
blob
|
history
src/jalview/controller/FeatureSettingsController.java
patch
|
blob
|
history
src/jalview/gui/FeatureSettings.java
patch
|
blob
|
history
src/jalview/ws/DasSequenceFeatureFetcher.java
patch
|
blob
|
history
diff --git
a/src/jalview/api/FeatureSettingsControllerI.java
b/src/jalview/api/FeatureSettingsControllerI.java
index
c718e36
..
2bcd667
100644
(file)
--- a/
src/jalview/api/FeatureSettingsControllerI.java
+++ b/
src/jalview/api/FeatureSettingsControllerI.java
@@
-2,5
+2,7
@@
package jalview.api;
public interface FeatureSettingsControllerI
{
public interface FeatureSettingsControllerI
{
+
+ void discoverAllFeatureData();
}
}
diff --git
a/src/jalview/appletgui/FeatureSettings.java
b/src/jalview/appletgui/FeatureSettings.java
index
b51906d
..
2b79256
100755
(executable)
--- a/
src/jalview/appletgui/FeatureSettings.java
+++ b/
src/jalview/appletgui/FeatureSettings.java
@@
-64,7
+64,7
@@
import java.util.Vector;
public class FeatureSettings extends Panel implements ItemListener,
MouseListener, MouseMotionListener, ActionListener,
public class FeatureSettings extends Panel implements ItemListener,
MouseListener, MouseMotionListener, ActionListener,
- AdjustmentListener
+ AdjustmentListener, FeatureSettingsControllerI
{
FeatureRenderer fr;
{
FeatureRenderer fr;
@@
-114,7
+114,7
@@
public class FeatureSettings extends Panel implements ItemListener,
fr.findAllFeatures(true); // was default - now true to make all visible
}
fr.findAllFeatures(true); // was default - now true to make all visible
}
- setTableData();
+ discoverAllFeatureData();
this.setLayout(new BorderLayout());
scrollPane = new ScrollPane();
this.setLayout(new BorderLayout());
scrollPane = new ScrollPane();
@@
-279,7
+279,8
@@
public class FeatureSettings extends Panel implements ItemListener,
men.show(this.featurePanel, x, y);
}
men.show(this.featurePanel, x, y);
}
- public void setTableData()
+ @Override
+ public void discoverAllFeatureData()
{
if (fr.getAllFeatureColours()!=null && fr.getAllFeatureColours().size()>0)
{
{
if (fr.getAllFeatureColours()!=null && fr.getAllFeatureColours().size()>0)
{
diff --git
a/src/jalview/controller/FeatureSettingsController.java
b/src/jalview/controller/FeatureSettingsController.java
index
ebf4958
..
7dd1399
100644
(file)
--- a/
src/jalview/controller/FeatureSettingsController.java
+++ b/
src/jalview/controller/FeatureSettingsController.java
@@
-3,7
+3,8
@@
package jalview.controller;
import jalview.api.FeatureRenderer;
import jalview.api.FeatureSettingsModelI;
import jalview.api.FeatureRenderer;
import jalview.api.FeatureSettingsModelI;
-public class FeatureSettingsController implements jalview.api.FeatureSettingsControllerI
+public class FeatureSettingsController // implements
+ // jalview.api.FeatureSettingsControllerI
{
FeatureSettingsControllerGuiI settingUI;
FeatureRenderer fr;
{
FeatureSettingsControllerGuiI settingUI;
FeatureRenderer fr;
diff --git
a/src/jalview/gui/FeatureSettings.java
b/src/jalview/gui/FeatureSettings.java
index
918fc02
..
940a216
100644
(file)
--- a/
src/jalview/gui/FeatureSettings.java
+++ b/
src/jalview/gui/FeatureSettings.java
@@
-20,6
+20,7
@@
*/
package jalview.gui;
*/
package jalview.gui;
+import jalview.api.FeatureSettingsControllerI;
import jalview.bin.Cache;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.bin.Cache;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
@@
-88,7
+89,8
@@
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
-public class FeatureSettings extends JPanel
+public class FeatureSettings extends JPanel implements
+ FeatureSettingsControllerI
{
DasSourceBrowser dassourceBrowser;
{
DasSourceBrowser dassourceBrowser;
@@
-227,7
+229,7
@@
public class FeatureSettings extends JPanel
fr.findAllFeatures(true); // display everything!
}
fr.findAllFeatures(true); // display everything!
}
- setTableData();
+ discoverAllFeatureData();
final PropertyChangeListener change;
final FeatureSettings fs = this;
fr.addPropertyChangeListener(change = new PropertyChangeListener()
final PropertyChangeListener change;
final FeatureSettings fs = this;
fr.addPropertyChangeListener(change = new PropertyChangeListener()
@@
-421,7
+423,8
@@
public class FeatureSettings extends JPanel
*/
Hashtable typeWidth = null;
*/
Hashtable typeWidth = null;
- synchronized public void setTableData()
+ @Override
+ synchronized public void discoverAllFeatureData()
{
Vector allFeatures = new Vector();
Vector allGroups = new Vector();
{
Vector allFeatures = new Vector();
Vector allGroups = new Vector();
diff --git
a/src/jalview/ws/DasSequenceFeatureFetcher.java
b/src/jalview/ws/DasSequenceFeatureFetcher.java
index
e22aa12
..
3db663d
100644
(file)
--- a/
src/jalview/ws/DasSequenceFeatureFetcher.java
+++ b/
src/jalview/ws/DasSequenceFeatureFetcher.java
@@
-587,7
+587,7
@@
public class DasSequenceFeatureFetcher
if (af != null && af.featureSettings != null)
{
if (af != null && af.featureSettings != null)
{
- af.featureSettings.setTableData();
+ af.featureSettings.discoverAllFeatureData();
}
if (getFeatSettings() != null)
}
if (getFeatSettings() != null)