diff --git a/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/AlertViewPreferencePage.java b/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/AlertViewPreferencePage.java index b91fdb69b6..38c8738c10 100644 --- a/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/AlertViewPreferencePage.java +++ b/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/AlertViewPreferencePage.java @@ -53,6 +53,8 @@ import com.raytheon.uf.viz.alertview.ui.view.AlertTable; * Date Ticket# Engineer Description * ------------- -------- --------- -------------------------- * Jun 25, 2015 4474 bsteffen Initial creation + * Aug 06, 2015 4693 bsteffen Update text and add tooltips. + * * * * @@ -76,12 +78,18 @@ public class AlertViewPreferencePage extends PreferencePage implements Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout(2, false)); - new Label(composite, SWT.NONE).setText("Auto Open Priority: "); + new Label(composite, SWT.NONE) + .setText("Automatically show AlertView for alerts with priority: "); openFilterCombo = new PriorityFilterCombo(composite); + openFilterCombo + .setToolTipText("Alerts with this priority will cause the AlertView to open automatically."); new Label(composite, SWT.NONE) - .setText("Hide Duplicate Interval(seconds): "); + .setText("Hide Duplicate Message Interval (seconds): "); intervalText = new Text(composite, SWT.SINGLE | SWT.BORDER); + intervalText + .setToolTipText("When multiple identical alerts arrive within this many seconds then only one alert is displayed."); + GridData gridData = new GridData(); gridData.widthHint = 30; intervalText.setLayoutData(gridData); diff --git a/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PopupPreferencePage.java b/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PopupPreferencePage.java index e4ab1236c8..2294d540d5 100644 --- a/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PopupPreferencePage.java +++ b/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PopupPreferencePage.java @@ -19,9 +19,6 @@ **/ package com.raytheon.uf.viz.alertview.ui.prefs; -import java.util.Arrays; -import java.util.List; - import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -47,6 +44,7 @@ import com.raytheon.uf.viz.alertview.prefs.PreferenceFile; * Date Ticket# Engineer Description * ------------- -------- --------- -------------------------- * Jun 25, 2015 4474 bsteffen Initial creation + * Aug 06, 2015 4693 bsteffen Update text and add tooltips. * * * @@ -56,13 +54,6 @@ import com.raytheon.uf.viz.alertview.prefs.PreferenceFile; public class PopupPreferencePage extends PreferencePage implements PreferenceFile.Listener { - private static final List SIZES = Arrays.asList("Small", "Medium", - "Large"); - - private static final int BASE_WIDTH = 500; - - private static final int BASE_HEIGHT = 50; - protected PreferenceFile preferenceFile; protected PriorityFilterCombo filterCombo; @@ -71,17 +62,19 @@ public class PopupPreferencePage extends PreferencePage implements protected Combo positionCombo; - protected Combo sizeCombo; - @Override protected Control createContents(Composite parent) { preferenceFile = PopUpPreferences.load(this); Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout(2, false)); - new Label(composite, SWT.NONE).setText("Popup Priority: "); + new Label(composite, SWT.NONE).setText("Popup alerts with priority: "); filterCombo = new PriorityFilterCombo(composite); - new Label(composite, SWT.NONE).setText("Duration(seconds): "); + filterCombo + .setToolTipText("A popup window will appear when alerts occur with this priority."); + + new Label(composite, SWT.NONE).setText("Duration (seconds): "); durationText = new Text(composite, SWT.SINGLE | SWT.BORDER); + durationText.setToolTipText("Time the popup is displayed."); GridData gridData = new GridData(); gridData.widthHint = 30; durationText.setLayoutData(gridData); @@ -91,11 +84,6 @@ public class PopupPreferencePage extends PreferencePage implements positionCombo.add(position.getPrettyName()); } - new Label(composite, SWT.NONE).setText("Size: "); - sizeCombo = new Combo(composite, SWT.READ_ONLY); - for (String size : SIZES) { - sizeCombo.add(size); - } populate(); return composite; } @@ -107,23 +95,6 @@ public class PopupPreferencePage extends PreferencePage implements .setText(Double.toString(preferences.getDuration() / 1000.0)); positionCombo.select(positionCombo.indexOf(preferences.getCorner() .getPrettyName())); - boolean sizeFound = false; - for (int i = 0; i < SIZES.size(); i += 1) { - if (preferences.getHeight() == BASE_HEIGHT + 25 * i - && preferences.getWidth() == BASE_WIDTH + 50 * i) { - sizeCombo.select(i); - sizeFound = true; - break; - } - } - if (!sizeFound) { - if (sizeCombo.getItemCount() > SIZES.size()) { - sizeCombo.remove(SIZES.size()); - } - sizeCombo.add(preferences.getWidth() + " x " - + preferences.getHeight()); - sizeCombo.select(SIZES.size()); - } } @Override @@ -141,11 +112,6 @@ public class PopupPreferencePage extends PreferencePage implements } newPrefs.setDuration((int) (Double.parseDouble(durationText.getText()) * 1000)); newPrefs.setCorner(PopUpCorner.fromPrettyName(positionCombo.getText())); - int index = SIZES.indexOf(sizeCombo.getText()); - if (index >= 0) { - newPrefs.setWidth(BASE_WIDTH + 50 * index); - newPrefs.setHeight(BASE_HEIGHT + 25 * index); - } preferenceFile.write(newPrefs); return super.performOk(); } diff --git a/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PriorityFilterCombo.java b/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PriorityFilterCombo.java index 65534e7c25..42f525b06d 100644 --- a/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PriorityFilterCombo.java +++ b/cave/com.raytheon.uf.viz.alertview/src/com/raytheon/uf/viz/alertview/ui/prefs/PriorityFilterCombo.java @@ -40,6 +40,7 @@ import com.raytheon.uf.viz.alertview.filter.FilterManager; * Date Ticket# Engineer Description * ------------- -------- --------- -------------------------- * Jun 25, 2015 4474 bsteffen Initial creation + * Aug 06, 2015 4693 bsteffen Add setToolTipText. * * * @@ -63,6 +64,10 @@ public class PriorityFilterCombo { } } + public void setToolTipText(String string) { + combo.setToolTipText(string); + } + public void setSelection(String filter) { for (Entry entry : MAPPING.entrySet()) { if (filter.equals(entry.getValue())) { diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/AdministrationData.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/AdministrationData.java index 3e67c87ed0..069aafe9f6 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/AdministrationData.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/AdministrationData.java @@ -36,7 +36,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants; * ------------ ---------- ----------- -------------------------- * Nov 11, 2008 1697 askripsky Initial creation * Nov 21, 2008 askripsky Changed to implement IHydroDBData to work with new DB access. - * + * Aug 07, 2015 4500 rjpeter Fix type case. * * * @author askripsky @@ -129,8 +129,8 @@ public class AdministrationData extends HydroDBData implements IHydroDBData { setTenYearDate(getDBValue("tenyr", data, dataMap, (Date) null)); setOneYearDate(getDBValue("oneyr", data, dataMap, (Date) null)); setHsa(getDBValue("hsa", data, dataMap, "")); - setHsaNumber(getDBValue("hsa_num", data, dataMap, - HydroConstants.MISSING_VALUE)); + setHsaNumber((getDBValue("hsa_num", data, dataMap, + (short) HydroConstants.MISSING_VALUE)).intValue()); setHbPassword(getDBValue("hb_password", data, dataMap, "")); } diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataAdjustFactorData.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataAdjustFactorData.java index 4dbe1a0894..d85abf762b 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataAdjustFactorData.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataAdjustFactorData.java @@ -32,7 +32,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Dec 15, 2008 1787 askripsky Initial creation - * + * Aug 07, 2015 4500 rjpeter Fix type case. * * * @author askripsky @@ -102,7 +102,7 @@ public class DataAdjustFactorData extends HydroDBData implements IHydroDBData { setLid(getDBValue("lid", data, dataMap, "")); setPe(getDBValue("pe", data, dataMap, "")); setDuration(getDBValue("dur", data, dataMap, - HydroConstants.MISSING_VALUE)); + (short) HydroConstants.MISSING_VALUE).intValue()); setTypeSource(getDBValue("ts", data, dataMap, "")); setExtremum(getDBValue("extremum", data, dataMap, "")); setDivisor(getDBValue("divisor", data, dataMap, Double diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataIngestFilterData.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataIngestFilterData.java index b7d20125f5..f78925c24d 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataIngestFilterData.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataIngestFilterData.java @@ -32,7 +32,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Dec 12, 2008 1787 askripsky Initial creation - * + * Aug 07, 2015 4500 rjpeter Fix type case. * * * @author askripsky @@ -104,11 +104,11 @@ public class DataIngestFilterData extends HydroDBData implements IHydroDBData { setLid(getDBValue("lid", data, dataMap, "")); setPe(getDBValue("pe", data, dataMap, "")); setDuration(getDBValue("dur", data, dataMap, - HydroConstants.MISSING_VALUE)); + (short) HydroConstants.MISSING_VALUE).intValue()); setTypeSource(getDBValue("ts", data, dataMap, "")); setExtremum(getDBValue("extremum", data, dataMap, "")); setTsRank(getDBValue("ts_rank", data, dataMap, - HydroConstants.MISSING_VALUE)); + (short) HydroConstants.MISSING_VALUE).intValue()); setIngest(getDBValue("ingest", data, dataMap, "")); setOfsInput(getDBValue("ofs_input", data, dataMap, "")); setStg2Input(getDBValue("stg2_input", data, dataMap, "")); diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataLimitData.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataLimitData.java index 9f37c3b2d7..a1fbc3ce63 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataLimitData.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/DataLimitData.java @@ -34,7 +34,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants; * ------------ ---------- ----------- -------------------------- * Oct 22, 2008 askripsk Initial creation * Dec 8, 2008 1744 askripsk Changed to implement IHydroDBData - * + * Aug 07, 2015 4500 rjpeter Fix type case. * * * @author askripsk @@ -152,7 +152,7 @@ public class DataLimitData extends HydroDBData implements IHydroDBData { // initDateFormat(); setPe(getDBValue("pe", data, dataMap, "")); - setDur(getDBValue("dur", data, dataMap, HydroConstants.MISSING_VALUE)); + setDur(getDBValue("dur", data, dataMap, (short) HydroConstants.MISSING_VALUE).intValue()); setMonthDayStart(getDBValue("monthdaystart", data, dataMap, "")); setMonthDayEnd(getDBValue("monthdayend", data, dataMap, "")); setGrossRangeMin(getDBValue("gross_range_min", data, dataMap, Double diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RadarLocData.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RadarLocData.java index d8fce087ef..e487087466 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RadarLocData.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RadarLocData.java @@ -32,7 +32,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 9, 2008 1802 askripsky Initial creation - * + * Aug 07, 2015 4500 rjpeter Fix type case. * * * @author askripsky @@ -117,7 +117,7 @@ public class RadarLocData extends HydroDBData implements IHydroDBData { setName(getDBValue("name", data, dataMap, "")); setRadarPrefix(getDBValue("radid_prefix", data, dataMap, "")); setRadarNumber(getDBValue("radar_num", data, dataMap, - HydroConstants.MISSING_VALUE)); + (short) HydroConstants.MISSING_VALUE).intValue()); setState(getDBValue("state", data, dataMap, "")); setLatitude(getDBValue("lat", data, dataMap, Double .valueOf(HydroConstants.MISSING_VALUE))); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm index 3ae39c9d28..b17b2b3a86 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm @@ -866,7 +866,7 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} THIS IS A TEST MESSAGE. ## #end -#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}), # +#thirdBullet(${dateUtil},${event},${timeFormat},${localtimezone},${secondtimezone}), ## ${reportType} located ## ##Many of the variables passed below are controlled by config.vm #if(${stormType} == "line") diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarningFollowup.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarningFollowup.vm index 6317210173..dd2f0e8d89 100755 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarningFollowup.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarningFollowup.vm @@ -214,7 +214,7 @@ ${area.name}... ## Section for end of warning statements. Replaced default wording with ## a better defined reason for the end to the warning. ####################################################################### -#set($canwarning = "The ${eventType} !** WEAKENED / MOVED OUT OF THE WARNED AREA **! and no longer ${pose} a significant threat to boaters.") +#set($canwarning = "The ${eventType} !** weakened / moved out of the warned area **! and no longer ${pose} a significant threat to boaters.") #if(${list.contains(${bullets}, "weakenedWarnEnd")}) #set($canwarning = "The ${eventType} weakened and no longer ${pose} a significant threat to boaters.") #end