Merge "ASM #290" into asm_14.2.2

Former-commit-id: 3a31872714dbc04cfd7a0f1e353970b896b047a7
This commit is contained in:
Juliya Dynina 2014-01-31 09:13:33 -05:00 committed by Gerrit Code Review
commit a3ac0236b0

View file

@ -103,6 +103,7 @@ import com.raytheon.viz.mpe.ui.dialogs.gagetable.xml.GageTableSortType;
* ------------ ---------- ----------- --------------------------
* May 28, 2009 2476 mpduff Initial creation.
* Mar 08, 2013 15725 snaples Updated to fix resort issues when editing value.
* Jan 28, 2014 16994 snaples Updated populateGridCombo to get correct filename prefix for matching up selection.
*
* </pre>
*
@ -487,7 +488,7 @@ public class GageTableDlg extends JFrame implements IEditTimeChangedListener {
if (columnData.get(i).isDataColumn()) {
gridCombo.addItem(columnData.get(i).getName());
if (selectedGrid
.equalsIgnoreCase(columnData.get(i).getPrefix())) {
.equalsIgnoreCase(columnData.get(i).getProductDescriptor().getProductFilenamePrefix())) {
gridComboSelection = gridSelectionIndex;
}
gridSelectionIndex++;