diff --git a/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java b/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java index 481573ae26..de2aaad49c 100644 --- a/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java +++ b/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java @@ -54,6 +54,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * ------------- -------- ----------- -------------------------- * Jan 20, 2014 2312 bsteffen Initial creation * Mar 10, 2014 2867 bsteffen Better frame range validation. + * Oct 28, 2014 3767 bsteffen Automatically change filename if selected + * format does not support all options. * * * @@ -412,13 +414,23 @@ public class ImageExportDialog extends CaveSWTDialog { } } if (!goodSuffix) { - MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK); - mb.setText("Invalid Suffix"); - mb.setMessage("The file extension(" + suffix + MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING + | SWT.YES | SWT.NO); + mb.setText("Incompatible Format"); + ImageFormat format = options.getImageFormat(); + mb.setMessage("The format(" + suffix + ") of the selected file is not valid for " - + options.getImageFormat().getDescription()); - mb.open(); - return false; + + format.getDescription() + + ". Would you like to continue and export the file in " + + format.getExtensions()[0] + " format?"); + int result = mb.open(); + if (result == SWT.YES) { + suffix = format.getExtensions()[0]; + path = path.substring(0, path.lastIndexOf('.') + 1) + suffix; + options.setFileLocation(new File(path)); + } else { + return false; + } } File file = options.getFileLocation(); diff --git a/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java b/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java index 70291c49dd..883324e242 100644 --- a/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java +++ b/cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java @@ -37,6 +37,7 @@ import com.raytheon.uf.viz.core.datastructure.LoopProperties; * ------------- -------- ----------- -------------------------- * Jan 20, 2014 2312 bsteffen Initial creation * Mar 10, 2014 2867 bsteffen Better frame range validation. + * Oct 28, 2014 3767 bsteffen Change default name to screenCapture.png * * * @@ -79,7 +80,7 @@ public class ImageExportOptions { } - private File fileLocation = new File("screenCapture.gif"); + private File fileLocation = new File("screenCapture.png"); private ImageFormat imageFormat = ImageFormat.SEQUENCE; diff --git a/cave/com.raytheon.uf.viz.spellchecker/localization/spelldict b/cave/com.raytheon.uf.viz.spellchecker/localization/spelldict index bfe5fe1e8f..316cf507cf 100644 --- a/cave/com.raytheon.uf.viz.spellchecker/localization/spelldict +++ b/cave/com.raytheon.uf.viz.spellchecker/localization/spelldict @@ -34923,14 +34923,6 @@ bistable bistro bistro's bistros -bitched -bitchier -bitchiest -bitchily -bitchiness -bitchiness's -bitching -bitchy biter's bitings bittern @@ -39696,8 +39688,6 @@ cockscomb cockscomb's cockscombs cockshies -cocksucker -cocksuckers cocksure cocky coco @@ -60609,7 +60599,6 @@ lepers leprechaun leprechaun's leprechauns -leprosy's leprous lepta lepton @@ -70881,7 +70870,6 @@ piscatorial pismire pismire's pismires -pissers pissoir pissoirs pistachio diff --git a/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java b/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java index 69684103a3..ff46195d94 100755 --- a/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java +++ b/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java @@ -79,6 +79,7 @@ import com.raytheon.uf.viz.spellchecker.jobs.SpellCheckJob; * 01Mar2010 4765 MW Fegan Moved from GFE plug-in. * 09/24/2014 #16693 lshi filter out swear words in spelling check * 10/23/2014 #3685 randerso Changes to support mixed case + * 10/30/2014 #16693 lshi Add more swear words to the filter * * * @@ -87,7 +88,9 @@ import com.raytheon.uf.viz.spellchecker.jobs.SpellCheckJob; * */ public class SpellCheckDlg extends Dialog implements ISpellingProblemCollector { - private static java.util.List swearWords = Arrays.asList("ASSHOLE"); + private static java.util.List swearWords = Arrays.asList("asshole", "asshole's", "assholes", + "bitch", "bitch's", "bitches", "leprosy", "gayest", + "shit", "piss", "pissed","psser","pisses","pissing","tits"); private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(SpellCheckDlg.class); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.xml old mode 100755 new mode 100644 index f2efcb3f43..bae8fecb87 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.xml @@ -16,6 +16,9 @@ Mike Dangelo 1/23/2014 added IC group to bottom of COR and EXT bullets (it's locked anyway, no need to have it at the top) Phil Kurimski 06-24-2014 Put types of warnings and IC back at the top (forecasters rely on this when choosing a con statement to determine what warning they are following up!) + Evan Bookbinder 10-31-2014 Changed "FLOOD WARNING FOR" to "FLOOD WARNING" for all parse and show strings where the flood type + is "Generic" + --> @@ -98,7 +101,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - + @@ -155,7 +158,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - + @@ -214,7 +217,7 @@ Must be paired with proper vm code (also commented out in arealFloodWarning.vm)! - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.xml old mode 100755 new mode 100644 index 9029cc2594..34a1b15f75 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.xml @@ -14,6 +14,8 @@ Phil Kurimski 06-24-2014 Put types of warnings and IC back at the top (forecasters rely on this when choosing a con statement to determine what warning they are following up!) Evan Bookbinder 10-24-2014 Fixed parseString for EXT for generic flooding + Evan Bookbinder 10-31-2014 Changed "FLOOD WARNING FOR" to "FLOOD WARNING" for all parse and show strings where the flood type + is "Generic" --> @@ -97,7 +99,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning - + @@ -119,7 +121,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning - + @@ -141,7 +143,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning - + @@ -201,7 +203,7 @@ Must be paired with proper vm code (which are commented out in arealFloodWarning - + diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec index b3d5e007f3..5fcb5a253d 100644 --- a/rpms/awips2.core/Installer.tools/component.spec +++ b/rpms/awips2.core/Installer.tools/component.spec @@ -8,7 +8,7 @@ Name: awips2-tools Summary: AWIPS II Tools Distribution Version: 1.8.5 -Release: 2.el6 +Release: 3.el6 Group: AWIPSII BuildRequires: awips2-python-h5py BuildRoot: /tmp