X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestResponse.java;h=d9658e44f47f6975995d84981b33e28e8cd3dad5;hb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;hp=8078d43ec540a146773f4776d9469ddd14828f14;hpb=b577ea70f354225426c5a5ecb8def7261e1cd3aa;p=jalview.git diff --git a/src/jalview/fts/core/FTSRestResponse.java b/src/jalview/fts/core/FTSRestResponse.java index 8078d43..d9658e4 100644 --- a/src/jalview/fts/core/FTSRestResponse.java +++ b/src/jalview/fts/core/FTSRestResponse.java @@ -25,6 +25,7 @@ import jalview.fts.api.FTSData; import jalview.fts.api.FTSDataColumnI; import java.util.Collection; +import java.util.Map; import javax.swing.JTable; import javax.swing.table.DefaultTableModel; @@ -117,8 +118,7 @@ public class FTSRestResponse tableModel.addColumn("Ref Sequence"); // Create sequence column header if // exists in the request } - for (FTSDataColumnI field : request - .getWantedFields()) + for (FTSDataColumnI field : request.getWantedFields()) { tableModel.addColumn(field.getName()); // Create sequence column header if // exists in the request @@ -134,18 +134,22 @@ public class FTSRestResponse } public static void configureTableColumn(JTable tbl_summary, - Collection wantedFields) + Collection wantedFields, + Map columnPrefs) { for (FTSDataColumnI wantedField : wantedFields) { try { - tbl_summary.getColumn(wantedField.getName()).setMinWidth( - wantedField.getMinWidth()); - tbl_summary.getColumn(wantedField.getName()).setMaxWidth( - wantedField.getMaxWidth()); - tbl_summary.getColumn(wantedField.getName()).setPreferredWidth( - wantedField.getPreferredWidth()); + tbl_summary.getColumn(wantedField.getName()) + .setMinWidth(wantedField.getMinWidth()); + tbl_summary.getColumn(wantedField.getName()) + .setMaxWidth(wantedField.getMaxWidth()); + int prefedWidth = columnPrefs.get(wantedField.getName()) == null + ? wantedField.getPreferredWidth() + : columnPrefs.get(wantedField.getName()); + tbl_summary.getColumn(wantedField.getName()) + .setPreferredWidth(prefedWidth); } catch (Exception e) { e.printStackTrace(); @@ -157,7 +161,8 @@ public class FTSRestResponse wantedField.getDataType().getSignificantFigures()); tbl_summary.getColumn(wantedField.getName()).setCellRenderer(dfr); } - else if (wantedField.getDataType().getDataTypeClass() == Integer.class) + else if (wantedField.getDataType() + .getDataTypeClass() == Integer.class) { DecimalFormatTableCellRenderer dfr = new DecimalFormatTableCellRenderer( wantedField.getDataType().isFormtted(), @@ -167,5 +172,4 @@ public class FTSRestResponse } } - }