Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin/nature PythonNature.java,1.37,1.38
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-03-22 11:17:23
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22005/src/org/python/pydev/plugin/nature Modified Files: PythonNature.java Log Message: Index: PythonNature.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/PythonNature.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** PythonNature.java 17 Mar 2006 12:54:39 -0000 1.37 --- PythonNature.java 22 Mar 2006 11:17:18 -0000 1.38 *************** *** 85,89 **** * We have to know if it has already been initialized. */ ! private boolean initialized; /** --- 85,94 ---- * We have to know if it has already been initialized. */ ! private boolean initializationStarted; ! ! /** ! * We have to know if it has already been initialized. ! */ ! private boolean initializationFinished; /** *************** *** 211,216 **** private void init() { final PythonNature nature = this; ! if (initialized == false) { ! initialized = true; Job codeCompletionLoadJob = new Job("Pydev code completion") { --- 216,221 ---- private void init() { final PythonNature nature = this; ! if (initializationStarted == false) { ! initializationStarted = true; Job codeCompletionLoadJob = new Job("Pydev code completion") { *************** *** 259,262 **** --- 264,268 ---- } } + initializationFinished = true; jobProgressComunicator.done(); return Status.OK_STATUS; *************** *** 351,355 **** PydevPlugin.log(e); } ! //end task jobProgressComunicator.done(); --- 357,362 ---- PydevPlugin.log(e); } ! ! initializationFinished = true; //end task jobProgressComunicator.done(); *************** *** 364,368 **** * @return Returns the completionsCache. */ ! public ICodeCompletionASTManager getAstManager() { return astManager; } --- 371,388 ---- * @return Returns the completionsCache. */ ! public ICodeCompletionASTManager getAstManager() { ! if(astManager == null){ ! //this is needed because it may not be restarted already... ! //also, this will only happen when initializing eclipse with some editors already open ! ! for(int i=0; i<10 && astManager == null && !initializationFinished; i++){ //we will wait 10 seconds for it ! try { ! Thread.sleep(1000); ! } catch (Exception e) { ! e.printStackTrace(); ! } ! } ! } ! return astManager; } |