X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestResponse.java;h=597bb89af94ae6374ffa6c9fbdcc6f99f491dc6a;hb=4468c1e39c57fbb67192207b4c8750dab1b1dedd;hp=5d8fb96daf89ca2f491d3c2f9bb82fee0921da40;hpb=853624fb32058cccc544ae7d13af6ad4b0800b6c;p=jalview.git diff --git a/src/jalview/fts/core/FTSRestResponse.java b/src/jalview/fts/core/FTSRestResponse.java index 5d8fb96..597bb89 100644 --- a/src/jalview/fts/core/FTSRestResponse.java +++ b/src/jalview/fts/core/FTSRestResponse.java @@ -21,6 +21,7 @@ package jalview.fts.core; +import jalview.datamodel.SequenceI; import jalview.fts.api.FTSData; import jalview.fts.api.FTSDataColumnI; @@ -90,8 +91,8 @@ public class FTSRestResponse public static DefaultTableModel getTableModel(FTSRestRequest request, Collection summariesList) { - final FTSDataColumnI[] cols = request.getWantedFields().toArray( - new FTSDataColumnI[0]); + final FTSDataColumnI[] cols = request.getWantedFields() + .toArray(new FTSDataColumnI[0]); final int colOffset = request.getAssociatedSequence() == null ? 0 : 1; DefaultTableModel tableModel = new DefaultTableModel() { @@ -106,7 +107,7 @@ public class FTSRestResponse { if (colOffset == 1 && columnIndex == 0) { - return String.class; + return SequenceI.class; } return cols[columnIndex - colOffset].getDataType() .getDataTypeClass(); @@ -141,15 +142,15 @@ public class FTSRestResponse { try { - 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); + 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,15 +158,16 @@ public class FTSRestResponse if (wantedField.getDataType().getDataTypeClass() == Double.class) { DecimalFormatTableCellRenderer dfr = new DecimalFormatTableCellRenderer( - wantedField.getDataType().isFormtted(), wantedField - .getDataType().getSignificantFigures()); + wantedField.getDataType().isFormtted(), + 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(), wantedField - .getDataType().getSignificantFigures()); + wantedField.getDataType().isFormtted(), + wantedField.getDataType().getSignificantFigures()); tbl_summary.getColumn(wantedField.getName()).setCellRenderer(dfr); } }