[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion PyCodeCompletion.java, 1.8, 1.9 PyCodeCompletionInitializer.java, 1.2, 1.3 PyCodeCompletionPreferencesPage.java, 1.3, 1.4

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10036/src_completions/org/python/pydev/editor/codecompletion

Modified Files:
	PyCodeCompletion.java PyCodeCompletionInitializer.java 
	PyCodeCompletionPreferencesPage.java 
Log Message:
Synching with aptana svn repo for release 1.3.22 (see http://pydev.sourceforge.net/developers.html)

Index: PyCodeCompletionInitializer.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/PyCodeCompletionInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyCodeCompletionInitializer.java	28 Sep 2008 12:45:42 -0000	1.2
--- PyCodeCompletionInitializer.java	3 Oct 2008 00:43:54 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  import org.eclipse.core.runtime.preferences.DefaultScope;
  import org.osgi.service.prefs.Preferences;
+ import org.python.pydev.logging.PyLoggingPreferencesPage;
  import org.python.pydev.plugin.PydevPlugin;
  
***************
*** 22,27 ****
          node.putInt(PyCodeCompletionPreferencesPage.AUTOCOMPLETE_DELAY, PyCodeCompletionPreferencesPage.DEFAULT_AUTOCOMPLETE_DELAY);
          node.putBoolean(PyCodeCompletionPreferencesPage.AUTOCOMPLETE_ON_PAR, PyCodeCompletionPreferencesPage.DEFAULT_AUTOCOMPLETE_ON_PAR);
-         node.putBoolean(PyCodeCompletionPreferencesPage.DEBUG_CODE_COMPLETION, PyCodeCompletionPreferencesPage.DEFAULT_DEBUG_CODE_COMPLETION);
          node.putInt(PyCodeCompletionPreferencesPage.ARGUMENTS_DEEP_ANALYSIS_N_CHARS, PyCodeCompletionPreferencesPage.DEFAULT_ARGUMENTS_DEEP_ANALYSIS_N_CHARS);
      }
  
--- 23,30 ----
          node.putInt(PyCodeCompletionPreferencesPage.AUTOCOMPLETE_DELAY, PyCodeCompletionPreferencesPage.DEFAULT_AUTOCOMPLETE_DELAY);
          node.putBoolean(PyCodeCompletionPreferencesPage.AUTOCOMPLETE_ON_PAR, PyCodeCompletionPreferencesPage.DEFAULT_AUTOCOMPLETE_ON_PAR);
          node.putInt(PyCodeCompletionPreferencesPage.ARGUMENTS_DEEP_ANALYSIS_N_CHARS, PyCodeCompletionPreferencesPage.DEFAULT_ARGUMENTS_DEEP_ANALYSIS_N_CHARS);
+         
+         node.putBoolean(PyLoggingPreferencesPage.DEBUG_CODE_COMPLETION, PyLoggingPreferencesPage.DEFAULT_DEBUG_CODE_COMPLETION);
+         node.putBoolean(PyLoggingPreferencesPage.DEBUG_ANALYSIS_REQUESTS, PyLoggingPreferencesPage.DEFAULT_DEBUG_ANALYSIS_REQUESTS);
      }
  

Index: PyCodeCompletionPreferencesPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/PyCodeCompletionPreferencesPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyCodeCompletionPreferencesPage.java	28 Sep 2008 12:45:42 -0000	1.3
--- PyCodeCompletionPreferencesPage.java	3 Oct 2008 00:43:54 -0000	1.4
***************
*** 45,51 ****
      public static final boolean DEFAULT_AUTOCOMPLETE_ON_PAR = false;
      
-     public static final String DEBUG_CODE_COMPLETION = "DEBUG_CODE_COMPLETION";
-     public static final boolean DEFAULT_DEBUG_CODE_COMPLETION = false;
-     
      public static final String ARGUMENTS_DEEP_ANALYSIS_N_CHARS = "DEEP_ANALYSIS_N_CHARS";
      public static final int DEFAULT_ARGUMENTS_DEEP_ANALYSIS_N_CHARS = 1;
--- 45,48 ----
***************
*** 100,117 ****
                  AUTOCOMPLETE_ON_ALL_ASCII_CHARS, "Autocomplete on all letter chars and '_'?", p));
          
- 
-         addField(new BooleanFieldEditor(
-                 DEBUG_CODE_COMPLETION, "Debug code completion?", p));
-         
-     }
-     
-     @Override
-     public boolean performOk() {
-         boolean ret = super.performOk();
-         PyCodeCompletion.DEBUG_CODE_COMPLETION = isToDebugCodeCompletion();
-         return ret;
      }
      
- 
      /*
       * (non-Javadoc)
--- 97,102 ----
***************
*** 151,161 ****
      }
      
-     public static boolean isToDebugCodeCompletion() {
-         if(PydevPlugin.getDefault() == null){//testing
-             return false;
-         }
-         return PydevPrefs.getPreferences().getBoolean(PyCodeCompletionPreferencesPage.DEBUG_CODE_COMPLETION);
-     }
- 
      public static int getAutocompleteDelay() {
          return PydevPrefs.getPreferences().getInt(PyCodeCompletionPreferencesPage.AUTOCOMPLETE_DELAY);
--- 136,139 ----

Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PyCodeCompletion.java	28 Sep 2008 12:45:42 -0000	1.8
--- PyCodeCompletion.java	3 Oct 2008 00:43:54 -0000	1.9
***************
*** 43,46 ****
--- 43,47 ----
  import org.python.pydev.editor.codecompletion.revisited.visitors.FindScopeVisitor;
  import org.python.pydev.editor.codecompletion.shell.AbstractShell;
+ import org.python.pydev.logging.PyLoggingPreferencesPage;
  import org.python.pydev.parser.PyParser;
  import org.python.pydev.parser.jython.SimpleNode;
***************
*** 68,72 ****
       * It is kept updated from the Preferences Page
       */
!     public static volatile boolean DEBUG_CODE_COMPLETION = PyCodeCompletionPreferencesPage.isToDebugCodeCompletion();
      
      /**
--- 69,73 ----
       * It is kept updated from the Preferences Page
       */
!     public static volatile boolean DEBUG_CODE_COMPLETION = PyLoggingPreferencesPage.isToDebugCodeCompletion();
      
      /**