X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=39a274785cd326ba4d3aec838c7640ccb1a5bd3a;hb=8690631b5afe2db0a06ef1b074d2633598c403ae;hp=9a6749958481ff793d894fd3f4485998234bc010;hpb=106a3890f956e2aa7780b2985f4326655912a558;p=jalview.git diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java index 9a67499..39a2747 100755 --- a/src/jalview/appletgui/FeatureSettings.java +++ b/src/jalview/appletgui/FeatureSettings.java @@ -20,6 +20,10 @@ */ package jalview.appletgui; +import static jalview.viewmodel.seqfeatures.FeatureRendererModel.COLOUR_COLUMN; +import static jalview.viewmodel.seqfeatures.FeatureRendererModel.SHOW_COLUMN; +import static jalview.viewmodel.seqfeatures.FeatureRendererModel.TYPE_COLUMN; + import jalview.api.FeatureColourI; import jalview.api.FeatureSettingsControllerI; import jalview.datamodel.AlignmentI; @@ -584,18 +588,23 @@ public class FeatureSettings extends Panel Component[] comps = featurePanel.getComponents(); int cSize = comps.length; - Object[][] tmp = new Object[cSize][3]; + /* + * temporary! leave column[2] empty - used for Filter in + * gui.FeatureSettings + */ + int columnCount = 4; + Object[][] tmp = new Object[cSize][columnCount]; int tmpSize = 0; for (int i = 0; i < cSize; i++) { MyCheckbox check = (MyCheckbox) comps[i]; - tmp[tmpSize][0] = check.type; - tmp[tmpSize][1] = fr.getFeatureStyle(check.type); - tmp[tmpSize][2] = new Boolean(check.getState()); + tmp[tmpSize][TYPE_COLUMN /* 0 */] = check.type; + tmp[tmpSize][COLOUR_COLUMN /* 1 */] = fr.getFeatureStyle(check.type); + tmp[tmpSize][SHOW_COLUMN /* 3 */] = new Boolean(check.getState()); tmpSize++; } - Object[][] data = new Object[tmpSize][3]; + Object[][] data = new Object[tmpSize][columnCount]; System.arraycopy(tmp, 0, data, 0, tmpSize); fr.setFeaturePriority(data);