Issue #2164 - fix Windows build of CAVE
Former-commit-id:73907524e6
[formerlyd65b50b416
] [formerlyd573869ffb
] [formerly73907524e6
[formerlyd65b50b416
] [formerlyd573869ffb
] [formerly40e8ca6886
[formerlyd573869ffb
[formerly 2947f7d48845927b809bba76f05c5feaea0a9104]]]] Former-commit-id:40e8ca6886
Former-commit-id:8b754c6142
[formerlydef237bc42
] [formerly 02541b07e7535c9bb392c75887192ba3c9a1eca3 [formerlycb82993602
]] Former-commit-id: 499a755d616fc48ac1ddbed1b854356bfa6d642e [formerly48235ce65c
] Former-commit-id:dcd0076c95
This commit is contained in:
parent
50dc8bbb13
commit
e04d275b37
1 changed files with 8 additions and 4 deletions
|
@ -56,6 +56,9 @@ import com.raytheon.viz.aviation.resource.ResourceConfigMgr.ResourceTag;
|
||||||
* foreground color
|
* foreground color
|
||||||
* 16 Aug 2013 #2256 lvenable Fixed font array out of bounds issue that may
|
* 16 Aug 2013 #2256 lvenable Fixed font array out of bounds issue that may
|
||||||
* occasionally occur.
|
* occasionally occur.
|
||||||
|
* 30 Aug 2013 #2164 bkowal Add default case statement for MSFT Windows
|
||||||
|
* Java. Replaced platform-dependent code with
|
||||||
|
* code that is not platform-dependent.
|
||||||
*
|
*
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -324,8 +327,8 @@ public class ResourceDataManager {
|
||||||
*/
|
*/
|
||||||
if (stringArray == null || stringArray.length < 3) {
|
if (stringArray == null || stringArray.length < 3) {
|
||||||
FontData fd = display.getSystemFont().getFontData()[0];
|
FontData fd = display.getSystemFont().getFontData()[0];
|
||||||
defaultFont = new Font(display, new FontData(fd.name,
|
defaultFont = new Font(display, new FontData(fd.getName(),
|
||||||
(int) fd.height, fd.style));
|
fd.getHeight(), fd.getStyle()));
|
||||||
} else {
|
} else {
|
||||||
defaultFont = new Font(display, new FontData(stringArray[0],
|
defaultFont = new Font(display, new FontData(stringArray[0],
|
||||||
Integer.valueOf(stringArray[1]),
|
Integer.valueOf(stringArray[1]),
|
||||||
|
@ -838,9 +841,10 @@ public class ResourceDataManager {
|
||||||
|
|
||||||
case EntryFont:
|
case EntryFont:
|
||||||
return entryFont;
|
return entryFont;
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Color getAlertLevel0Color() {
|
public Color getAlertLevel0Color() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue