From 0d458f4e3eafdc4f01702a781c5241264c15957a Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Thu, 24 Apr 2014 16:02:31 -0500 Subject: [PATCH] Issue #3045 Change column label to "Data Set". Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13 (cherry picked from commit 8eb4c91ab3f1b0a26d9bc3528267806bd1c343de [formerly 3a2a6afaf10fc18336de2ef6c7616300ebc10387] [formerly cf6d1c8ca1b58d12b300bef029ed1a93f90944c7 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]) Former-commit-id: 994adc2ad5c55bbd11a35bf78cf6968c12cdc25e [formerly c1537561419604b05ec17c0aa01f272b3d4ed9f3] Former-commit-id: f29852d5bce6fce24438076b55020d23e97a1407 --- .../com/raytheon/uf/viz/archive/data/SizeJob.java | 2 +- .../uf/viz/archive/ui/ArchiveTableComp.java | 15 +++++++++++---- .../uf/viz/archive/ui/CaseCreationDlg.java | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/data/SizeJob.java b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/data/SizeJob.java index 2724cf7bc5..a9735621ce 100644 --- a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/data/SizeJob.java +++ b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/data/SizeJob.java @@ -899,7 +899,7 @@ public class SizeJob extends Job { public LoadDisplayDataJob( ILoadDisplayDataListener loadDisplayDataListener, int loadDisplayDataCnt) { - super("Loading Category labels"); + super("Loading Data Sets"); this.loadDisplayDataListener = loadDisplayDataListener; this.loadDisplayDataCnt = loadDisplayDataCnt; } diff --git a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java index a11a6c90a6..921cbcccd8 100644 --- a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java +++ b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java @@ -64,7 +64,7 @@ import com.raytheon.uf.viz.archive.data.SizeJob; * Aug 06, 2013 #2222 rferrel Changes to display all selected data. * Aug 14, 2013 #2220 rferrel Add refresh method. * Aug 26, 2013 #2225 rferrel Add missing updates. - * Apr 23, 2014 #3045 rferrel Added clearTable method. + * Apr 23, 2014 #3045 rferrel Added clearTable method and new column name. * * * @@ -73,12 +73,19 @@ import com.raytheon.uf.viz.archive.data.SizeJob; */ public class ArchiveTableComp extends Composite { + /** Column label when table displaying category information. */ + private final String CATEGORY_COL_LABEL = "Data Set"; + + /** Column label when table displaying select all information. */ + private final String SEL_ALL_COL_LABEL = "Archive | Category | Data Set"; + /** Column to display label information. */ private final int LABEL_COL_INDEX = 0; /** Column to display size information,. */ private final int SIZE_COL_INDEX = 1; + /** Flag to indicate all selections are being displayed. */ private boolean showSelectAll = false; /** Name of table's archive. */ @@ -207,7 +214,7 @@ public class ArchiveTableComp extends Composite { }); TableColumn pathColumn = new TableColumn(table, SWT.LEFT); - pathColumn.setText("Label"); + pathColumn.setText(CATEGORY_COL_LABEL); TableColumn sizeColumn = new TableColumn(table, SWT.CENTER); if (type == Type.Retention) { @@ -466,7 +473,7 @@ public class ArchiveTableComp extends Composite { protected void populateTable(String archiveName, String categoryName, List displayDatas) { showSelectAll = false; - table.getColumn(0).setText("Label"); + table.getColumn(0).setText(CATEGORY_COL_LABEL); populateTable(displayDatas); } @@ -484,7 +491,7 @@ public class ArchiveTableComp extends Composite { */ protected void populateSelectAll(List displayDatas) { showSelectAll = true; - table.getColumn(0).setText("Archive | Category | Label"); + table.getColumn(0).setText(SEL_ALL_COL_LABEL); populateTable(displayDatas); } diff --git a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java index c75aa90a58..08ba6aaebc 100644 --- a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java +++ b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java @@ -496,7 +496,7 @@ public class CaseCreationDlg extends AbstractArchiveDlg { // } // }); - String tooltip = "Waiting on loading of table labels."; + String tooltip = "Waiting on loading of Data Sets."; Color color = shell.getDisplay().getSystemColor(SWT.COLOR_YELLOW); saveBtn = new Button(actionControlComp, SWT.PUSH); saveBtn.setText(" Save ");