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

Merge "Issue #1193 Fixed sampling resource input handler so it is added at higher priority than tools" into development

Browse source 
Former-commit-id: ec3895d13b [formerly ec3895d13b [formerly 975f01ff27b51ddc618154206a820749daf88bf9]]
Former-commit-id: fdebede263
Former-commit-id: 966332deab
This commit is contained in:
Nate Jensen 2012-09-19 16:16:35 -05:00 • committed by Gerrit Code Review
commit 315ed1b4c9
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/sampling/SamplingResource.java
View file

@ -148,8 +148,8 @@ public class SamplingResource extends
protected void initInternal(IGraphicsTarget target) throws VizException { protected void initInternal(IGraphicsTarget target) throws VizException {
IDisplayPaneContainer container = getResourceContainer(); IDisplayPaneContainer container = getResourceContainer();
if (container != null) { if (container != null) {
container container.registerMouseHandler(inputAdapter,
.registerMouseHandler(inputAdapter, InputPriority.RESOURCE); InputPriority.SYSTEM_RESOURCE);
} }
hoverFont = target.initializeFont(getClass().getName()); hoverFont = target.initializeFont(getClass().getName());
} }
@ -392,12 +392,10 @@ public class SamplingResource extends
String s = split[j]; String s = split[j];
if (s.length() + line.length() <= approxLenPerStr) { if (s.length() + line.length() <= approxLenPerStr) {
if (!s.isEmpty()) { if (!s.isEmpty()) {
if (j == split.length -1 && split[1].equalsIgnoreCase("=")) if (j == split.length - 1
{ && split[1].equalsIgnoreCase("=")) {
line = split[split.length - 1]; line = split[split.length - 1];
} } else {
else
{
line += " " + s; line += " " + s;
} }
} else { } else {