xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VLab Issue #12791 - DCS14228 Double remark field; fixes #12791

Browse source 
Change-Id: Iba08f9cbfd1c7730365df16b819e588c2d5698e5

Former-commit-id: a4ecfaf8aa590bb6aba3bebe39ed98aae56c6ae9
This commit is contained in:
Wen Kwock 2016-02-05 21:50:27 +00:00
parent adbf370067
commit d7e937a6ec
6 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java
View file

@ -92,7 +92,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 08 April 2015 17338 djingtao "Apostrophe" entered into HB text fields are not written to IHFS database
* remove the changes in 15695/15488, move the apostrophe fix into a more central position
* 01 July 2015 15642 xwei Added read-only lat/lon in DMS format
*
* Nov 30, 2015 14228 wkwock Update remark limit to 510.
*
* </pre>
*
@ -404,7 +404,9 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements
private String defaultNewLid = "XXXXX";
private String defaultNewCountyState = "XXXXXXXXXXXXXXXXXXXX, XX";
private final int MAX_REMARK_CHAR = 510;
/**
* Listeners to notify main HB Dialog of station list changes
*/
@ -871,11 +873,11 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements
remarksTF = new Text(remarksGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP);
remarksTF.setLayoutData(gd);
remarksTF.setFont(controlFont);
remarksTF.setTextLimit(255);
remarksTF.setTextLimit(MAX_REMARK_CHAR);
currentRemarkText = remarksTF.getText();
ModifyListener listener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
if (remarksTF.getText().length() > 255) {
if (remarksTF.getText().length() > MAX_REMARK_CHAR) {
remarksTF.setText(currentRemarkText);
shell.getDisplay().beep();
} else

7
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/BenchmarkDlg.java
View file

@ -57,6 +57,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* 02 Sep 2008 lvenable Initial creation.
* 17 Dec 2008 1787 askripsk Connect to database.
* 17 Apr 2013 1790 rferrel Make dialog non-blocking.
* 30 Nov 2015 14228 wkwock Update remark limit to 510.
*
* </pre>
*
@ -122,7 +123,9 @@ public class BenchmarkDlg extends CaveSWTDialog {
* Benchmark data for the current location.
*/
private java.util.List<BenchmarkData> benchData;
private final int MAX_REMARK_CHAR = 510;
/**
* Dialog states.
*/
@ -256,7 +259,7 @@ public class BenchmarkDlg extends CaveSWTDialog {
gd.horizontalSpan = 2;
descriptionTF = new Text(infoGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP);
descriptionTF.setLayoutData(gd);
descriptionTF.setTextLimit(255);
descriptionTF.setTextLimit(MAX_REMARK_CHAR);
}
/**

9
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/GageHistoryDlg.java
View file

@ -63,7 +63,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Sep 4, 2008 lvenable Initial creation
* Jan 8, 2008 1802 askripsk Connect to DB.
* Apr 19, 2013 170- rferrel Make dialog non-blocking.
*
* Nov 30, 2015 14228 wkwock Update remark limit to 510.
* </pre>
*
* @author lvenable
@ -160,6 +160,9 @@ public class GageHistoryDlg extends CaveSWTDialog {
* @param titleInfo
* Dialog title information.
*/
private final int MAX_REMARK_CHAR = 510;
public GageHistoryDlg(Shell parent, String titleInfo, String lid) {
super(parent);
setText("Gage History" + titleInfo);
@ -345,11 +348,11 @@ public class GageHistoryDlg extends CaveSWTDialog {
gd = new GridData(500, 120);
locationTF = new Text(locationGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP);
locationTF.setLayoutData(gd);
locationTF.setTextLimit(255);
locationTF.setTextLimit(MAX_REMARK_CHAR);
currentLocText = locationTF.getText();
ModifyListener listener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
if (locationTF.getText().length() > 255) {
if (locationTF.getText().length() > MAX_REMARK_CHAR) {
locationTF.setText(currentLocText);
shell.getDisplay().beep();
} else

3
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
View file

@ -81,6 +81,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Feb.02, 2015 #13372 djingtao Change from GMT time to local time for "Revise" field
* May 15, 2015 4380 skorolev Added issuanceStage and issuanceFlow text fields.
* Jul 06, 2015 #14104 lbousaidi increased textlimit to 15
* Nov 30, 2015 14228 wkwock Update remark limit to 510.
*
* </pre>
*
@ -332,7 +333,7 @@ public class RiverGageDlg extends CaveSWTDialog implements
/**
* maximum number of character allowed in the remark text box
*/
private final int MAX_REMARK_CHAR = 255;
private final int MAX_REMARK_CHAR = 510;
/**
* Issuance Stage text control

3
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/cresthistory/CrestHistoryDlg.java
View file

@ -75,6 +75,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Dec 10, 2014 16061 lbousaidi set the crest time to the correct value for a
* new record,also fixed the sorting to match the correct
* timecrest.
* Nov 30, 2015 14228 wkwock Update remark limit to 160.
*
* </pre>
*
@ -239,7 +240,7 @@ public class CrestHistoryDlg extends CaveSWTDialog implements
/**
* maximum number of character allowed in the remark text box
*/
private final int MAX_REMARK_CHAR = 80;
private final int MAX_REMARK_CHAR = 160;
/**
* The valid time set by the last call to verifiedTime().

9
deltaScripts/16.2.2/ModifyTables.sql Normal file
View file

@ -0,0 +1,9 @@
--Double the remarks sections in the following tables:
-- location, riverstat, benchmark, gage, crest(cremark), lowwater(lwrem)
ALTER TABLE lowwater ALTER COLUMN lwrem TYPE character varying(160);
ALTER TABLE crest ALTER COLUMN cremark TYPE character varying(160);
ALTER TABLE gage ALTER COLUMN remark TYPE character varying(510);
ALTER TABLE benchmark ALTER COLUMN remark TYPE character varying(510);
ALTER TABLE riverstat ALTER COLUMN remark TYPE character varying(510);
ALTER TABLE location ALTER COLUMN lremark TYPE character varying(510);