Merge "Issue #1193 Fixed sampling resource input handler so it is added at higher priority than tools" into development
Former-commit-id:5acf54de5f
[formerlyec3895d13b
] [formerly5acf54de5f
[formerlyec3895d13b
] [formerlyfdebede263
[formerly 975f01ff27b51ddc618154206a820749daf88bf9]]] Former-commit-id:fdebede263
Former-commit-id:c35d1f600e
[formerly966332deab
] Former-commit-id:315ed1b4c9
This commit is contained in:
commit
4dd479f65f
1 changed files with 9 additions and 11 deletions
|
@ -148,8 +148,8 @@ public class SamplingResource extends
|
|||
protected void initInternal(IGraphicsTarget target) throws VizException {
|
||||
IDisplayPaneContainer container = getResourceContainer();
|
||||
if (container != null) {
|
||||
container
|
||||
.registerMouseHandler(inputAdapter, InputPriority.RESOURCE);
|
||||
container.registerMouseHandler(inputAdapter,
|
||||
InputPriority.SYSTEM_RESOURCE);
|
||||
}
|
||||
hoverFont = target.initializeFont(getClass().getName());
|
||||
}
|
||||
|
@ -391,15 +391,13 @@ public class SamplingResource extends
|
|||
while (j < split.length) {
|
||||
String s = split[j];
|
||||
if (s.length() + line.length() <= approxLenPerStr) {
|
||||
if (!s.isEmpty()){
|
||||
if (j == split.length -1 && split[1].equalsIgnoreCase("="))
|
||||
{
|
||||
line = split[split.length-1];
|
||||
}
|
||||
else
|
||||
{
|
||||
line += " " + s;
|
||||
}
|
||||
if (!s.isEmpty()) {
|
||||
if (j == split.length - 1
|
||||
&& split[1].equalsIgnoreCase("=")) {
|
||||
line = split[split.length - 1];
|
||||
} else {
|
||||
line += " " + s;
|
||||
}
|
||||
} else {
|
||||
line += " ";
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue