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

ASM #18522 - TextWS: FWM product converts commas into three dots (...).

Browse source 
Change-Id: I70021085a560c769cb6fe126e2690681d8cd0644

Former-commit-id: da891cb519ac13885e2edf82156d04042de5895f
This commit is contained in:
Michael Gamazaychikov 2016-01-15 13:37:23 -05:00
parent 9dfa998295
commit 3801978f1c
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
View file

@ -353,13 +353,13 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
* 8Jul2015 DR 15044 dhuffman Implemented tabbing and tabs to spaces.
* Sep 29 2015 4899 rferrel Do not send product while in operational mode and
* simulated time.
* 07Oct2015 RM 18132 D. Friedman Exlucde certain phensigs from automatic ETN incrementing.
* 07Oct2015 RM 18132 D. Friedman Exclude certain phensigs from automatic ETN incrementing.
* 19Nov2015 5141 randerso Replace commas with ellipses if product not enabled for
* mixed case transmission
* 10Dec2015 5206 randerso Replace commas with ellipses only in WarnGen products
* 6Jan2016    RM18452   mgamazaychikov Fix NPE for null product in enterEditor
* 06Jan2016 5225 randerso Fix problem with mixed case not getting converted to upper case
* when multiple text editors are open on the same product.
* 6Jan2016 RM18452 mgamazaychikov Fix NPE for null product in enterEditor
*
* </pre>
*
@ -4243,14 +4243,12 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
// section
setCurrentHeaderAndBody();
// if product a WarnGen product and is not enabled for mixed case
// if product is a WarnGen product and is not enabled for mixed case
// transmission, replace all commas with ellipses
if (product != null) {
if (warngenPils.contains(product.getNnnid())
&& !MixedCaseProductSupport.isMixedCase(product.getNnnid())) {
textEditor.setText(textEditor.getText().replaceAll(", {0,1}",
"..."));
}
if ((product != null) && warngenPils.contains(product.getNnnid())
&& !MixedCaseProductSupport.isMixedCase(product.getNnnid())) {
textEditor.setText(textEditor.getText()
.replaceAll(", {0,1}", "..."));
}
// Mark the uneditable warning text
@ -4393,11 +4391,11 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
textEditor.setText(originalText);
}
// if product is not enabled for mixed case transmission,
// replace all commas with ellipses
// if product is a WarnGen product and is not enabled for mixed case
// transmission, replace all commas with ellipses
StdTextProduct product = TextDisplayModel.getInstance()
.getStdTextProduct(token);
if ((product != null)
if ((product != null) && warngenPils.contains(product.getNnnid())
&& !MixedCaseProductSupport.isMixedCase(product.getNnnid())) {
textEditor.setText(textEditor.getText()
.replaceAll(", {0,1}", "..."));
@ -7123,9 +7121,10 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
textEditor.append(textProduct);
// if product is not enabled for mixed case transmission,
// replace all commas with ellipses
if (!MixedCaseProductSupport.isMixedCase(product.getNnnid())) {
// if product is a WarnGen product and is not enabled for mixed case
// transmission, replace all commas with ellipses
if (warngenPils.contains(product.getNnnid())
&& !MixedCaseProductSupport.isMixedCase(product.getNnnid())) {
textEditor.setText(textEditor.getText()
.replaceAll(", {0,1}", "..."));
}