Révision 3160
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java (revision 3160) | ||
---|---|---|
46 | 46 |
import org.txm.utils.logger.Log; |
47 | 47 |
|
48 | 48 |
public class EditionPanel extends BrowserViewer implements ISelectionProvider { |
49 |
|
|
50 |
|
|
49 |
|
|
51 | 50 |
private ProgressListener progresslistener; |
52 | 51 |
|
53 | 52 |
// private List<String> wordids; |
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/CommandLink.java (revision 3160) | ||
---|---|---|
12 | 12 |
|
13 | 13 |
Browser browser; |
14 | 14 |
|
15 |
Object ret; |
|
16 |
|
|
15 | 17 |
TXMEditor<? extends TXMResult> editor; |
16 | 18 |
|
17 | 19 |
CommandLink(TXMEditor<? extends TXMResult> editor, Browser browser) { |
... | ... | |
21 | 23 |
} |
22 | 24 |
|
23 | 25 |
@Override |
24 |
public Object function(Object[] arguments) { |
|
26 |
public synchronized Object function(Object[] arguments) {
|
|
25 | 27 |
if (editor != null) { |
26 | 28 |
try { // TODO add option (or another browser command) to not force activated editor |
27 | 29 |
editor.getSite().getPage().activate(editor); |
... | ... | |
30 | 32 |
System.out.println(e); |
31 | 33 |
} |
32 | 34 |
} |
33 |
return SynopticEditionEditor.callTXMCommand(arguments); |
|
35 |
ret = null; |
|
36 |
browser.getDisplay().asyncExec(new Runnable() { |
|
37 |
|
|
38 |
@Override |
|
39 |
public void run() { |
|
40 |
ret = SynopticEditionEditor.callTXMCommand(arguments); |
|
41 |
} |
|
42 |
}); |
|
43 |
return ret; |
|
34 | 44 |
} |
35 | 45 |
} |
Formats disponibles : Unified diff