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

Omaha #3163 Fix NPE when styleless strings are sent to 14.3

Browse source 
Former-commit-id: 4080f9b50b [formerly d2997f9fc0] [formerly 1f8f612d3a] [formerly 4080f9b50b [formerly d2997f9fc0] [formerly 1f8f612d3a] [formerly 7245544e1f [formerly 1f8f612d3a [formerly 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5]]]]
Former-commit-id: 7245544e1f
Former-commit-id: 5e27e70ef4 [formerly 1282f74317] [formerly 72a46674d2bd2b673c6f6d5144b572dcbdcb7fe9 [formerly 59b5076a66]]
Former-commit-id: b449ad4217f727e43e6cf545dbeab7cbd036c1b5 [formerly 991dff52d2]
Former-commit-id: 307f065952
This commit is contained in:
Ben Steffensmeier 2014-06-13 16:49:05 -05:00
parent 96ad173d73
commit 540dd75437
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/strings/DrawStringEvent.java
View file

@ -114,7 +114,6 @@ public class DrawStringEvent extends AbstractRemoteGraphicsRenderEvent {
@Deprecated
private RGB boxColor;
/**
* @deprecated Once backwards compatibility is not needed switch to
* {@link #textStyleColorMap}
@ -249,6 +248,9 @@ public class DrawStringEvent extends AbstractRemoteGraphicsRenderEvent {
.get(TextStyle.DROP_SHADOW);
}
}
} else if (!SUPPORT_STYLE_COLORS) {
/* No TextStyle 14.3 is an empty set, not null. */
this.textStyles = EnumSet.noneOf(TextStyle.class);
}
}
@ -257,7 +259,7 @@ public class DrawStringEvent extends AbstractRemoteGraphicsRenderEvent {
DrawableString ds = new DrawableString(text, colors);
ds.basics.alpha = alpha;
ds.basics.xOrColors = xOrColors;
ds.horizontalAlignment = horizontalAlignment;
ds.verticallAlignment = verticalAlignment;
ds.magnification = magnification;
@ -267,9 +269,9 @@ public class DrawStringEvent extends AbstractRemoteGraphicsRenderEvent {
for (Entry<TextStyle, RGB> entry : textStyleColorMap.entrySet()) {
ds.addTextStyle(entry.getKey(), entry.getValue());
}
}else{
if(textStyles != null){
for(TextStyle style : textStyles){
} else {
if (textStyles != null) {
for (TextStyle style : textStyles) {
if (style.equals(TextStyle.BOXED)) {
ds.addTextStyle(style);
ds.addTextStyle(TextStyle.BLANKED, boxColor);
@ -280,6 +282,8 @@ public class DrawStringEvent extends AbstractRemoteGraphicsRenderEvent {
ds.addTextStyle(style);
}
}
} else {
System.out.println();
}
}
return ds;