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

Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development

Browse source 
Former-commit-id: 4e60fa682d [formerly 1e50b3a0e8 [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]
Former-commit-id: 1e50b3a0e8
Former-commit-id: f5ebeb1330
This commit is contained in:
Nate Jensen 2013-02-26 13:46:30 -06:00 • committed by Gerrit Code Review
commit 5ecc23350c
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
View file

@ -1856,6 +1856,20 @@ public class ReferenceSetManager implements IReferenceSetManager,
*/
@Override
public void spatialEditorTimeChanged(Date date) {
evaluateActiveRefSet();
IPythonJobListener<ReferenceData> listener = new IPythonJobListener<ReferenceData>() {
@Override
public void jobFailed(Throwable e) {
statusHandler.handle(Priority.PROBLEM,
"Unable to run QueryScript job", e);
}
@Override
public void jobFinished(ReferenceData result) {
if (!result.getGrid().equals(activeRefSet.getGrid())) {
setActiveRefSet(result);
}
}
};
evaluateActiveRefSet(listener);
}
}

18
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
View file

@ -859,7 +859,7 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
IPythonExecutor<QueryScript, ReferenceData> executor = new QueryScriptExecutor(
"evaluate", argMap);
IPythonJobListener<Object> listener = new IPythonJobListener<Object>() {
IPythonJobListener<ReferenceData> listener = new IPythonJobListener<ReferenceData>() {
@Override
public void jobFailed(Throwable e) {
statusHandler.handle(Priority.PROBLEM,
@ -867,12 +867,16 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
}
@Override
public void jobFinished(Object result) {
ReferenceData newRef = (ReferenceData) result;
activeDisplay.setText(s);
refSetMgr.incomingRefSet(newRef, RefSetMode.USE_CURRENT);
addToHistory(s);
queryField.setText("");
public void jobFinished(final ReferenceData result) {
VizApp.runAsync(new Runnable() {
public void run() {
activeDisplay.setText(s);
refSetMgr
.incomingRefSet(result, RefSetMode.USE_CURRENT);
addToHistory(s);
queryField.setText("");
};
});
}
};
try {