[eclipse-pydev] 12/19: Merge tag 'upstream/3.0.0'

Jakub Adam xhaakon-guest at moszumanska.debian.org
Fri Nov 22 08:31:54 UTC 2013


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-pydev.

commit c1075ee275a6eb3404a37a1fe3f129b3597904c5
Merge: 14e21d8 20b55d6
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Nov 21 14:33:14 2013 +0100

    Merge tag 'upstream/3.0.0'
    
    Upstream version 3.0.0

 .travis.yml                                        |   82 +
 build.xml                                          |   16 +
 features/org.python.pydev.feature/feature.xml      |   40 +-
 features/org.python.pydev.feature/pom.xml          |    2 +-
 features/org.python.pydev.mylyn.feature/pom.xml    |    2 +-
 features/org.python.pydev.p2-repo/pom.xml          |   40 +-
 features/pom.xml                                   |    2 +-
 make_s3cfg.sh                                      |   11 +
 mvnts.sh                                           |   12 +
 plugins/com.python.pydev.analysis/.classpath       |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../com.python.pydev.analysis/META-INF/MANIFEST.MF |    6 +-
 plugins/com.python.pydev.analysis/pom.xml          |    4 +-
 .../analysis/AbstractAnalysisPreferences.java      |    2 +-
 .../com/python/pydev/analysis/AnalysisPlugin.java  |    2 +-
 .../analysis/AnalysisPreferenceInitializer.java    |    2 +-
 .../python/pydev/analysis/AnalysisPreferences.java |    2 +-
 .../CtxInsensitiveImportComplProposal.java         |   11 +-
 .../pydev/analysis/IAnalysisPreferences.java       |    2 +-
 .../python/pydev/analysis/IPyContextObserver.java  |    2 +-
 .../src/com/python/pydev/analysis/MarkerStub.java  |    2 +-
 .../python/pydev/analysis/OccurrencesAnalyzer.java |    2 +-
 .../python/pydev/analysis/PyContextActivator.java  |    4 +-
 .../PyContextActivatorViewCreatedObserver.java     |    2 +-
 .../analysis/actions/AdditionalInfoAndIInfo.java   |    2 +-
 .../analysis/actions/AnalyzeOnRequestSetter.java   |    2 +-
 .../analysis/actions/ForceCodeAnalysisOnTree.java  |    2 +-
 .../analysis/actions/GlobalsDialogFactory.java     |    2 +-
 .../actions/GlobalsTwoPaneElementSelector.java     |    2 +-
 .../actions/GlobalsTwoPanelElementSelector2.java   |    2 +-
 .../python/pydev/analysis/actions/MatchHelper.java |    2 +-
 .../analysis/actions/ModuleIInfoLabelProvider.java |    2 +-
 .../analysis/actions/NameIInfoLabelProvider.java   |    2 +-
 .../actions/NameIInfoStyledLabelProvider.java      |    2 +-
 .../pydev/analysis/actions/PyGlobalsBrowser.java   |    2 +-
 .../actions/PyGlobalsBrowserWorkbench.java         |    2 +-
 .../AbstractAdditionalDependencyInfo.java          |    2 +-
 .../AbstractAdditionalInfoWithBuild.java           |   82 +-
 .../AbstractAdditionalTokensInfo.java              |    2 +-
 .../analysis/additionalinfo/AbstractInfo.java      |    2 +-
 .../AdditionalInfoIntegrityChecker.java            |    2 +-
 .../AdditionalProjectInterpreterInfo.java          |    2 +-
 .../AdditionalSystemInterpreterInfo.java           |    2 +-
 .../pydev/analysis/additionalinfo/AttrInfo.java    |    2 +-
 .../pydev/analysis/additionalinfo/ClassInfo.java   |    2 +-
 .../pydev/analysis/additionalinfo/FuncInfo.java    |    2 +-
 .../pydev/analysis/additionalinfo/IInfo.java       |    2 +-
 .../pydev/analysis/additionalinfo/InfoFactory.java |    2 +-
 .../analysis/additionalinfo/InfoStrFactory.java    |    2 +-
 .../pydev/analysis/additionalinfo/ModInfo.java     |    2 +-
 .../pydev/analysis/additionalinfo/NameInfo.java    |    2 +-
 .../pydev/analysis/additionalinfo/TreeIO.java      |    2 +-
 .../builders/AdditionalInfoModulesObserver.java    |   11 +
 .../builders/InterpreterObserver.java              |   12 +
 .../dependencies/PyStructuralChange.java           |    2 +-
 .../builder/AbstractAnalysisBuilderRunnable.java   |    2 +-
 .../analysis/builder/AnalysisBuilderRunnable.java  |    2 +-
 .../builder/AnalysisBuilderRunnableFactory.java    |    2 +-
 .../builder/AnalysisBuilderRunnableForRemove.java  |    2 +-
 .../analysis/builder/AnalysisBuilderVisitor.java   |    2 +-
 .../analysis/builder/AnalysisParserObserver.java   |    2 +-
 .../pydev/analysis/builder/AnalysisRunner.java     |    2 +-
 .../ClearAnalysisMarkersPyEditListener.java        |    2 +-
 .../analysis/builder/IAnalysisBuilderRunnable.java |    2 +-
 .../analysis/builder/KeyForAnalysisRunnable.java   |    2 +-
 .../PreloadAdditionalInfoPyEditListener.java       |    2 +-
 .../AbstractAnalysisMarkersParticipants.java       |    2 +-
 .../ctrl_1/AnalysisMarkersParticipants.java        |    2 +-
 .../ctrl_1/DontAnalyzeFileMarkerParticipant.java   |    2 +-
 .../ctrl_1/IAnalysisMarkersParticipant.java        |    2 +-
 .../analysis/ctrl_1/IgnoreCompletionProposal.java  |    2 +-
 .../analysis/ctrl_1/IgnoreErrorParticipant.java    |    2 +-
 .../ctrl_1/UndefinedVariableFixParticipant.java    |    2 +-
 .../analysis/indexview/ElementWithChildren.java    |    2 +-
 .../analysis/indexview/ElementWithParent.java      |    2 +-
 .../pydev/analysis/indexview/ForcedLibGroup.java   |    2 +-
 .../pydev/analysis/indexview/ITreeElement.java     |    2 +-
 .../python/pydev/analysis/indexview/IndexRoot.java |    2 +-
 .../pydev/analysis/indexview/InterpreterGroup.java |    2 +-
 .../analysis/indexview/InterpretersGroup.java      |    2 +-
 .../pydev/analysis/indexview/LeafElement.java      |    2 +-
 .../indexview/MisconfigurationElement.java         |    2 +-
 .../pydev/analysis/indexview/NatureGroup.java      |    2 +-
 .../pydev/analysis/indexview/ProjectsGroup.java    |    2 +-
 .../analysis/indexview/PyIndexContentProvider.java |    2 +-
 .../pydev/analysis/indexview/PyIndexView.java      |    2 +-
 .../pydev/analysis/messages/AbstractMessage.java   |    2 +-
 .../pydev/analysis/messages/CompositeMessage.java  |    2 +-
 .../python/pydev/analysis/messages/IMessage.java   |    2 +-
 .../python/pydev/analysis/messages/Message.java    |    2 +-
 .../analysis/organizeimports/OrganizeImports.java  |    2 +-
 .../AbstractScopeAnalyzerVisitor.java              |  179 +-
 .../AstEntryScopeAnalysisConstants.java            |    2 +-
 .../scopeanalysis/AttributeReferencesVisitor.java  |    2 +-
 .../analysis/scopeanalysis/ScopeAnalysis.java      |    2 +-
 .../scopeanalysis/ScopeAnalyzerVisitor.java        |    2 +-
 .../ScopeAnalyzerVisitorForImports.java            |    2 +-
 .../ScopeAnalyzerVisitorWithoutImports.java        |    2 +-
 .../analysis/scopeanalysis/TokenMatching.java      |    2 +-
 .../InterpreterInfoBuilder.java                    |  186 +-
 .../python/pydev/analysis/tabnanny/TabNanny.java   |    2 +-
 .../pydev/analysis/ui/AnalysisPreferencesPage.java |    4 +-
 .../analysis/ui/AutoImportsPreferencesPage.java    |   33 +-
 .../pydev/analysis/visitors/ArgumentsChecker.java  |    2 +-
 .../analysis/visitors/DuplicationChecker.java      |    2 +-
 .../com/python/pydev/analysis/visitors/Found.java  |    2 +-
 .../python/pydev/analysis/visitors/GenAndTok.java  |    2 +-
 .../pydev/analysis/visitors/ImportChecker.java     |    2 +-
 .../pydev/analysis/visitors/MessagesManager.java   |    2 +-
 .../pydev/analysis/visitors/NoSelfChecker.java     |    2 +-
 .../analysis/visitors/OccurrencesVisitor.java      |    2 +-
 .../com/python/pydev/analysis/visitors/Scope.java  |    2 +-
 .../python/pydev/analysis/visitors/ScopeItems.java |    2 +-
 .../org/python/pydev/builder/pep8/Pep8Visitor.java |    2 +-
 .../pydev/analysis/AnalysisPreferencesStub.java    |    2 +-
 .../analysis/AnalysisRequestsTestWorkbench.java    |    2 +-
 .../python/pydev/analysis/AnalysisTestsBase.java   |    9 +-
 .../CtxInsensitiveImportComplProposalTest.java     |    2 +-
 .../analysis/ImportsOccurrencesAnalyzerTest.java   |   15 +-
 .../pydev/analysis/OccurrencesAnalyzer2Test.java   |    2 +-
 .../analysis/OccurrencesAnalyzerListCompTest.java  |    2 +-
 .../analysis/OccurrencesAnalyzerOpenGLTest.java    |   92 +
 .../pydev/analysis/OccurrencesAnalyzerTest.java    |   23 +-
 .../analysis/OccurrencesAnalyzerTestOpenGL.java    |   75 -
 .../GlobalsTwoPanelElementSelector2Test.java       |    2 +-
 .../AdditionalInfoIntegrityCheckerTest.java        |    2 +-
 .../additionalinfo/AdditionalInfoTestsBase.java    |    2 +-
 .../AdditionalInterpreterInfoTest.java             |    2 +-
 .../analysis/additionalinfo/InfoFactoryTest.java   |    2 +-
 .../UndefinedVariableFixParticipantTest.java       |    2 +-
 .../organizeimports/OrganizeImportsTest.java       |    2 +-
 .../scopeanalysis/ScopeAnalysisCommentsTest.java   |    2 +-
 .../scopeanalysis/ScopeAnalyzerVisitorTest.java    |    2 +-
 .../analysis/scopeanalysis/TokenMatchingTest.java  |    2 +-
 .../InterpreterInfoBuilderTest.java                |   87 +-
 .../SynchSystemModulesManagerTest.java             |  442 +
 .../analysis/tabnanny/TabNannyIteratorTest.java    |    2 +-
 .../pydev/analysis/tabnanny/TabNannyTest.java      |    2 +-
 plugins/com.python.pydev.codecompletion/.classpath |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 plugins/com.python.pydev.codecompletion/pom.xml    |    4 +-
 .../CodeCompletionPreferencesInitializer.java      |    2 +-
 .../pydev/codecompletion/CodecompletionPlugin.java |    2 +-
 .../ctxinsensitive/CtxParticipant.java             |    2 +-
 .../ctxinsensitive/PyConsoleCompletion.java        |    2 +-
 .../participant/ImportsCompletionParticipant.java  |    2 +-
 .../simpleassist/KeywordsSimpleAssist.java         |    2 +-
 .../simpleassist/SimpleAssistProposal.java         |    2 +-
 .../ui/CodeCompletionPreferencesPage.java          |    9 +-
 .../JavaIntegrationPydevComTestWorkbench.java      |    2 +-
 .../ctxinsensitive/StuctureCreationTest.java       |   13 +-
 .../parameter/ParameterCompletionTest.java         |    2 +-
 .../CompletionParticipantBuiltinsTest.java         |   34 +-
 .../participant/CompletionParticipantTest.java     |    2 +-
 plugins/com.python.pydev.debug/.classpath          |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../com.python.pydev.debug/META-INF/MANIFEST.MF    |    6 +-
 plugins/com.python.pydev.debug/pom.xml             |    4 +-
 .../src/com/python/pydev/debug/DebugPlugin.java    |    2 +-
 .../python/pydev/debug/actions/EndDebugServer.java |    2 +-
 .../pydev/debug/actions/StartDebugServer.java      |    2 +-
 .../console/EvaluationConsoleInputListener.java    |    2 +-
 .../python/pydev/debug/model/ProcessServer.java    |    2 +-
 .../debug/model/ProcessServerOutputStream.java     |    4 +-
 .../pydev/debug/model/PyDebugTargetServer.java     |    2 +-
 .../com/python/pydev/debug/model/XMLMessage.java   |    2 +-
 .../pydev/debug/remote/RemoteDebuggerServer.java   |    2 +-
 .../client_api/PydevRemoteDebuggerServer.java      |    2 +-
 .../pydev/debug/ui/DebugPreferencesPageExt.java    |    2 +-
 .../PydevdServerLaunchConfigurationDelegate.java   |    2 +-
 .../ui/launching/PydevdServerLaunchShortcut.java   |    2 +-
 .../debug/model/MyByteArrayOutputStreamTest.java   |    2 +-
 .../PydevRemoteDebuggerServerTestWorkbench.java    |    2 +-
 plugins/com.python.pydev.docs/build_both.py        |    2 +-
 .../merged_homepage/about.contents.rst             |   63 +-
 .../merged_homepage/download.contents.rst          |   44 +-
 .../final/images/console/choose_console.png        |  Bin 3568 -> 24103 bytes
 .../final/images/console/gui_mayavi.png            |  Bin 0 -> 177380 bytes
 .../final/images/console/gui_prefs.png             |  Bin 0 -> 60313 bytes
 .../final/images/console/umd_prefs.png             |  Bin 0 -> 42301 bytes
 .../final/images/console/umd_step1.png             |  Bin 0 -> 48509 bytes
 .../final/images/console/umd_step2.png             |  Bin 0 -> 51133 bytes
 .../final/images/console/umd_step3.png             |  Bin 0 -> 56056 bytes
 .../interactiveconsole/breakpoint_on_runfile.png   |  Bin 0 -> 110037 bytes
 .../breakpoint_on_running_function.png             |  Bin 0 -> 114438 bytes
 .../interactive_console_variables_view.png         |  Bin 180182 -> 0 bytes
 ...teractive_console_variables_view_preference.png |  Bin 9739 -> 23496 bytes
 .../interactiveconsole/view_when_in_console.png    |  Bin 0 -> 128468 bytes
 .../final/images/sponsors/liclipse.png             |  Bin 0 -> 1793 bytes
 .../merged_homepage/history_pydev.rst              |   60 +
 .../merged_homepage/index.rst                      |  123 +-
 .../manual_101_install.contents.rst                |    7 +-
 .../manual_adv_interactive_console.contents.html   |   89 -
 .../manual_adv_interactive_console.contents.rst    |  286 +
 .../merged_homepage/template1.html                 |  100 +-
 .../merged_homepage/templateManual.html            |  111 +-
 plugins/com.python.pydev.docs/release_email.txt    |   81 +-
 plugins/com.python.pydev.docs/release_process.txt  |   41 +-
 plugins/com.python.pydev.fastparser/.classpath     |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 plugins/com.python.pydev.fastparser/pom.xml        |    2 +-
 .../python/pydev/fastparser/FastparserPlugin.java  |    2 +-
 .../com/python/pydev/fastparser/MemoVisitor.java   |    2 +-
 plugins/com.python.pydev.refactoring/.classpath    |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 plugins/com.python.pydev.refactoring/pom.xml       |    4 +-
 .../pydev/refactoring/RefactoringPlugin.java       |    2 +-
 .../RefactoringPreferencesInitializer.java         |    2 +-
 .../actions/ActionCreatorPyEditListener.java       |    2 +-
 .../refactoring/actions/PyFindAllOccurrences.java  |    2 +-
 .../refactoring/actions/PyGoToDefinition.java      |    2 +-
 .../python/pydev/refactoring/actions/PyRename.java |    2 +-
 .../refactoring/actions/PyRenameInFileAction.java  |    2 +-
 .../python/pydev/refactoring/changes/PyChange.java |    2 +-
 .../changes/PyRenameResourceChange.java            |    2 +-
 .../hyperlink/PythonElementHyperlinkDetector.java  |    2 +-
 .../refactoring/hyperlink/PythonHyperlink.java     |    2 +-
 .../markoccurrences/MarkOccurrencesDispatcher.java |    2 +-
 .../markoccurrences/MarkOccurrencesJob.java        |    2 +-
 .../pydev/refactoring/refactorer/Refactorer.java   |    2 +-
 .../refactorer/RefactorerFindDefinition.java       |   12 +-
 .../refactorer/RefactorerFindReferences.java       |    2 +-
 .../refactoring/refactorer/RefactorerFinds.java    |    2 +-
 .../search/AbstractPythonSearchQuery.java          |    2 +-
 .../refactorer/search/PythonFileSearchResult.java  |    2 +-
 .../search/copied/BasicElementLabels.java          |    2 +-
 .../refactorer/search/copied/EditorOpener.java     |    2 +-
 .../search/copied/FileLabelProvider.java           |    2 +-
 .../refactorer/search/copied/FileSearchPage.java   |    2 +-
 .../search/copied/FileTableContentProvider.java    |    2 +-
 .../search/copied/FileTreeContentProvider.java     |    2 +-
 .../search/copied/IFileSearchContentProvider.java  |    2 +-
 .../search/copied/NewTextSearchActionGroup.java    |    2 +-
 .../search/copied/OpenSearchPreferencesAction.java |    2 +-
 .../search/copied/PatternConstructor.java          |    2 +-
 .../refactorer/search/copied/ReplaceAction.java    |    2 +-
 .../search/copied/ReplaceConfigurationPage.java    |    2 +-
 .../search/copied/ReplaceRefactoring.java          |    2 +-
 .../search/copied/SearchResultUpdater.java         |    2 +-
 .../refactorer/search/copied/SortAction.java       |    2 +-
 .../search/FindOccurrencesSearchQuery.java         |    2 +-
 .../search/FindOccurrencesSearchResultPage.java    |    2 +-
 .../refactoring/tdd/AbstractPyCreateAction.java    |    2 +-
 .../tdd/AbstractPyCreateClassOrMethodOrField.java  |    2 +-
 .../tdd/AbstractTddRefactorCompletion.java         |    2 +-
 .../pydev/refactoring/tdd/PyCreateClass.java       |    2 +-
 .../refactoring/tdd/PyCreateMethodOrField.java     |    2 +-
 .../pydev/refactoring/tdd/PythonElementWizard.java |    2 +-
 .../tdd/TddCodeGenerationQuickFixParticipant.java  |    2 +-
 .../refactoring/tdd/TddQuickFixParticipant.java    |    2 +-
 .../refactoring/tdd/TddRefactorCompletion.java     |    2 +-
 .../TddRefactorCompletionInInexistentModule.java   |    2 +-
 .../tdd/TddRefactorCompletionInModule.java         |    2 +-
 .../ui/MarkOccurrencesPreferencesPage.java         |    2 +-
 .../ui/findreplace/FindInOpenDocuments.java        |    2 +-
 .../findreplace/PySearchInOpenDocumentsAction.java |    2 +-
 .../wizards/IRefactorRenameProcess.java            |    2 +-
 .../wizards/RefactorProcessFactory.java            |    2 +-
 .../refactoring/wizards/TextInputWizardPage.java   |    2 +-
 .../rename/AbstractRenameRefactorProcess.java      |    2 +-
 .../AbstractRenameWorkspaceRefactorProcess.java    |    2 +-
 .../wizards/rename/PyRenameAnyLocalProcess.java    |    2 +-
 .../wizards/rename/PyRenameAttributeProcess.java   |    2 +-
 .../wizards/rename/PyRenameClassProcess.java       |    2 +-
 .../wizards/rename/PyRenameEntryPoint.java         |    2 +-
 .../wizards/rename/PyRenameFunctionProcess.java    |    2 +-
 .../wizards/rename/PyRenameGlobalProcess.java      |    2 +-
 .../wizards/rename/PyRenameImportProcess.java      |    2 +-
 .../wizards/rename/PyRenameLocalProcess.java       |    2 +-
 .../wizards/rename/PyRenameParameterProcess.java   |    2 +-
 .../wizards/rename/PyRenameRefactoringWizard.java  |    2 +-
 .../rename/PyRenameSelfAttributeProcess.java       |    2 +-
 .../wizards/rename/TextEditCreation.java           |    2 +-
 .../wizards/rename/visitors/FindCallVisitor.java   |    2 +-
 .../refactorer/ClassHierarchySearchTest.java       |    2 +-
 .../pydev/refactoring/refactorer/SearchTest.java   |    2 +-
 .../refactorings/rename/RefactoringLocalToken.java |    2 +-
 .../rename/RefactoringRenameTestBase.java          |    2 +-
 .../rename/RenameAttributeRefactoringTest.java     |    2 +-
 .../rename/RenameClassRefactoringTest.java         |    2 +-
 .../rename/RenameFunctionRefactoringTest.java      |    2 +-
 .../rename/RenameFunctionRefactoringTest2.java     |    2 +-
 .../rename/RenameGlobalRefactoringTest.java        |    2 +-
 .../rename/RenameLocalRefactoringTest.java         |    2 +-
 .../rename/RenameModuleRefactoringTest.java        |    2 +-
 .../rename/RenameParamRefactoringTest.java         |    2 +-
 .../rename/RenameSelfRefactoringTest.java          |    2 +-
 .../renamelocal/RefactoringLocalTestBase.java      |    2 +-
 .../renamelocal/RenameBuiltinTest.java             |    2 +-
 .../renamelocal/RenameClassRefactoringTest.java    |    2 +-
 .../RenameLocalVariableRefactoringTest.java        |    8 +-
 .../RenameSelfVariableRefactoringTest.java         |    2 +-
 .../pydev/refactoring/tdd/PyCreateClassTest.java   |    2 +-
 .../pydev/refactoring/tdd/PyCreateMethodTest.java  |    2 +-
 .../TddCodeGenerationQuickFixParticipantTest.java  |    2 +-
 .../pydev/refactoring/tdd/TddTestWorkbench.java    |    3 +-
 .../rename/AbstractRenameRefactorProcessTest.java  |    2 +-
 .../rename/visitors/FindCallVisitorTest.java       |    2 +-
 plugins/com.python.pydev.runalltests/.classpath    |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    8 +-
 plugins/com.python.pydev.runalltests/pom.xml       |   28 +-
 .../com/python/pydev/runalltests2/Activator.java   |    2 +-
 .../com/python/pydev/runalltests2/AllTests.java    |    2 +-
 .../pydev/runalltests2/AllWorkbenchTests.java      |    5 +-
 .../src/junit3/runner/ClassPathTestCollector.java  |   12 +
 .../src/junit3/runner/TestCollector.java           |   12 +
 plugins/com.python.pydev/.classpath                |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 plugins/com.python.pydev/META-INF/MANIFEST.MF      |    6 +-
 plugins/com.python.pydev/pom.xml                   |    2 +-
 .../src/com/python/pydev/NullPrefsStore.java       |    2 +-
 .../python/pydev/PydevExtensionInitializer.java    |    2 +-
 .../src/com/python/pydev/PydevPlugin.java          |    5 +-
 .../src/com/python/pydev/actions/OutlineEntry.java |    2 +-
 .../pydev/actions/PyOutlineSelectionDialog.java    |   14 +-
 .../com/python/pydev/actions/PyShowHierarchy.java  |    2 +-
 .../com/python/pydev/actions/PyShowOutline.java    |    2 +-
 .../pydev/actions/ShowOutlineLabelProvider.java    |    2 +-
 .../interactiveconsole/EvaluateActionSetter.java   |    8 +-
 .../python/pydev/refactoring/IPyRefactoring2.java  |    2 +-
 .../pydev/ui/hierarchy/HierarchyLabelProvider.java |   11 +
 .../pydev/ui/hierarchy/HierarchyNodeModel.java     |    2 +-
 .../python/pydev/ui/hierarchy/HierarchyViewer.java |    2 +-
 .../python/pydev/ui/hierarchy/PyHierarchyView.java |    2 +-
 .../src/com/python/pydev/ui/search/FileMatch.java  |    2 +-
 .../com/python/pydev/ui/search/LineElement.java    |    2 +-
 .../com/python/pydev/ui/search/PySearchPage.java   |    2 +-
 .../com/python/pydev/ui/search/ReplaceAction2.java |    2 +-
 .../com/python/pydev/ui/search/ReplaceDialog2.java |    2 +-
 .../ui/search/SearchAgainConfirmationDialog.java   |    2 +-
 .../src/com/python/pydev/util/UIUtils.java         |    2 +-
 .../ui/dialogs/PyOutlineSelectionDialogTest.java   |    2 +-
 .../pydev/ui/hierarchy/HierarchyViewerTest.java    |    2 +-
 plugins/org.python.pydev.ast/.classpath            |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 plugins/org.python.pydev.ast/META-INF/MANIFEST.MF  |    6 +-
 plugins/org.python.pydev.ast/pom.xml               |    2 +-
 .../src/org/python/pydev/ast/AstPlugin.java        |    2 +-
 plugins/org.python.pydev.core/.classpath           |    3 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 plugins/org.python.pydev.core/META-INF/MANIFEST.MF |    9 +-
 plugins/org.python.pydev.core/build.properties     |    6 +-
 plugins/org.python.pydev.core/pom.xml              |    4 +-
 .../src/org/python/pydev/core/CorePlugin.java      |    2 +-
 .../src/org/python/pydev/core/DeltaSaver.java      |    2 +-
 .../src/org/python/pydev/core/ExtensionHelper.java |    2 +-
 .../org/python/pydev/core/FastBufferedReader.java  |    2 +-
 .../org/python/pydev/core/FileUtilsFileBuffer.java |   11 +
 .../src/org/python/pydev/core/FullRepIterable.java |    2 +-
 .../pydev/core/ICodeCompletionASTManager.java      |    2 +-
 .../org/python/pydev/core/ICompletionCache.java    |    2 +-
 .../org/python/pydev/core/ICompletionState.java    |    2 +-
 .../src/org/python/pydev/core/IDeltaProcessor.java |    2 +-
 .../python/pydev/core/IGrammarVersionProvider.java |    2 +-
 .../src/org/python/pydev/core/IIndentPrefs.java    |    2 +-
 .../org/python/pydev/core/IInterpreterInfo.java    |   31 +-
 .../org/python/pydev/core/IInterpreterManager.java |   14 +-
 .../pydev/core/IInterpreterManagerListener.java    |   10 +
 .../src/org/python/pydev/core/ILocalScope.java     |    2 +-
 .../src/org/python/pydev/core/IMiscConstants.java  |   11 +
 .../src/org/python/pydev/core/IModule.java         |    2 +-
 .../src/org/python/pydev/core/IModulesManager.java |    2 +-
 .../python/pydev/core/IProjectModulesManager.java  |    2 +-
 .../src/org/python/pydev/core/IPyEdit.java         |    2 +-
 .../src/org/python/pydev/core/IPythonNature.java   |    2 +-
 .../org/python/pydev/core/IPythonPartitions.java   |    2 +-
 .../org/python/pydev/core/IPythonPathNature.java   |    2 +-
 .../src/org/python/pydev/core/ISourceModule.java   |    2 +-
 .../python/pydev/core/ISystemModulesManager.java   |    2 +-
 .../src/org/python/pydev/core/IToken.java          |   10 +-
 .../src/org/python/pydev/core/ListenerList.java    |  200 -
 .../src/org/python/pydev/core/MathUtils.java       |   11 +
 .../pydev/core/MisconfigurationException.java      |    2 +-
 .../src/org/python/pydev/core/ModulesKey.java      |    2 +-
 .../org/python/pydev/core/ModulesKeyForZip.java    |    2 +-
 .../core/NotConfiguredInterpreterException.java    |    2 +-
 .../org/python/pydev/core/NullOutputStream.java    |    2 +-
 .../src/org/python/pydev/core/ObjectsPool.java     |    2 +-
 .../pydev/core/ProjectMisconfiguredException.java  |    2 +-
 .../org/python/pydev/core/PropertiesHelper.java    |    2 +-
 .../core/PythonNatureWithoutProjectException.java  |    2 +-
 .../src/org/python/pydev/core/SystemUtils.java     |   12 +
 .../src/org/python/pydev/core/TupleN.java          |    2 +-
 .../python/pydev/core/cache/CompleteIndexKey.java  |    2 +-
 .../pydev/core/cache/CompleteIndexValue.java       |    2 +-
 .../src/org/python/pydev/core/cache/DiskCache.java |    2 +-
 .../pydev/core/cache/PyPreferencesCache.java       |    2 +-
 .../org/python/pydev/core/cache/SoftHashMap.java   |    2 +-
 .../python/pydev/core/cache/SoftHashMapCache.java  |    2 +-
 .../core/concurrency/IRunnableWithMonitor.java     |    2 +-
 .../core/concurrency/RunnableAsJobsPoolThread.java |    2 +-
 .../python/pydev/core/concurrency/Semaphore.java   |    2 +-
 .../core/concurrency/SingleJobRunningPool.java     |    2 +-
 .../python/pydev/core/docutils/ImportHandle.java   |    2 +-
 .../pydev/core/docutils/ImportsSelection.java      |    2 +-
 .../python/pydev/core/docutils/ParsingUtils.java   |    2 +-
 .../python/pydev/core/docutils/PyDocIterator.java  |    2 +-
 .../pydev/core/docutils/PyImportsHandling.java     |    2 +-
 .../pydev/core/docutils/PyImportsIterator.java     |    2 +-
 .../pydev/core/docutils/PyPartitionScanner.java    |    2 +-
 .../python/pydev/core/docutils/PyPartitioner.java  |    2 +-
 .../python/pydev/core/docutils/PySelection.java    |    2 +-
 .../pydev/core/docutils/PythonCodeReader.java      |    2 +-
 .../pydev/core/docutils/PythonPairMatcher.java     |    2 +-
 .../pydev/core/docutils/StringSubstitution.java    |   26 +-
 .../python/pydev/core/docutils/StringUtils.java    |   12 +-
 .../pydev/core/docutils/SyntaxErrorException.java  |    2 +-
 .../src/org/python/pydev/core/log/Log.java         |   76 +-
 .../org/python/pydev/core/parser/IPyParser.java    |    2 +-
 .../pydev/core/path_watch/DirectoryWatcher.java    |    2 +-
 .../core/path_watch/EventsStackerRunnable.java     |  158 -
 .../path_watch/IFilesystemChangesListener.java     |   32 -
 .../python/pydev/core/path_watch/PathWatch.java    |  435 -
 .../OptimizationRelatedConstants.java              |    2 +-
 .../pydev/core/structure/DecoratableObject.java    |    2 +-
 .../org/python/pydev/core/DeltaSaverTest.java      |    2 +-
 .../tests/org/python/pydev/core/EncodingsTest.java |   15 +-
 .../org/python/pydev/core/FullRepIterableTest.java |    2 +-
 .../org/python/pydev/core/ModulesKeyTest.java      |    2 +-
 .../org/python/pydev/core/ObjectsPoolTest.java     |    2 +-
 .../tests/org/python/pydev/core/REFTest.java       |    2 +-
 .../tests/org/python/pydev/core/TestCaseUtils.java |    4 +-
 .../tests/org/python/pydev/core/TestDependent.java |   65 +-
 .../pydev/core/TestDependent.linux.properties      |   47 +-
 .../pydev/core/TestDependent.travis.properties     |   39 +
 .../pydev/core/TestDependent.windows.properties    |   35 +-
 .../org/python/pydev/core/cache/LRUCacheTest.java  |    2 +-
 .../python/pydev/core/cache/SoftHashMapTest.java   |    2 +-
 .../python/pydev/core/docutils/DocUtilsTest.java   |    2 +-
 .../pydev/core/docutils/ImportHandleTest.java      |    2 +-
 .../pydev/core/docutils/ParsingUtilsTest.java      |    2 +-
 .../pydev/core/docutils/PyImportsHandlingTest.java |   13 +-
 .../pydev/core/docutils/StringEscapeUtilsTest.java |    2 +-
 .../core/docutils/StringSubstitutionTest.java      |   14 +-
 .../pydev/core/docutils/StringUtilsTest.java       |   45 +-
 .../pydev/core/path_watch/PathWatchTest.java       |  347 -
 .../resource_stubs/AbstractIContainerStub.java     |    2 +-
 .../core/resource_stubs/AbstractIFileStub.java     |    2 +-
 .../core/resource_stubs/AbstractIFolderStub.java   |    2 +-
 .../core/resource_stubs/AbstractIProjectStub.java  |    2 +-
 .../core/resource_stubs/AbstractIResourceStub.java |    2 +-
 .../resource_stubs/AbstractIWorkspaceRootStub.java |    2 +-
 .../python/pydev/core/resource_stubs/FileMock.java |   11 +
 .../pydev/core/resource_stubs/FolderMock.java      |   11 +
 .../pydev/core/resource_stubs/ProjectMock.java     |   11 +
 .../python/pydev/core/structure/FastStackTest.java |    2 +-
 .../pydev/core/structure/FastStringBufferTest.java |    2 +-
 .../core/structure/LowMemoryArrayListTest.java     |    2 +-
 plugins/org.python.pydev.customizations/.classpath |   16 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../build.properties                               |   18 +-
 plugins/org.python.pydev.customizations/pom.xml    |    2 +-
 .../pydev/customizations/CustomizationsPlugin.java |    2 +-
 .../customizations/CustomizationsUIConstants.java  |    2 +-
 .../actions/AbstractAppEngineAction.java           |    2 +-
 .../actions/AbstractAppEngineHandler.java          |    2 +-
 .../app_engine/actions/AppEngineManage.java        |    2 +-
 .../app_engine/actions/AppEngineManageAction.java  |    2 +-
 .../app_engine/actions/AppEngineUpload.java        |    2 +-
 .../app_engine/actions/AppEngineUploadAction.java  |    2 +-
 .../app_engine/launching/AppEngineConstants.java   |    2 +-
 .../AppEngineLaunchConfigurationDelegate.java      |    2 +-
 .../launching/AppEngineLaunchShortcut.java         |    2 +-
 .../launching/AppEnginePropertyTester.java         |    2 +-
 .../app_engine/util/AppEngineProcessWindow.java    |    2 +-
 .../wizards/AppEngineConfigWizardPage.java         |   21 +-
 .../app_engine/wizards/AppEngineTemplatePage.java  |    2 +-
 .../app_engine/wizards/AppEngineWizard.java        |    2 +-
 .../common/CustomizationCommons.java               |    2 +-
 .../pydev/customizations/common/ProcessWindow.java |   10 +-
 .../AppEngineConfigWizardPageTestWorkbench.java    |    2 +-
 plugins/org.python.pydev.debug/.classpath          |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../org.python.pydev.debug/META-INF/MANIFEST.MF    |    6 +-
 plugins/org.python.pydev.debug/plugin.xml          |   84 +-
 plugins/org.python.pydev.debug/pom.xml             |    4 +-
 .../pydev/debug/codecoverage/CoverageCache.java    |    2 +-
 .../pydev/debug/codecoverage/ErrorFileNode.java    |    2 +-
 .../python/pydev/debug/codecoverage/FileNode.java  |    2 +-
 .../pydev/debug/codecoverage/FolderNode.java       |    2 +-
 .../debug/codecoverage/ICoverageLeafNode.java      |    2 +-
 .../debug/codecoverage/NodeNotFoudException.java   |    2 +-
 .../debug/codecoverage/PyCodeCoverageView.java     |   32 +-
 .../pydev/debug/codecoverage/PyCoverage.java       |    4 +-
 .../debug/codecoverage/PyCoveragePreferences.java  |    7 +-
 .../RemoveCoverageMarkersListener.java             |    2 +-
 .../debug/console/ConsoleActivateDebugContext.java |   12 +
 .../console/ConsoleCompletionsPageParticipant.java |    2 +-
 .../ConsoleRestartLaunchPageParticipant.java       |    2 +-
 .../debug/console/ScriptConsoleViewerWrapper.java  |    2 +-
 .../debug/core/ConfigureExceptionsFileUtils.java   |    4 +-
 .../src/org/python/pydev/debug/core/Constants.java |    2 +-
 .../pydev/debug/core/IConsoleInputListener.java    |    2 +-
 .../python/pydev/debug/core/PydevDebugPlugin.java  |   24 +-
 .../core/PydevDebugPreferencesInitializer.java     |    2 +-
 .../debug/handlers/PrettyPrintCommandHandler.java  |   31 +
 .../pydev/debug/model/AbstractDebugTarget.java     |   41 +-
 .../model/AbstractDebugTargetWithTransmission.java |    2 +-
 .../org/python/pydev/debug/model/AdapterDebug.java |    2 +-
 .../debug/model/DeferredWorkbenchAdapter.java      |    2 +-
 .../pydev/debug/model/IPropertyTraceListener.java  |   12 +
 .../org/python/pydev/debug/model/PyBreakpoint.java |    2 +-
 .../model/PyConsoleCodeGeneratorVariable.java      |   12 +
 .../debug/model/PyDebugModelPresentation.java      |    2 +-
 .../python/pydev/debug/model/PyDebugTarget.java    |    2 +-
 .../pydev/debug/model/PyDebugTargetConsole.java    |   67 +-
 .../debug/model/PyExceptionBreakPointManager.java  |    4 +-
 .../pydev/debug/model/PyPropertyTraceManager.java  |   14 +-
 .../org/python/pydev/debug/model/PyReloadCode.java |    2 +-
 .../pydev/debug/model/PyRunToLineTarget.java       |    2 +-
 .../python/pydev/debug/model/PySetNextTarget.java  |    2 +-
 .../python/pydev/debug/model/PySourceLocator.java  |    2 +-
 .../org/python/pydev/debug/model/PyStackFrame.java |    2 +-
 .../pydev/debug/model/PyStackFrameConsole.java     |   27 +-
 .../src/org/python/pydev/debug/model/PyThread.java |    2 +-
 .../python/pydev/debug/model/PyThreadConsole.java  |   28 +-
 .../org/python/pydev/debug/model/PyVariable.java   |    2 +-
 .../pydev/debug/model/PyVariableCollection.java    |    2 +-
 .../debug/model/PyVariableContentProviderHack.java |    2 +-
 .../pydev/debug/model/PyVariablesPreferences.java  |   50 +-
 .../debug/model/PyWatchExpressionDelegate.java     |    2 +-
 .../debug/model/ValueModificationChecker.java      |    2 +-
 .../src/org/python/pydev/debug/model/XMLUtils.java |    2 +-
 .../org/python/pydev/debug/model/XMLUtilsTest.java |    2 +-
 .../model/remote/AbstractDebuggerCommand.java      |    3 +-
 .../debug/model/remote/AbstractRemoteDebugger.java |    2 +-
 .../debug/model/remote/ChangeVariableCommand.java  |    2 +-
 .../pydev/debug/model/remote/DebuggerReader.java   |    5 +-
 .../pydev/debug/model/remote/DebuggerWriter.java   |    6 +-
 .../remote/EvaluateConsoleExpressionCommand.java   |   12 +
 .../model/remote/EvaluateExpressionCommand.java    |    2 +-
 .../debug/model/remote/GetFileContentsCommand.java |    2 +-
 .../pydev/debug/model/remote/GetFrameCommand.java  |    2 +-
 .../debug/model/remote/GetVariableCommand.java     |    2 +-
 .../pydev/debug/model/remote/ListenConnector.java  |    2 +-
 .../debug/model/remote/ReloadCodeCommand.java      |    2 +-
 .../pydev/debug/model/remote/RemoteDebugger.java   |    2 +-
 .../debug/model/remote/RemoteDebuggerConsole.java  |   12 +
 .../model/remote/RemoveBreakpointCommand.java      |    2 +-
 .../model/remote/RunCustomOperationCommand.java    |  165 +
 .../pydev/debug/model/remote/RunToLineCommand.java |    2 +-
 .../debug/model/remote/SendPyExceptionCommand.java |    2 +-
 .../debug/model/remote/SetBreakpointCommand.java   |    2 +-
 .../pydev/debug/model/remote/SetNextCommand.java   |    2 +-
 .../model/remote/SetPropertyTraceCommand.java      |   12 +
 .../pydev/debug/model/remote/StepCommand.java      |    2 +-
 .../debug/model/remote/ThreadKillCommand.java      |    2 +-
 .../debug/model/remote/ThreadListCommand.java      |    2 +-
 .../pydev/debug/model/remote/ThreadRunCommand.java |    2 +-
 .../debug/model/remote/ThreadSuspendCommand.java   |    2 +-
 .../pydev/debug/model/remote/VersionCommand.java   |    2 +-
 .../pydev/debug/pyunit/ClearTerminatedAction.java  |    2 +-
 .../python/pydev/debug/pyunit/CounterPanel.java    |    2 +-
 .../python/pydev/debug/pyunit/HistoryAction.java   |    2 +-
 .../python/pydev/debug/pyunit/IPyUnitLaunch.java   |    2 +-
 .../python/pydev/debug/pyunit/IPyUnitServer.java   |    2 +-
 .../pydev/debug/pyunit/IPyUnitServerListener.java  |    2 +-
 .../InformationPresenterWithLineTracker.java       |    2 +-
 .../pydev/debug/pyunit/PinHistoryAction.java       |    2 +-
 .../python/pydev/debug/pyunit/PyUnitLaunch.java    |    2 +-
 .../pydev/debug/pyunit/PyUnitProgressBar.java      |    2 +-
 .../python/pydev/debug/pyunit/PyUnitServer.java    |    2 +-
 .../pydev/debug/pyunit/PyUnitSortListener.java     |    2 +-
 .../pydev/debug/pyunit/PyUnitTestResult.java       |    2 +-
 .../python/pydev/debug/pyunit/PyUnitTestRun.java   |    2 +-
 .../pydev/debug/pyunit/PyUnitTestStarted.java      |    2 +-
 .../org/python/pydev/debug/pyunit/PyUnitView.java  |   10 +-
 .../debug/pyunit/PyUnitViewServerListener.java     |    2 +-
 .../python/pydev/debug/pyunit/RelaunchAction.java  |    2 +-
 .../pydev/debug/pyunit/RelaunchErrorsAction.java   |    2 +-
 .../debug/pyunit/RelaunchInBackgroundAction.java   |    2 +-
 .../debug/pyunit/RestorePinHistoryAction.java      |    2 +-
 .../pydev/debug/pyunit/SetCurrentRunAction.java    |    2 +-
 .../pydev/debug/pyunit/ShowOnlyFailuresAction.java |    2 +-
 .../pyunit/ShowTestRunnerPreferencesAction.java    |    2 +-
 .../debug/pyunit/ShowViewOnTestRunAction.java      |    2 +-
 .../org/python/pydev/debug/pyunit/StopAction.java  |    2 +-
 .../org/python/pydev/debug/ui/ArgumentsTab.java    |    2 +-
 .../org/python/pydev/debug/ui/DebugPrefsPage.java  |    2 +-
 .../debug/ui/IDebugPreferencesPageParticipant.java |    2 +-
 .../org/python/pydev/debug/ui/InterpreterTab.java  |    2 +-
 .../python/pydev/debug/ui/IronpythonTabGroup.java  |    2 +-
 .../pydev/debug/ui/IronpythonUnittestTabGroup.java |    2 +-
 .../org/python/pydev/debug/ui/JythonTabGroup.java  |    2 +-
 .../pydev/debug/ui/JythonUnittestTabGroup.java     |    2 +-
 .../org/python/pydev/debug/ui/MainModuleTab.java   |    2 +-
 .../pydev/debug/ui/ProjectDependentTabGroup.java   |    2 +-
 .../pydev/debug/ui/PyConfigureExceptionDialog.java |    2 +-
 .../pydev/debug/ui/PyEditBreakpointSync.java       |    2 +-
 .../debug/ui/PyEditRunToLineAdapterFactory.java    |    2 +-
 .../debug/ui/PyEditSetNextAdapterFactory.java      |    2 +-
 .../pydev/debug/ui/PyPropertyTraceDialog.java      |   12 +
 .../pydev/debug/ui/PyToggleBreakpointsTarget.java  |    2 +-
 .../pydev/debug/ui/PythonConsoleLineTracker.java   |    6 +-
 .../python/pydev/debug/ui/PythonSourceViewer.java  |    2 +-
 .../org/python/pydev/debug/ui/PythonTabGroup.java  |    2 +-
 .../pydev/debug/ui/PythonTypePropertyTester.java   |   12 +
 .../pydev/debug/ui/PythonUnittestTabGroup.java     |    2 +-
 .../pydev/debug/ui/SourceLocatorPrefsPage.java     |    2 +-
 .../src/org/python/pydev/debug/ui/TableEditor.java |    2 +-
 .../pydev/debug/ui/UnittestArgumentsTab.java       |    2 +-
 .../ui/actions/AbstractBreakpointRulerAction.java  |    2 +-
 .../debug/ui/actions/AbstractRunEditorAction.java  |    2 +-
 .../EnableDisableBreakpointRulerAction.java        |    2 +-
 ...EnableDisableBreakpointRulerActionDelegate.java |    2 +-
 .../debug/ui/actions/EvalExpressionAction.java     |    2 +-
 .../pydev/debug/ui/actions/ISetNextTarget.java     |    2 +-
 .../ManageBreakpointRulerActionDelegate.java       |    2 +-
 .../debug/ui/actions/PyBreakpointRulerAction.java  |    2 +-
 .../ui/actions/PyConfigureExceptionAction.java     |    2 +-
 .../debug/ui/actions/PyPropertyTraceAction.java    |   12 +
 .../PythonBreakpointPropertiesRulerAction.java     |   23 +-
 ...honBreakpointPropertiesRulerActionDelegate.java |    2 +-
 .../pydev/debug/ui/actions/RelaunchLastAction.java |    2 +-
 .../debug/ui/actions/RestartLaunchAction.java      |    2 +-
 .../debug/ui/actions/RetargetSetNextAction.java    |    2 +-
 .../actions/RunEditorAsCustomUnitTestAction.java   |    2 +-
 .../actions/RunEditorBasedOnNatureTypeAction.java  |    2 +-
 .../ui/actions/TerminateAllLaunchesAction.java     |    2 +-
 .../debug/ui/actions/WatchExpressionAction.java    |    2 +-
 .../pydev/debug/ui/blocks/MainModuleBlock.java     |    2 +-
 .../ui/blocks/OverrideUnittestArgumentsBlock.java  |    2 +-
 .../debug/ui/blocks/ProgramArgumentsBlock.java     |    2 +-
 .../python/pydev/debug/ui/blocks/ProjectBlock.java |    2 +-
 .../pydev/debug/ui/blocks/PythonPathBlock.java     |    2 +-
 .../pydev/debug/ui/blocks/VMArgumentsBlock.java    |    2 +-
 .../debug/ui/blocks/WorkingDirectoryBlock.java     |    2 +-
 .../python/pydev/debug/ui/hover/PyDebugHover.java  |    2 +-
 .../AbstractLaunchConfigurationDelegate.java       |    2 +-
 .../debug/ui/launching/AbstractLaunchShortcut.java |    2 +-
 .../CoverageLaunchConfigurationDelegate.java       |    2 +-
 .../debug/ui/launching/CoverageLaunchShortcut.java |    2 +-
 .../pydev/debug/ui/launching/FileOrResource.java   |    2 +-
 .../InteractiveConsoleConfigurationDelegate.java   |   12 +
 .../debug/ui/launching/InterpreterTypeTester.java  |    2 +-
 .../IronpythonLaunchConfigurationDelegate.java     |    2 +-
 .../ui/launching/IronpythonLaunchShortcut.java     |    2 +-
 .../IronpythonUnitTestLaunchShortcut.java          |    2 +-
 ...npythonUnittestLaunchConfigurationDelegate.java |    2 +-
 .../JythonLaunchConfigurationDelegate.java         |    2 +-
 .../debug/ui/launching/JythonLaunchShortcut.java   |    2 +-
 .../ui/launching/JythonUnitTestLaunchShortcut.java |    2 +-
 .../JythonUnittestLaunchConfigurationDelegate.java |    2 +-
 .../ui/launching/LaunchConfigurationCreator.java   |    2 +-
 .../pydev/debug/ui/launching/LaunchShortcut.java   |    2 +-
 .../pydev/debug/ui/launching/PythonRunner.java     |    2 +-
 .../debug/ui/launching/PythonRunnerCallbacks.java  |    2 +-
 .../debug/ui/launching/PythonRunnerConfig.java     |    2 +-
 .../RegularLaunchConfigurationDelegate.java        |    2 +-
 .../debug/ui/launching/UnitTestLaunchShortcut.java |    2 +-
 .../UnittestLaunchConfigurationDelegate.java       |    2 +-
 .../propertypages/BreakpointConditionEditor.java   |    2 +-
 .../ui/propertypages/PythonBreakpointPage.java     |    6 +-
 .../AbstractShowReferencesActionDelegate.java      |   11 +
 .../ShowAllUppercaseReferencesActionDelegate.java  |   11 +
 .../ShowCapitalizedReferencesActionDelegate.java   |   11 +
 ...wFunctionAndModuleReferencesActionDelegate.java |   11 +
 .../ShowPrivateReferencesActionDelegate.java       |   11 +
 .../debug/newconsole/ConsoleStyleProvider.java     |   11 +
 .../newconsole/EvaluateDebugConsoleExpression.java |   15 +-
 .../debug/newconsole/HandleBackspaceAction.java    |   11 +
 .../debug/newconsole/IPydevConsoleDebugTarget.java |   12 +
 .../pydev/debug/newconsole/PydevConsole.java       |    2 +-
 .../newconsole/PydevConsoleCommunication.java      |  174 +-
 .../PydevConsoleCompletionProcessor.java           |    2 +-
 .../debug/newconsole/PydevConsoleConstants.java    |   28 +-
 .../debug/newconsole/PydevConsoleFactory.java      |  156 +-
 .../debug/newconsole/PydevConsoleInterpreter.java  |    2 +-
 .../PydevConsolePreferencesInitializer.java        |   18 +-
 .../PydevConsoleQuickAssistProcessor.java          |    2 +-
 .../pydev/debug/newconsole/PydevDebugConsole.java  |   12 +
 .../newconsole/PydevDebugConsoleCommunication.java |   14 +-
 .../debug/newconsole/PydevDebugConsoleFrame.java   |    2 +-
 ...ydevScriptConsoleSourceViewerConfiguration.java |   11 +
 .../newconsole/actions/DebugConsoleAction.java     |   12 +
 .../actions/LinkWithDebugSelectionAction.java      |   12 +
 .../newconsole/env/ChooseProcessTypeDialog.java    |   14 +-
 .../env/JythonEclipseInterpreterManager.java       |    7 +-
 .../debug/newconsole/env/JythonEclipseProcess.java |    2 +-
 .../debug/newconsole/env/PydevIProcessFactory.java |   31 +-
 .../env/PydevSpawnedInterpreterProcess.java        |    2 +-
 .../pydev/debug/newconsole/prefs/ColorManager.java |   34 +-
 .../newconsole/prefs/InteractiveConsolePrefs.java  |   70 +-
 .../prefs/InteractiveConsoleUMDPrefs.java          |  119 +
 .../debug/codecoverage/CoverageCacheTest.java      |    2 +-
 .../codecoverage/PyCodeCoverageTestWorkbench.java  |    3 +-
 .../pydev/debug/codecoverage/XmlRpcTest.java       |   25 +-
 .../pydev/debug/model/AbstractDebugTargetTest.java |    2 +-
 .../newconsole/PydevConsoleDebugCommsTest.java     |   47 +-
 .../pydev/debug/newconsole/PydevConsoleTest.java   |    2 +-
 .../pydev/debug/pyunit/PyUnitTestResultTest.java   |    2 +-
 .../debug/pyunit/PyUnitView2TestTestWorkbench.java |    2 +-
 .../python/pydev/debug/pyunit/PyUnitViewTest.java  |   16 +-
 .../debug/pyunit/PyUnitViewTestTestWorkbench.java  |    2 +-
 .../pydev/debug/ui/DebuggerTestWorkbench.java      |    2 +-
 .../debug/ui/PythonConsoleLineTrackerTest.java     |   17 +-
 .../pydev/debug/ui/SourceLocatorTestWorkbench.java |    2 +-
 .../launching/PythonRunnerConfigTestWorkbench.java |    2 +-
 plugins/org.python.pydev.django/.classpath         |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../org.python.pydev.django/META-INF/MANIFEST.MF   |    6 +-
 plugins/org.python.pydev.django/pom.xml            |    2 +-
 .../src/org/python/pydev/django/DjangoPlugin.java  |    2 +-
 .../django/debug/ui/actions/DjangoAction.java      |    2 +-
 .../actions/DjangoActionCreatorPyEditListener.java |    2 +-
 .../django/debug/ui/actions/DjangoCreateApp.java   |    2 +-
 .../debug/ui/actions/DjangoCustomCommand.java      |    2 +-
 .../pydev/django/debug/ui/actions/DjangoShell.java |    2 +-
 .../django/debug/ui/actions/DjangoSyncDB.java      |    2 +-
 .../django/debug/ui/actions/DjangoTestAction.java  |    2 +-
 .../pydev/django/debug/ui/actions/DjangoWar.java   |    2 +-
 .../debug/ui/actions/PyDjangoOfflineAction.java    |    2 +-
 .../pydev/django/launching/DjangoConstants.java    |    2 +-
 .../DjangoLaunchConfigurationDelegate.java         |    2 +-
 .../django/launching/DjangoLaunchShortcut.java     |    2 +-
 .../django/launching/DjangoPropertyTester.java     |    2 +-
 .../pydev/django/launching/PythonFileRunner.java   |    2 +-
 .../pydev/django/nature/DjangoAddNatureAction.java |    2 +-
 .../python/pydev/django/nature/DjangoNature.java   |    2 +-
 .../django/nature/DjangoRemoveNatureAction.java    |    2 +-
 .../pydev/django/ui/DjangoProjectProperties.java   |   12 +
 .../ui/wizards/project/DjangoNewProjectPage.java   |    2 +-
 .../project/DjangoNotAvailableWizardPage.java      |    2 +-
 .../ui/wizards/project/DjangoProjectWizard.java    |    2 +-
 .../ui/wizards/project/DjangoSettingsPage.java     |    2 +-
 .../django/ui/wizards/project/ErrorWizardPage.java |    2 +-
 plugins/org.python.pydev.help/META-INF/MANIFEST.MF |    5 +-
 plugins/org.python.pydev.help/pom.xml              |    2 +-
 plugins/org.python.pydev.jython/.classpath         |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../org.python.pydev.jython/META-INF/MANIFEST.MF   |    6 +-
 .../jysrc/pytemplate_defaults.py                   |   32 +-
 .../jysrc/tests/test_templates.py                  |  231 +-
 plugins/org.python.pydev.jython/pom.xml            |    2 +-
 .../python/pydev/jython/IInteractiveConsole.java   |    2 +-
 .../python/pydev/jython/IPythonInterpreter.java    |    2 +-
 .../src/org/python/pydev/jython/JythonPlugin.java  |    4 +-
 .../pydev/jython/PythonInterpreterWrapper.java     |    2 +-
 .../jython/PythonInterpreterWrapperNotShared.java  |    2 +-
 .../src/org/python/pydev/jython/ScriptOutput.java  |    2 +-
 .../jython/ScriptingExtensionInitializer.java      |    2 +-
 .../jython/ui/JyScriptingPreferencesPage.java      |    8 +-
 plugins/org.python.pydev.mylyn/.classpath          |    4 +-
 .../.settings/org.eclipse.jdt.core.prefs           |   10 +-
 .../org.python.pydev.mylyn/META-INF/MANIFEST.MF    |    5 +-
 plugins/org.python.pydev.mylyn/pom.xml             |    2 +-
 .../src/org/python/pydev/mylyn/Activator.java      |   11 +
 plugins/org.python.pydev.parser/.classpath         |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../org.python.pydev.parser/META-INF/MANIFEST.MF   |    6 +-
 plugins/org.python.pydev.parser/pom.xml            |    4 +-
 .../src/org/python/pydev/parser/IGrammar.java      |    2 +-
 .../src/org/python/pydev/parser/ParserPlugin.java  |    2 +-
 .../src/org/python/pydev/parser/PyParser.java      |   30 +-
 .../org/python/pydev/parser/PyParserManager.java   |    2 +-
 .../parser/fastparser/FastDefinitionsParser.java   |   36 +-
 .../python/pydev/parser/fastparser/FastParser.java |    2 +-
 .../pydev/parser/fastparser/ScopesParser.java      |    2 +-
 .../parser/fastparser/TabNannyDocIterator.java     |    2 +-
 .../org/python/pydev/parser/grammar24/python.jjt   |   98 +-
 .../org/python/pydev/parser/grammar25/python.jjt   |  100 +-
 .../org/python/pydev/parser/grammar26/python.jjt   |   96 +-
 .../org/python/pydev/parser/grammar27/python.jjt   |  108 +-
 .../pydev/parser/grammar30/PythonGrammar30.java    |19152 +++++++++-----------
 .../parser/grammar30/PythonGrammar30Constants.java |  693 +-
 .../grammar30/PythonGrammar30TokenManager.java     | 8103 +++++----
 .../org/python/pydev/parser/grammar30/grammar33    |  133 +
 .../org/python/pydev/parser/grammar30/python.jjt   |  157 +-
 .../pydev/parser/grammar30/python.jjt_template     |   49 +-
 .../AbstractGrammarErrorHandlers.java              |    2 +-
 .../grammarcommon/AbstractGrammarWalkHelpers.java  |    2 +-
 .../AbstractJJTPythonGrammarState.java             |   11 +
 .../grammarcommon/AbstractPythonGrammar.java       |    2 +-
 .../parser/grammarcommon/AbstractTokenManager.java |    2 +-
 .../AbstractTokenManagerWithConstants.java         |  437 +-
 .../parser/grammarcommon/AbstractTreeBuilder.java  |    2 +-
 .../grammarcommon/AbstractTreeBuilderHelpers.java  |    2 +-
 .../grammarcommon/ComprehensionCollection.java     |    2 +-
 .../pydev/parser/grammarcommon/CtxVisitor.java     |    2 +-
 .../pydev/parser/grammarcommon/Decorators.java     |    2 +-
 .../pydev/parser/grammarcommon/DefaultArg.java     |    2 +-
 .../grammarcommon/DefaultPythonGrammarActions.java |   11 +
 .../grammarcommon/IPythonGrammarActions.java       |   11 +
 .../pydev/parser/grammarcommon/ITreeBuilder.java   |    2 +-
 .../pydev/parser/grammarcommon/ITreeConstants.java |    2 +-
 .../pydev/parser/grammarcommon/IdentityNode.java   |    2 +-
 .../grammarcommon/JJTPythonGrammarState.java       |    2 +-
 .../grammarcommon/NullJJTPythonGrammarState.java   |   11 +
 .../grammarcommon/NullPythonGrammarActions.java    |   11 +
 .../parser/grammarcommon/NullTreeBuilder.java      |   11 +
 .../pydev/parser/grammarcommon/TokensIterator.java |    2 +-
 .../pydev/parser/grammarcommon/make_replace.py     |  136 +-
 .../python/pydev/parser/jython/FastCharStream.java |    2 +-
 .../python/pydev/parser/jython/ICompilerAPI.java   |    2 +-
 .../python/pydev/parser/jython/ISpecialStr.java    |    2 +-
 .../src/org/python/pydev/parser/jython/Node.java   |    2 +-
 .../python/pydev/parser/jython/ParseException.java |    2 +-
 .../org/python/pydev/parser/jython/SimpleNode.java |    2 +-
 .../org/python/pydev/parser/jython/SpecialStr.java |    2 +-
 .../src/org/python/pydev/parser/jython/Token.java  |    2 +-
 .../python/pydev/parser/jython/TokenMgrError.java  |    2 +-
 .../org/python/pydev/parser/jython/Visitor.java    |    2 +-
 .../parser/jython/ast/factory/NodeHelper.java      |   16 +
 .../parser/jython/ast/factory/PyAstFactory.java    |    7 +-
 .../parser/prettyprinterv2/AbstractLinePart.java   |    2 +-
 .../pydev/parser/prettyprinterv2/Formatter.java    |    2 +-
 .../pydev/parser/prettyprinterv2/IFormatter.java   |    2 +-
 .../prettyprinterv2/ILinePartIndentMark.java       |    2 +-
 .../prettyprinterv2/ILinePartStatementMark.java    |    2 +-
 .../prettyprinterv2/IPrettyPrinterPrefs.java       |    2 +-
 .../parser/prettyprinterv2/IWriterEraser.java      |    2 +-
 .../pydev/parser/prettyprinterv2/LinePart.java     |    2 +-
 .../parser/prettyprinterv2/LinePartIndentMark.java |    2 +-
 .../prettyprinterv2/LinePartRequireAdded.java      |    2 +-
 .../prettyprinterv2/LinePartRequireIndentMark.java |    2 +-
 .../prettyprinterv2/LinePartRequireMark.java       |    2 +-
 .../prettyprinterv2/LinePartStatementMark.java     |    2 +-
 .../MakeAstValidForPrettyPrintingVisitor.java      |    2 +-
 .../prettyprinterv2/PrettyPrinterDocLineEntry.java |    2 +-
 .../parser/prettyprinterv2/PrettyPrinterDocV2.java |    2 +-
 .../prettyprinterv2/PrettyPrinterPrefsV2.java      |    2 +-
 .../prettyprinterv2/PrettyPrinterUtilsV2.java      |    2 +-
 .../parser/prettyprinterv2/PrettyPrinterV2.java    |    2 +-
 .../prettyprinterv2/PrettyPrinterVisitorV2.java    |    2 +-
 .../pydev/parser/prettyprinterv2/WriteStateV2.java |    4 +-
 .../parser/prettyprinterv2/WriterEraserV2.java     |    2 +-
 .../pydev/parser/visitors/FindLastLineVisitor.java |    2 +-
 .../python/pydev/parser/visitors/NodeUtils.java    |    2 +-
 .../pydev/parser/visitors/PythonLanguageUtils.java |    2 +-
 .../visitors/comparator/SimpleNodeComparator.java  |    2 +-
 .../pydev/parser/visitors/scope/ASTEntry.java      |    2 +-
 .../visitors/scope/ASTEntryWithChildren.java       |    2 +-
 .../parser/visitors/scope/CodeFoldingVisitor.java  |    2 +-
 .../scope/DefinitionsASTIteratorVisitor.java       |    2 +-
 .../visitors/scope/EasyASTIteratorVisitor.java     |    2 +-
 .../scope/EasyASTIteratorWithChildrenVisitor.java  |    2 +-
 .../visitors/scope/EasyASTIteratorWithLoop.java    |    2 +-
 .../parser/visitors/scope/EasyAstIteratorBase.java |    2 +-
 .../scope/GetNodeForExtractLocalVisitor.java       |    2 +-
 .../pydev/parser/visitors/scope/NameIterator.java  |    2 +-
 .../visitors/scope/OutlineCreatorVisitor.java      |    2 +-
 .../parser/visitors/scope/OutlineIterator.java     |    2 +-
 .../pydev/parser/visitors/scope/ReturnVisitor.java |    2 +-
 .../scope/SequencialASTIteratorVisitor.java        |    2 +-
 .../org/python/pydev/parser/PyParser25Test.java    |    2 +-
 .../org/python/pydev/parser/PyParser26Test.java    |    2 +-
 .../org/python/pydev/parser/PyParser27Test.java    |    2 +-
 .../org/python/pydev/parser/PyParser30Test.java    |    9 +-
 .../parser/PyParserEditorIntegrationTest.java      |    2 +-
 .../python/pydev/parser/PyParserErrorsTest.java    |    2 +-
 .../org/python/pydev/parser/PyParserPrintTest.java |    2 +-
 .../org/python/pydev/parser/PyParserTest.java      |   39 +-
 .../org/python/pydev/parser/PyParserTestBase.java  |   12 +-
 .../python/pydev/parser/PyParserWithoutTree.java   |   11 +
 .../org/python/pydev/parser/PythonNatureStub.java  |    2 +-
 .../fastparser/FastDefinitionsParserTest.java      |   20 +-
 .../pydev/parser/fastparser/FastParserTest.java    |    2 +-
 .../pydev/parser/fastparser/ScopesParserTest.java  |    2 +-
 .../parser/grammarcommon/TokensIteratorTest.java   |    2 +-
 .../pydev/parser/jython/ReaderCharStreamTest.java  |    2 +-
 .../AbstractPrettyPrinterTestBase.java             |    2 +-
 .../prettyprinter/MessLinesAndColumnsVisitor.java  |    2 +-
 .../prettyprinter/PrettyPrinter30LibTest.java      |    2 +-
 .../parser/prettyprinter/PrettyPrinter30Test.java  |    2 +-
 .../parser/prettyprinter/PrettyPrinterLibTest.java |    2 +-
 .../parser/prettyprinter/PrettyPrinterTest.java    |    2 +-
 .../python/pydev/parser/profile/ParseBigFile.java  |    2 +-
 .../pydev/parser/visitors/NodeUtilsTest.java       |    2 +-
 .../pydev/parser/visitors/ParsingUtilsTest.java    |    2 +-
 .../visitors/scope/CodeFoldingVisitorTest.java     |    2 +-
 .../parser/visitors/scope/EasyASTIteratorTest.java |    2 +-
 plugins/org.python.pydev.refactoring/.classpath    |    6 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    9 +-
 plugins/org.python.pydev.refactoring/pom.xml       |   17 +-
 .../org/python/pydev/refactoring/PepticPlugin.java |   16 +
 .../python/pydev/refactoring/ast/FQIdentifier.java |   16 +
 .../pydev/refactoring/ast/PythonModuleManager.java |   16 +
 .../ast/adapters/AbstractNodeAdapter.java          |   16 +
 .../ast/adapters/AbstractScopeNode.java            |   16 +
 .../refactoring/ast/adapters/ClassDefAdapter.java  |   16 +
 .../ast/adapters/ClassDefAdapterFromClassDef.java  |   16 +
 .../ast/adapters/ClassDefAdapterFromTokens.java    |   16 +
 .../ast/adapters/FunctionArgAdapter.java           |   17 +-
 .../ast/adapters/FunctionDefAdapter.java           |   16 +
 .../refactoring/ast/adapters/IASTNodeAdapter.java  |   16 +
 .../refactoring/ast/adapters/IClassDefAdapter.java |   16 +
 .../refactoring/ast/adapters/INodeAdapter.java     |   16 +
 .../refactoring/ast/adapters/ModuleAdapter.java    |   17 +
 .../refactoring/ast/adapters/PropertyAdapter.java  |   16 +
 .../ast/adapters/PropertyTextAdapter.java          |   16 +
 .../refactoring/ast/adapters/SimpleAdapter.java    |   16 +
 .../refactoring/ast/adapters/TextNodeAdapter.java  |   16 +
 .../offsetstrategy/AbstractOffsetStrategy.java     |   16 +
 .../offsetstrategy/BeforeCurrentOffset.java        |   16 +
 .../ast/adapters/offsetstrategy/BeginOffset.java   |   16 +
 .../ast/adapters/offsetstrategy/EndOffset.java     |   16 +
 .../adapters/offsetstrategy/IOffsetStrategy.java   |   16 +
 .../ast/adapters/offsetstrategy/InitOffset.java    |   16 +
 .../CannotCreateContextRuntimeException.java       |   11 +
 .../ast/visitors/FindDuplicatesVisitor.java        |    2 +-
 .../ast/visitors/LocalVariablesVisitor.java        |   14 +
 .../refactoring/ast/visitors/ParentVisitor.java    |   14 +
 .../refactoring/ast/visitors/VisitorFactory.java   |   16 +
 .../visitors/context/AbstractContextVisitor.java   |   16 +
 .../ast/visitors/context/ClassDefVisitor.java      |   16 +
 .../visitors/context/GlobalAttributeVisitor.java   |   16 +
 .../visitors/context/GlobalFunctionDefVisitor.java |   16 +
 .../visitors/context/LocalAttributeVisitor.java    |   16 +
 .../visitors/context/LocalFunctionDefVisitor.java  |   16 +
 .../ast/visitors/context/PropertyVisitor.java      |   16 +
 .../ast/visitors/context/ScopeAssignedVisitor.java |   16 +
 .../visitors/context/ScopeVariablesVisitor.java    |   16 +
 .../ast/visitors/info/ImportVisitor.java           |   16 +
 .../ast/visitors/position/IndentVisitor.java       |   16 +
 .../ast/visitors/position/LastLineVisitor.java     |   16 +
 .../visitors/renamer/LocalVarRenameVisitor.java    |   16 +
 .../ast/visitors/rewriter/Rewriter.java            |   11 +
 .../ast/visitors/selection/SelectionException.java |   16 +
 .../selection/SelectionExtenderVisitor.java        |   16 +
 .../selection/SelectionValidationVisitor.java      |   16 +
 .../ConstructorFieldChangeProcessor.java           |   16 +
 .../ConstructorFieldRefactoring.java               |   16 +
 .../ConstructorFieldRequestProcessor.java          |   16 +
 .../edit/ConstructorMethodEdit.java                |   16 +
 .../request/ConstructorFieldRequest.java           |   16 +
 .../GeneratePropertiesChangeProcessor.java         |   16 +
 .../GeneratePropertiesRefactoring.java             |   16 +
 .../GeneratePropertiesRequestProcessor.java        |   16 +
 .../generateproperties/edit/DeleteMethodEdit.java  |   17 +
 .../generateproperties/edit/GetterMethodEdit.java  |   17 +
 .../generateproperties/edit/PropertyEdit.java      |   17 +
 .../generateproperties/edit/SetterMethodEdit.java  |   17 +
 .../request/GeneratePropertiesRequest.java         |   16 +
 .../generateproperties/request/SelectionState.java |   16 +
 .../OverrideMethodsChangeProcessor.java            |   16 +
 .../OverrideMethodsRefactoring.java                |   16 +
 .../OverrideMethodsRequestProcessor.java           |   16 +
 .../overridemethods/edit/MethodEdit.java           |   16 +
 .../request/OverrideMethodsRequest.java            |   16 +
 .../extractlocal/ExtractLocalChangeProcessor.java  |   16 +
 .../extractlocal/ExtractLocalRefactoring.java      |   17 +
 .../extractlocal/ExtractLocalRequestProcessor.java |   16 +
 .../extractlocal/edit/CreateLocalVariableEdit.java |   17 +
 .../edit/ReplaceDuplicateWithVariableEdit.java     |   16 +
 .../extractlocal/edit/ReplaceWithVariableEdit.java |   16 +
 .../extractlocal/request/ExtractLocalRequest.java  |   16 +
 .../ExtractMethodChangeProcessor.java              |   16 +
 .../extractmethod/ExtractMethodRefactoring.java    |   16 +
 .../ExtractMethodRequestProcessor.java             |   16 +
 .../extractmethod/edit/ExtractCallEdit.java        |   16 +
 .../extractmethod/edit/ExtractMethodEdit.java      |   16 +
 .../extractmethod/edit/ParameterReturnDeduce.java  |   16 +
 .../request/ExtractMethodRequest.java              |   16 +
 .../inlinelocal/edit/RemoveAssignment.java         |   14 +
 .../core/base/AbstractFileChangeProcessor.java     |   16 +
 .../core/base/AbstractPythonRefactoring.java       |   16 +
 .../refactoring/core/base/PyDocumentChange.java    |   11 +
 .../core/base/PyDocumentChangeForTests.java        |   11 +
 .../refactoring/core/base/PyTextFileChange.java    |   11 +
 .../refactoring/core/base/RefactoringInfo.java     |   24 +-
 .../core/change/CompositeChangeProcessor.java      |   16 +
 .../refactoring/core/change/IChangeProcessor.java  |   16 +
 .../refactoring/core/edit/AbstractInsertEdit.java  |   16 +
 .../refactoring/core/edit/AbstractRemoveEdit.java  |   14 +
 .../refactoring/core/edit/AbstractReplaceEdit.java |   16 +
 .../refactoring/core/edit/AbstractTextEdit.java    |   16 +
 .../core/model/OffsetStrategyModel.java            |   16 +
 .../core/model/OffsetStrategyProvider.java         |   16 +
 .../constructorfield/ClassFieldTreeProvider.java   |   14 +
 .../model/constructorfield/TreeNodeClassField.java |   14 +
 .../core/model/constructorfield/TreeNodeField.java |   14 +
 .../generateproperties/PropertyTreeProvider.java   |   14 +
 .../generateproperties/TreeAttributeNode.java      |   16 +
 .../model/generateproperties/TreeClassNode.java    |   14 +
 .../overridemethods/ClassMethodsTreeProvider.java  |   14 +
 .../core/model/overridemethods/ClassTreeNode.java  |   14 +
 .../model/overridemethods/FunctionTreeNode.java    |   14 +
 .../refactoring/core/model/tree/ITreeNode.java     |   16 +
 .../core/model/tree/TreeNodeSimple.java            |   16 +
 .../request/IExtractMethodRefactoringRequest.java  |   11 +
 .../core/request/IRefactoringRequest.java          |   16 +
 .../core/request/IRequestProcessor.java            |   16 +
 .../refactoring/core/validator/NameValidator.java  |   16 +
 .../pydev/refactoring/messages/Messages.java       |   16 +
 .../ui/actions/ConstructorFieldAction.java         |   16 +
 .../refactoring/ui/actions/ExtractLocalAction.java |   16 +
 .../ui/actions/ExtractMethodAction.java            |   16 +
 .../ui/actions/GeneratePropertiesAction.java       |   16 +
 .../ui/actions/OverrideMethodsAction.java          |   16 +
 .../internal/AbstractRefactoringAction.java        |   16 +
 .../pydev/refactoring/ui/core/LabeledEdit.java     |   16 +
 .../refactoring/ui/core/PepticImageCache.java      |   16 +
 .../ui/core/PythonRefactoringWizard.java           |   16 +
 .../refactoring/ui/core/TreeLabelProvider.java     |   16 +
 .../refactoring/ui/pages/ConstructorFieldPage.java |   16 +
 .../ui/pages/GeneratePropertiesPage.java           |   16 +
 .../refactoring/ui/pages/OverrideMethodsPage.java  |   16 +
 .../refactoring/ui/pages/PyDevInputWizardPage.java |   17 +-
 .../refactoring/ui/pages/core/SimpleTableItem.java |   16 +
 .../pages/extractlocal/ExtractLocalInputPage.java  |   15 +
 .../extractmethod/ExtractMethodComposite.java      |   16 +
 .../ui/pages/extractmethod/ExtractMethodPage.java  |   16 +
 .../pages/extractmethod/VariableCellValidator.java |   16 +
 .../ui/pages/inlinelocal/InlineTempInputPage.java  |   14 +
 .../pages/listener/ButtonActivationListener.java   |   16 +
 .../pages/listener/FunctionSignatureListener.java  |   16 +
 .../ui/pages/listener/IValidationPage.java         |   16 +
 .../ui/pages/listener/TableCellEditorListener.java |   16 +
 .../refactoring/utils/DirectoryTraverser.java      |   14 +
 .../python/pydev/refactoring/utils/FileUtils.java  |   14 +
 .../python/pydev/refactoring/utils/ListUtils.java  |   14 +
 .../pydev/refactoring/utils/StringUtils.java       |  102 -
 .../python/pydev/refactoring/utils/TestUtils.java  |   14 +
 .../ast/visitors/FindDuplicatesVisitorTest.java    |    2 +-
 .../tests/adapter/FunctionDefAdapterTestCase2.java |   11 +
 .../pydev/refactoring/tests/ast/AllTests.java      |   11 +
 .../tests/ast/factory/PyAstFactoryTest.java        |   11 +
 .../factory/PyAstFactoryWithPrettyPrinting.java    |   11 +
 .../GeneratePropertiesRequestTest.java             |   11 +
 .../MockupOverrideMethodsRequestProcessor.java     |    2 +-
 .../extractlocal/ExtractLocalTestCase.java         |   14 +
 .../extractlocal/ExtractLocalTestSuite.java        |   14 +
 .../inlinelocal/InlineLocalTestCase.java           |   14 +
 .../inlinelocal/InlineLocalTestSuite.java          |   14 +
 .../refactoring/tests/core/AbstractIOTestCase.java |    1 -
 .../pydev/refactoring/tests/core/TestData.java     |   14 +
 .../pydev/refactoring/tests/utils/AllTests.java    |   15 +-
 .../refactoring/tests/utils/FileUtilsTest.java     |   15 +-
 .../refactoring/tests/utils/StringUtilsTest.java   |   50 -
 .../refactoring/tests/utils/TestUtilsTest.java     |   14 +
 plugins/org.python.pydev.shared_core/.classpath    |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    7 +-
 plugins/org.python.pydev.shared_core/pom.xml       |    4 +-
 .../python/pydev/shared_core/SharedCorePlugin.java |   47 +-
 .../shared_core/actions/LineCommentAction.java     |   11 +
 .../shared_core/actions/LineUncommentAction.java   |   11 +
 .../actions/ToggleLineCommentAction.java           |   11 +
 .../shared_core/auto_edit/AutoEditPairMatcher.java |   15 +-
 .../auto_edit/AutoEditStrategyBackspaceHelper.java |    2 +-
 .../auto_edit/AutoEditStrategyHelper.java          |   15 +-
 .../auto_edit/AutoEditStrategyNewLineHelper.java   |   11 +
 .../AutoEditStrategyScopeCreationHelper.java       |   90 +-
 .../auto_edit/IIndentationStringProvider.java      |   11 +
 .../org/python/pydev/shared_core/cache/Cache.java  |    2 +-
 .../pydev/shared_core/cache/CacheMapWrapper.java   |    2 +-
 .../python/pydev/shared_core/cache/LRUCache.java   |    2 +-
 .../org/python/pydev/shared_core/cache/LRUMap.java |    2 +-
 .../callbacks/CallbackWithListeners.java           |    2 +-
 .../pydev/shared_core/callbacks/ICallback.java     |    2 +-
 .../pydev/shared_core/callbacks/ICallback0.java    |    2 +-
 .../pydev/shared_core/callbacks/ICallback2.java    |    2 +-
 .../shared_core/callbacks/ICallbackListener.java   |    2 +-
 .../callbacks/ICallbackWithListeners.java          |    2 +-
 .../pydev/shared_core/callbacks/ListenerList.java  |  200 +
 .../pydev/shared_core/editor/IBaseEditor.java      |   11 +
 .../io/ExtendedByteArrayOutputStream.java          |    2 +-
 .../org/python/pydev/shared_core/io/FileUtils.java |  271 +-
 .../pydev/shared_core/io/PipedInputStream.java     |    2 +-
 .../pydev/shared_core/io/ThreadStreamReader.java   |    2 +-
 .../shared_core/io/ThreadStreamReaderPrinter.java  |    2 +-
 .../src/org/python/pydev/shared_core/log/Log.java  |   26 +-
 .../pydev/shared_core/model/ErrorDescription.java  |    2 +-
 .../pydev/shared_core/model/IModelListener.java    |    2 +-
 .../pydev/shared_core/model/ISimpleNode.java       |    2 +-
 .../python/pydev/shared_core/net/LocalHost.java    |    2 +-
 .../python/pydev/shared_core/net/SocketUtil.java   |    2 +-
 .../pydev/shared_core/parsing/BaseParser.java      |   12 +
 .../shared_core/parsing/BaseParserManager.java     |   11 +
 .../parsing/ChangedParserInfoForObservers.java     |    2 +-
 .../parsing/ErrorParserInfoForObservers.java       |    2 +-
 .../python/pydev/shared_core/parsing/IParser.java  |   15 +-
 .../pydev/shared_core/parsing/IParserObserver.java |    2 +-
 .../shared_core/parsing/IParserObserver2.java      |    2 +-
 .../shared_core/parsing/IParserObserver3.java      |    2 +-
 .../pydev/shared_core/parsing/IScopesParser.java   |   11 +
 .../pydev/shared_core/parsing/ParserScheduler.java |    2 +-
 .../pydev/shared_core/parsing/ParsingThread.java   |    2 +-
 .../pydev/shared_core/parsing/ScopeEntry.java      |   11 +
 .../python/pydev/shared_core/parsing/Scopes.java   |   11 +
 .../shared_core/partitioner/IMarkScanner.java      |   11 +
 .../partitioner/PartitionCodeReader.java           |   15 +-
 .../shared_core/partitioner/PartitionMerger.java   |   11 +
 .../path_watch/EventsStackerRunnable.java          |  318 +
 .../path_watch/IFilesystemChangesListener.java     |   32 +
 .../pydev/shared_core/path_watch/PathWatch.java    |  324 +
 .../python/pydev/shared_core/path_watch/foo.java   |    5 +
 .../pydev/shared_core/process/ProcessUtils.java    |   11 +
 .../pydev/shared_core/string/Base64Coder.java      |   57 +-
 .../pydev/shared_core/string/BaseParsingUtils.java |   11 +
 .../pydev/shared_core/string/DocIterator.java      |   11 +
 .../pydev/shared_core/string/FastStringBuffer.java |    2 +-
 .../shared_core/string/ICharacterPairMatcher2.java |   11 +
 .../string/NoPeerAvailableException.java           |    2 +-
 .../pydev/shared_core/string/SelectionKeeper.java  |    2 +-
 .../pydev/shared_core/string/StringUtils.java      |  131 +-
 .../shared_core/string/TextSelectionUtils.java     |   34 +-
 .../shared_core/structure/CollectionFactory.java   |    2 +-
 .../structure/DataAndImageTreeNode.java            |   55 +-
 .../pydev/shared_core/structure/FastStack.java     |    2 +-
 .../shared_core/structure/ImmutableTuple.java      |    2 +-
 .../pydev/shared_core/structure/Location.java      |    2 +-
 .../shared_core/structure/LowMemoryArrayList.java  |    2 +-
 .../pydev/shared_core/structure/OrderedMap.java    |   11 +
 .../pydev/shared_core/structure/OrderedSet.java    |   11 +
 .../structure/StringToIntCounterSmallSet.java      |   82 +
 .../pydev/shared_core/structure/TreeNode.java      |   33 +-
 .../structure/TreeNodeContentProvider.java         |   23 +-
 .../python/pydev/shared_core/structure/Tuple.java  |    2 +-
 .../python/pydev/shared_core/structure/Tuple3.java |    2 +-
 .../python/pydev/shared_core/structure/Tuple4.java |    2 +-
 .../pydev/shared_core/testutils/TestUtils.java     |   40 +-
 .../python/pydev/shared_core/utils/ArrayUtils.java |    2 +-
 .../shared_core/utils/BaseExtensionHelper.java     |   21 +-
 .../org/python/pydev/shared_core/utils/DocCmd.java |    2 +-
 .../python/pydev/shared_core/utils/DocUtils.java   |   11 +
 .../pydev/shared_core/utils/PlatformUtils.java     |   11 +
 .../python/pydev/shared_core/utils/Reflection.java |   11 +
 .../shared_core/utils/ThreadPriorityHelper.java    |   26 +
 .../org/python/pydev/shared_core/utils/Timer.java  |    2 +-
 .../shared_core/actions/CommentActionTest.java     |   11 +
 .../auto_edit/PartitionCodeReaderTest.java         |   11 +
 .../python/pydev/shared_core/io/FileUtilsTest.java |  108 +
 .../shared_core/path_watch/PathWatchTest.java      |  450 +
 .../shared_core/string/TextSelectionUtilsTest.java |   11 +
 .../structure/StringToIntCounterSmallSetTest.java  |   27 +
 .../pydev/shared_core/structure/TreeNodeTest.java  |   11 +
 .../.classpath                                     |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |    6 +-
 .../pom.xml                                        |    2 +-
 .../console/IXmlRpcClient.java                     |    2 +-
 .../console/ScriptConsoleGlobalHistory.java        |   40 +-
 .../console/ScriptXmlRpcClient.java                |    2 +-
 .../codegen/IScriptConsoleCodeGenerator.java       |   12 +
 .../console/codegen/PythonSnippetUtils.java        |   32 +-
 .../codegen/SafeScriptConsoleCodeGenerator.java    |   12 +
 .../codegen/ScriptConsoleCodeGeneratorFactory.java |   12 +
 ...ucturedSelectionScriptConsoleCodeGenerator.java |   12 +
 .../console/ui/IConsoleStyleProvider.java          |    2 +-
 .../console/ui/ScriptConsole.java                  |    6 +-
 .../console/ui/ScriptStyleRange.java               |    2 +-
 .../console/ui/internal/ClipboardHandler.java      |    2 +-
 .../ui/internal/IHandleScriptAutoEditStrategy.java |   11 +
 .../IScriptConsoleViewer2ForDocumentListener.java  |    2 +-
 .../ui/internal/ScriptConsoleDocumentListener.java |    2 +-
 .../actions/AbstractHandleBackspaceAction.java     |   11 +
 .../internal/actions/HandleDeletePreviousWord.java |    2 +-
 .../ui/internal/actions/HandleLineStartAction.java |    2 +-
 .../actions/IInteractiveConsoleConstants.java      |    2 +-
 .../AbstractHistoryElementListSelectionDialog.java |    2 +-
 .../HistoryElementListSelectionDialog.java         |    2 +-
 .../internal/fromeclipse/HistoryFilteredList.java  |    6 +-
 plugins/org.python.pydev.shared_ui/.classpath      |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../META-INF/MANIFEST.MF                           |   11 +-
 .../icons/jar_remove_l_obj.gif                     |  Bin 0 -> 991 bytes
 plugins/org.python.pydev.shared_ui/pom.xml         |    2 +-
 .../src/org/python/pydev/shared_ui/ColorCache.java |    2 +-
 .../python/pydev/shared_ui/ConsoleColorCache.java  |   11 +
 .../org/python/pydev/shared_ui/EditorUtils.java    |   76 +-
 .../src/org/python/pydev/shared_ui/FontUtils.java  |    2 +-
 .../src/org/python/pydev/shared_ui/IFontUsage.java |    2 +-
 .../src/org/python/pydev/shared_ui/ImageCache.java |    2 +-
 .../org/python/pydev/shared_ui/SharedUiPlugin.java |   38 +
 .../org/python/pydev/shared_ui/UIConstants.java    |    5 +-
 .../python/pydev/shared_ui/actions/BaseAction.java |   11 +
 .../shared_ui/actions/ScopeSelectionAction.java    |   12 +
 .../pydev/shared_ui/actions/ShiftLeftAction.java   |   11 +
 .../pydev/shared_ui/bindings/KeyBindingHelper.java |    2 +-
 .../python/pydev/shared_ui/bundle/BundleInfo.java  |    2 +-
 .../python/pydev/shared_ui/bundle/BundleUtils.java |    2 +-
 .../python/pydev/shared_ui/bundle/IBundleInfo.java |    2 +-
 .../AbstractCompletionProcessorWithCycling.java    |    2 +-
 .../content_assist/DefaultContentAssist.java       |   11 +
 .../pydev/shared_ui/dialogs/DialogHelpers.java     |   47 +
 .../pydev/shared_ui/dialogs/DialogMemento.java     |    2 +-
 .../shared_ui/dialogs/SelectElementDialog.java     |  102 +
 .../shared_ui/dialogs/TreeSelectionDialog.java     |    2 +-
 .../python/pydev/shared_ui/editor/BaseEditor.java  |   11 +
 .../shared_ui/editor/BaseEditorCursorListener.java |   11 +
 .../pydev/shared_ui/editor/IPyEditListener.java    |    2 +-
 .../pydev/shared_ui/editor/IPyEditListener2.java   |    2 +-
 .../pydev/shared_ui/editor/IPyEditListener3.java   |    2 +-
 .../pydev/shared_ui/editor/IPyEditListener4.java   |    2 +-
 .../pydev/shared_ui/editor/PyEditNotifier.java     |    2 +-
 .../shared_ui/field_editors/ButtonFieldEditor.java |  117 +
 .../shared_ui/field_editors/LabelFieldEditor.java  |   42 +
 .../shared_ui/field_editors/LinkFieldEditor.java   |    2 +-
 .../field_editors/MultiStringFieldEditor.java      |    2 +-
 .../outline/AbstractOutlineFilterAction.java       |    2 +-
 .../python/pydev/shared_ui/outline/BaseModel.java  |   11 +
 .../pydev/shared_ui/outline/BaseOutlinePage.java   |   37 +-
 .../pydev/shared_ui/outline/BaseParsedItem.java    |   11 +
 .../outline/ContentOutlinePageWithFilter.java      |   11 +
 .../pydev/shared_ui/outline/IOutlineModel.java     |    2 +-
 .../pydev/shared_ui/outline/IParsedItem.java       |   11 +
 .../outline/OutlineLinkWithEditorAction.java       |    2 +-
 .../shared_ui/outline/OutlineSortByNameAction.java |    2 +-
 .../shared_ui/outline/ParsedContentProvider.java   |    2 +-
 .../shared_ui/outline/ParsedLabelProvider.java     |    2 +-
 .../AbstractCompletionProposalExtension.java       |   12 +
 .../AbstractLinkedModeCompletionProposal.java      |   12 +
 .../proposals/ICompletionStyleToggleEnabler.java   |   11 +
 .../shared_ui/proposals/IPyCompletionProposal.java |    3 +-
 .../proposals/PyCompletionPresentationUpdater.java |    2 +-
 .../shared_ui/proposals/PyCompletionProposal.java  |    2 +-
 .../BaseQuickOutlineSelectionDialog.java           |   11 +
 .../DataAndImageTreeNodeContentProvider.java       |    8 +-
 .../AbstractDocumentTemplateContextWithIndent.java |   11 +
 .../pydev/shared_ui/tooltips/ToolTipHandler.java   |    2 +-
 .../presenter/AbstractInformationPresenter.java    |    2 +-
 .../AbstractTooltipInformationPresenter.java       |    2 +-
 .../presenter/IInformationPresenterAsTooltip.java  |    2 +-
 .../IInformationPresenterControlManager.java       |    2 +-
 .../presenter/ITooltipInformationProvider.java     |    2 +-
 .../InformationPresenterControlManager.java        |    2 +-
 .../InformationPresenterControlManager2.java       |    2 +-
 .../presenter/InformationPresenterHelpers.java     |    2 +-
 .../presenter/StyleRangeWithCustomData.java        |    2 +-
 .../presenter/ToolTipPresenterHandler.java         |    2 +-
 .../tree/LabelProviderWithDecoration.java          |   11 +
 .../pydev/shared_ui/tree/PyFilteredTree.java       |    2 +-
 .../utils/AsynchronousProgressMonitorDialog.java   |    7 +-
 .../utils/AsynchronousProgressMonitorWrapper.java  |   22 +
 .../pydev/shared_ui/utils/IViewWithControls.java   |    2 +-
 .../pydev/shared_ui/utils/PyMarkerUtils.java       |    2 +-
 .../pydev/shared_ui/utils/RunInUiThread.java       |    6 +-
 .../MinimapOverviewRulerPreferencesPage.java       |    2 +-
 plugins/org.python.pydev/.classpath                |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 plugins/org.python.pydev/META-INF/MANIFEST.MF      |    6 +-
 plugins/org.python.pydev/build.properties          |    9 +
 plugins/org.python.pydev/plugin.xml                |  426 +-
 plugins/org.python.pydev/pom.xml                   |   27 +-
 plugins/org.python.pydev/pysrc/.project            |   17 +
 plugins/org.python.pydev/pysrc/.pydevproject       |    8 +
 .../.settings/org.eclipse.core.resources.prefs     |    7 +
 .../org.python.pydev/pysrc/_pydev_xmlrpc_hook.py   |   74 +
 plugins/org.python.pydev/pysrc/interpreterInfo.py  |   14 +-
 .../org.python.pydev/pysrc/pycompletionserver.py   |  175 +-
 .../org.python.pydev/pysrc/pydev_console_utils.py  |   76 +-
 plugins/org.python.pydev/pysrc/pydev_guisupport.py |  150 -
 .../org.python.pydev/pysrc/pydev_ipython/README    |    8 +
 .../pysrc/pydev_ipython/inputhook.py               |  525 +
 .../pysrc/pydev_ipython/inputhookglut.py           |  153 +
 .../pysrc/pydev_ipython/inputhookgtk.py            |   36 +
 .../pysrc/pydev_ipython/inputhookgtk3.py           |   35 +
 .../pysrc/pydev_ipython/inputhookpyglet.py         |   92 +
 .../pysrc/pydev_ipython/inputhookqt4.py            |  194 +
 .../pysrc/pydev_ipython/inputhooktk.py             |   23 +
 .../pysrc/pydev_ipython/inputhookwx.py             |  167 +
 plugins/org.python.pydev/pysrc/pydev_ipython/qt.py |   23 +
 .../pysrc/pydev_ipython/qt_for_kernel.py           |   83 +
 .../pysrc/pydev_ipython/qt_loaders.py              |  258 +
 .../pysrc/pydev_ipython/version.py                 |   36 +
 .../pysrc/pydev_ipython_console.py                 |   58 +-
 .../pysrc/pydev_ipython_console_010.py             |  125 +-
 .../pysrc/pydev_ipython_console_011.py             |  402 +-
 plugins/org.python.pydev/pysrc/pydev_pysrc.py      |    1 +
 .../org.python.pydev/pysrc/pydev_runfiles_nose.py  |  104 +-
 .../pysrc/pydev_sitecustomize/sitecustomize.py     |    1 -
 plugins/org.python.pydev/pysrc/pydev_umd.py        |  172 +
 .../org.python.pydev/pysrc/pydev_versioncheck.py   |   16 +
 plugins/org.python.pydev/pysrc/pydevconsole.py     |  296 +-
 plugins/org.python.pydev/pysrc/pydevd.py           |  227 +-
 plugins/org.python.pydev/pysrc/pydevd_comm.py      |  267 +-
 plugins/org.python.pydev/pysrc/pydevd_constants.py |   46 +-
 plugins/org.python.pydev/pysrc/pydevd_resolver.py  |   60 +-
 plugins/org.python.pydev/pysrc/pydevd_vars.py      |  133 +-
 .../pysrc/tests/test_pydev_ipython.py              |   74 -
 .../pysrc/tests/test_pydev_ipython_010.py          |   80 +
 .../pysrc/tests/test_pydev_ipython_011.py          |  193 +
 .../pysrc/tests/test_pydevconsole.py               |  120 +-
 .../org.python.pydev/pysrc/tests_mainloop/README   |    4 +
 .../tests_mainloop/__not_in_default_pythonpath.txt |    1 +
 .../pysrc/tests_mainloop/gui-glut.py               |   50 +
 .../pysrc/tests_mainloop/gui-gtk.py                |   34 +
 .../pysrc/tests_mainloop/gui-gtk3.py               |   32 +
 .../pysrc/tests_mainloop/gui-pyglet.py             |   27 +
 .../pysrc/tests_mainloop/gui-qt.py                 |   35 +
 .../pysrc/tests_mainloop/gui-tk.py                 |   31 +
 .../pysrc/tests_mainloop/gui-wx.py                 |  101 +
 .../pysrc/tests_python/_debugger_case1.py          |    7 +-
 .../pysrc/tests_python/_debugger_case15.py         |   29 +
 .../tests_python/_debugger_case15_execfile.py      |    1 +
 .../pysrc/tests_python/_debugger_case16.py         |   12 +
 .../pysrc/tests_python/test_debugger.py            |  821 +-
 .../pysrc/tests_runfiles/test_runfiles.py          |  146 +-
 .../JDTNotAvailableException.java                  |    2 +-
 .../copiedfromeclipsesrc/JavaVmLocationFinder.java |    2 +-
 .../copiedfromeclipsesrc/PythonListEditor.java     |   67 +-
 .../src/org/python/pydev/builder/PyDevBuilder.java |    2 +-
 .../python/pydev/builder/PyDevBuilderPrefPage.java |    4 +-
 .../python/pydev/builder/PyDevBuilderVisitor.java  |    2 +-
 .../python/pydev/builder/PyDevDeltaCounter.java    |    2 +-
 .../python/pydev/builder/PydevGrouperVisitor.java  |    2 +-
 .../builder/PydevInternalResourceDeltaVisitor.java |    2 +-
 .../pycremover/PycHandlerBuilderVisitor.java       |    2 +-
 .../builder/pylint/PyLintPrefInitializer.java      |    2 +-
 .../pydev/builder/pylint/PyLintPrefPage.java       |    4 +-
 .../python/pydev/builder/pylint/PyLintVisitor.java |    4 +-
 .../ClearSyntaxMarkersPyeditListener.java          |    2 +-
 .../builder/syntaxchecker/PySyntaxChecker.java     |    2 +-
 .../python/pydev/builder/todo/PyTodoPrefPage.java  |    2 +-
 .../python/pydev/builder/todo/PyTodoVisitor.java   |    2 +-
 .../pydev/changed_lines/ChangedLinesComputer.java  |    2 +-
 .../python/pydev/changed_lines/LineComparator.java |    2 +-
 .../pydev/compare/PyContentViewerCreator.java      |    2 +-
 .../org/python/pydev/compare/PyMergeViewer.java    |    2 +-
 .../org/python/pydev/consoles/MessageConsoles.java |    2 +-
 .../src/org/python/pydev/editor/ActionInfo.java    |    2 +-
 .../python/pydev/editor/ICodeScannerKeywords.java  |    2 +-
 .../pydev/editor/IOfflineActionWithParameters.java |    2 +-
 .../org/python/pydev/editor/KeyAssistDialog.java   |    2 +-
 .../python/pydev/editor/OfflineActionsManager.java |    5 +-
 .../src/org/python/pydev/editor/PyCodeScanner.java |    2 +-
 .../org/python/pydev/editor/PyColoredScanner.java  |    2 +-
 .../python/pydev/editor/PyDocumentProvider.java    |    2 +-
 .../pydev/editor/PyDocumentSetupParticipant.java   |    2 +-
 .../python/pydev/editor/PyDoubleClickStrategy.java |    2 +-
 .../src/org/python/pydev/editor/PyEdit.java        |    2 +-
 .../editor/PyEditBasedCodeScannerKeywords.java     |    2 +-
 .../python/pydev/editor/PyEditConfiguration.java   |    2 +-
 .../editor/PyEditConfigurationWithoutEditor.java   |    2 +-
 .../src/org/python/pydev/editor/PyEditTitle.java   |    2 +-
 .../editor/PyExternalZipFileAnnotationModel.java   |   11 +
 .../pydev/editor/PyInformationPresenter.java       |    2 +-
 .../org/python/pydev/editor/PyLineBreakReader.java |    2 +-
 .../src/org/python/pydev/editor/PyReconciler.java  |    2 +-
 .../org/python/pydev/editor/PyStringScanner.java   |   11 +
 .../src/org/python/pydev/editor/PyWordRule.java    |    2 +-
 .../pydev/editor/PydevShowBrowserMessage.java      |   15 +-
 .../editor/StyledTextForShowingCodeFactory.java    |    4 +-
 .../editor/actions/AbstractBlockCommentAction.java |   20 +-
 .../pydev/editor/actions/FirstCharAction.java      |    2 +-
 .../pydev/editor/actions/IOrganizeImports.java     |    2 +-
 .../python/pydev/editor/actions/OfflineAction.java |    2 +-
 .../pydev/editor/actions/OfflineActionTarget.java  |    2 +-
 .../editor/actions/OrganizeImportsFixesUnused.java |    2 +-
 .../org/python/pydev/editor/actions/PyAction.java  |    2 +-
 .../pydev/editor/actions/PyAddBlockComment.java    |   22 +-
 .../editor/actions/PyAddSingleBlockComment.java    |   15 +-
 .../python/pydev/editor/actions/PyBackspace.java   |    2 +-
 .../org/python/pydev/editor/actions/PyComment.java |    2 +-
 .../pydev/editor/actions/PyConvertSpaceToTab.java  |    4 +-
 .../pydev/editor/actions/PyConvertTabToSpace.java  |    2 +-
 .../pydev/editor/actions/PyCopyQualifiedName.java  |    2 +-
 .../python/pydev/editor/actions/PyFormatStd.java   |    2 +-
 .../editor/actions/PyGoToMatchingBracket.java      |    4 +-
 .../pydev/editor/actions/PyMethodNavigation.java   |    2 +-
 .../pydev/editor/actions/PyMoveLineAction.java     |    2 +-
 .../pydev/editor/actions/PyMoveLineDownAction.java |    2 +-
 .../pydev/editor/actions/PyMoveLineUpAction.java   |    2 +-
 .../python/pydev/editor/actions/PyNextMethod.java  |    2 +-
 .../python/pydev/editor/actions/PyOpenAction.java  |    2 +-
 .../pydev/editor/actions/PyOrganizeImports.java    |   12 +-
 .../python/pydev/editor/actions/PyPeerLinker.java  |    2 +-
 .../pydev/editor/actions/PyPreviousMethod.java     |    2 +-
 .../pydev/editor/actions/PyRemoveBlockComment.java |    4 +-
 .../pydev/editor/actions/PyScopeDeselection.java   |    2 +-
 .../pydev/editor/actions/PyScopeSelection.java     |    2 +-
 .../python/pydev/editor/actions/PySelectWord.java  |    2 +-
 .../python/pydev/editor/actions/PyShiftLeft.java   |    2 +-
 .../python/pydev/editor/actions/PyShowBrowser.java |    2 +-
 .../python/pydev/editor/actions/PyShowOutline.java |    2 +-
 .../pydev/editor/actions/PyToggleComment.java      |    2 +-
 .../pydev/editor/actions/PyToggleForceTabs.java    |    2 +-
 .../python/pydev/editor/actions/PyUncomment.java   |    2 +-
 .../pydev/editor/actions/PyWrapParagraph.java      |    2 +-
 .../editor/actions/codefolding/PyCollapse.java     |    2 +-
 .../editor/actions/codefolding/PyCollapseAll.java  |    2 +-
 .../actions/codefolding/PyFoldingAction.java       |    2 +-
 .../editor/actions/codefolding/PyUnCollapse.java   |    2 +-
 .../actions/codefolding/PyUnCollapseAll.java       |    2 +-
 .../actions/refactoring/PyRefactorAction.java      |    2 +-
 .../pydev/editor/autoedit/AbstractIndentPrefs.java |   11 +-
 .../pydev/editor/autoedit/DefaultIndentPrefs.java  |    5 +-
 .../editor/autoedit/PyAutoIndentStrategy.java      |   12 +-
 .../pydev/editor/autoedit/TestIndentPrefs.java     |    2 +-
 .../editor/codefolding/CodeFoldingSetter.java      |    6 +-
 .../pydev/editor/codefolding/FoldingEntry.java     |    2 +-
 .../codefolding/MarkerAnnotationAndPosition.java   |    2 +-
 .../codefolding/PyDevCodeFoldingPrefPage.java      |    2 +-
 .../pydev/editor/codefolding/PyEditProjection.java |    2 +-
 .../editor/codefolding/PyProjectionAnnotation.java |    2 +-
 .../pydev/editor/codefolding/PySourceViewer.java   |    2 +-
 .../commentblocks/CommentBlocksPreferences.java    |    2 +-
 .../correctionassist/FixCompletionProposal.java    |    2 +-
 .../editor/correctionassist/MarkerResolution.java  |    2 +-
 .../correctionassist/PyCorrectionAssistant.java    |    2 +-
 .../pydev/editor/correctionassist/PyQuickFix.java  |    2 +-
 .../PythonCorrectionProcessor.java                 |    2 +-
 .../docstrings/AssistDocString.java                |    2 +-
 .../docstrings/DocstringsPrefPage.java             |   13 +-
 .../docstrings/ParameterNamePrefixListEditor.java  |    2 +-
 .../correctionassist/heuristics/AssistAssign.java  |    2 +-
 .../heuristics/AssistAssignCompletionProposal.java |    9 +-
 .../correctionassist/heuristics/AssistImport.java  |    2 +-
 .../heuristics/AssistPercentToFormat.java          |   12 +
 .../heuristics/AssistSurroundWith.java             |    4 +-
 .../correctionassist/heuristics/IAssistProps.java  |    2 +-
 .../heuristics/PercentToBraceConverter.java        |  387 +-
 .../pydev/editor/hover/PyAnnotationHover.java      |    2 +-
 .../pydev/editor/hover/PyHoverPreferencesPage.java |    2 +-
 .../org/python/pydev/editor/hover/PyTextHover.java |    2 +-
 .../org/python/pydev/editor/model/ItemPointer.java |    2 +-
 .../python/pydev/editor/model/LengthEstimator.java |    2 +-
 .../pydev/editor/preferences/PydevTypingPrefs.java |    2 +-
 .../editor/refactoring/AbstractPyRefactoring.java  |    2 +-
 .../pydev/editor/refactoring/IPyRefactoring.java   |    2 +-
 .../refactoring/PyRefactoringFindDefinition.java   |    2 +-
 .../editor/refactoring/RefactoringRequest.java     |    2 +-
 .../saveactions/PydevDateFieldNameEditor.java      |   11 +
 .../saveactions/PydevSaveActionsPrefPage.java      |   19 +-
 .../pydev/editor/scripting/PyEditScripting.java    |    2 +-
 .../pydev/editor/templates/PyContextType.java      |    2 +-
 .../templates/PyTemplateVariableResolver.java      |    2 +-
 .../pydev/editor/templates/TemplateHelper.java     |    2 +-
 .../pydev/editorinput/PyEditorInputFactory.java    |   11 +
 .../pydev/editorinput/PyFileLabelProvider.java     |    2 +-
 .../org/python/pydev/editorinput/PyOpenEditor.java |   29 +-
 .../pydev/editorinput/PySourceLocatorBase.java     |    2 +-
 .../pydev/editorinput/PySourceLocatorPrefs.java    |    2 +-
 .../pydev/editorinput/PydevFileEditorInput.java    |    2 +-
 .../pydev/editorinput/PydevZipFileEditorInput.java |    2 +-
 .../pydev/editorinput/PydevZipFileStorage.java     |   37 +-
 .../org/python/pydev/logging/DebugSettings.java    |    2 +-
 .../pydev/logging/PyLoggingPreferencesPage.java    |   41 +-
 .../pydev/outline/OutlineHideCommentsAction.java   |    2 +-
 .../pydev/outline/OutlineHideFieldsAction.java     |    2 +-
 .../pydev/outline/OutlineHideImportsAction.java    |    2 +-
 .../outline/OutlineHideMagicObjectsAction.java     |    2 +-
 .../outline/OutlineHideNonPublicMembersAction.java |    2 +-
 .../outline/OutlineHideStaticMethodsAction.java    |    2 +-
 .../src/org/python/pydev/outline/ParsedItem.java   |    2 +-
 .../src/org/python/pydev/outline/ParsedModel.java  |    2 +-
 .../org/python/pydev/outline/PyOutlinePage.java    |    2 +-
 .../src/org/python/pydev/plugin/PydevPlugin.java   |  114 +-
 .../pydev/plugin/nature/AbstractPythonNature.java  |    2 +-
 .../pydev/plugin/nature/IPythonNatureListener.java |    2 +-
 .../pydev/plugin/nature/IPythonNatureStore.java    |    2 +-
 .../plugin/nature/IPythonPathContributor.java      |    2 +-
 .../pydev/plugin/nature/IPythonPathHelper.java     |    2 +-
 .../pydev/plugin/nature/PyNatureReindexer.java     |    2 +-
 .../python/pydev/plugin/nature/PythonNature.java   |   16 +-
 .../nature/PythonNatureListenersManager.java       |    2 +-
 .../pydev/plugin/nature/PythonNatureStore.java     |    2 +-
 .../pydev/plugin/nature/PythonPathNature.java      |    6 +-
 .../pydev/plugin/nature/SystemPythonNature.java    |    6 +-
 .../plugin/preferences/AbstractPydevPrefs.java     |    2 +-
 .../preferences/IPydevPreferencesProvider.java     |    2 +-
 .../plugin/preferences/PyCodeFormatterPage.java    |    2 +-
 .../preferences/PyCodeStylePreferencesPage.java    |    7 +-
 .../plugin/preferences/PyTitlePreferencesPage.java |    4 +-
 .../pydev/plugin/preferences/PydevPrefs.java       |    2 +-
 .../plugin/preferences/PydevPrefsInitializer.java  |   19 +-
 .../pydev/plugin/preferences/PydevRootPrefs.java   |    6 +-
 .../pydev/pyunit/preferences/PyUnitPrefsPage2.java |    4 +-
 .../org/python/pydev/runners/SimpleExeRunner.java  |    2 +-
 .../pydev/runners/SimpleIronpythonRunner.java      |   31 +-
 .../python/pydev/runners/SimpleJythonRunner.java   |    2 +-
 .../python/pydev/runners/SimplePythonRunner.java   |    2 +-
 .../src/org/python/pydev/runners/SimpleRunner.java |   99 +-
 .../org/python/pydev/runners/UniversalRunner.java  |    2 +-
 .../python/pydev/tree/FileTreeContentProvider.java |    2 +-
 .../python/pydev/tree/FileTreeLabelProvider.java   |    2 +-
 .../org/python/pydev/ui/ColorAndStyleCache.java    |    2 +-
 .../org/python/pydev/ui/IViewCreatedObserver.java  |    2 +-
 ...ManagerCopiedToAddCreateMenuWithMenuParent.java |   12 +
 .../src/org/python/pydev/ui/NotifyViewCreated.java |   11 +
 .../org/python/pydev/ui/PyProjectProperties.java   |    2 +-
 .../python/pydev/ui/PyProjectPythonDetails.java    |   87 +-
 .../org/python/pydev/ui/SetOrientationAction.java  |    2 +-
 .../src/org/python/pydev/ui/StreamConsumer.java    |    2 +-
 .../src/org/python/pydev/ui/TabVariables.java      |    2 +-
 .../python/pydev/ui/ViewPartWithOrientation.java   |    6 +-
 .../pydev/ui/actions/container/PyAddSrcFolder.java |    2 +-
 .../ui/actions/container/PyContainerAction.java    |    2 +-
 .../container/PyContainerFormatterAction.java      |    2 +-
 .../pydev/ui/actions/container/PyDeleteErrors.java |    2 +-
 .../container/PyDeletePycAndClassFiles.java        |    2 +-
 .../actions/container/PyOrganizeImportsAction.java |    2 +-
 .../pydev/ui/actions/container/PyRemSrcFolder.java |    2 +-
 .../ui/actions/container/PySourceFormatAction.java |    2 +-
 .../pydev/ui/actions/project/PyAddNature.java      |    2 +-
 .../pydev/ui/actions/project/PyRemoveNature.java   |    2 +-
 .../python/pydev/ui/actions/resources/Py2To3.java  |   10 +-
 .../ui/actions/resources/PyResourceAction.java     |    2 +-
 .../pydev/ui/dialogs/AbstractKeyValueDialog.java   |    2 +-
 .../dialogs/AbstractMapOfStringsInputDialog.java   |    2 +-
 .../ui/dialogs/DialogButtonEnablementHelper.java   |   55 +
 .../pydev/ui/dialogs/InterpreterInputDialog.java   |    2 +-
 .../pydev/ui/dialogs/MapOfStringsInputDialog.java  |    2 +-
 .../src/org/python/pydev/ui/dialogs/Package.java   |    2 +-
 .../pydev/ui/dialogs/ProjectSelectionDialog.java   |    2 +-
 .../python/pydev/ui/dialogs/PyDialogHelpers.java   |   57 +-
 .../pydev/ui/dialogs/PythonModulePickerDialog.java |    2 +-
 .../ui/dialogs/PythonPackageSelectionDialog.java   |    2 +-
 .../dialogs/SelectExistingOrCreateNewDialog.java   |   17 +-
 .../org/python/pydev/ui/dialogs/SelectNDialog.java |  106 +
 .../org/python/pydev/ui/dialogs/SourceFolder.java  |    2 +-
 .../pydev/ui/dialogs/TreeNodeLabelProvider.java    |   26 +
 .../pydev/ui/dialogs/TreeSelectionDialog.java      |   11 +
 .../python/pydev/ui/editors/TreeWithAddRemove.java |    2 +-
 .../ui/filetypes/FileTypesPreferencesPage.java     |   36 +-
 .../ui/importsconf/ImportsPreferencesPage.java     |   15 +-
 .../interpreters/AbstractInterpreterManager.java   |  154 +-
 .../ui/interpreters/ChooseInterpreterManager.java  |    2 +-
 .../ui/interpreters/IInterpreterObserver.java      |    2 +-
 .../interpreters/IronpythonInterpreterManager.java |    8 +-
 .../ui/interpreters/JythonInterpreterManager.java  |    7 +-
 .../ui/interpreters/PythonInterpreterManager.java  |    4 +-
 .../ui/perspective/PythonPerspectiveFactory.java   |    2 +-
 .../pythonpathconf/AbstractInterpreterEditor.java  |  156 +-
 .../AbstractInterpreterPreferencesPage.java        |   36 +-
 .../AbstractInterpreterProviderFactory.java        |   69 +-
 .../AbstractListWithNewRemoveControl.java          |    2 +-
 .../AlreadyInstalledInterpreterProvider.java       |   11 +
 .../pydev/ui/pythonpathconf/AutoConfigMaker.java   |  530 +-
 .../DefaultPathsForInterpreterInfo.java            |   24 +
 .../ui/pythonpathconf/IInterpreterInfoBuilder.java |   26 +-
 .../IInterpreterNewCustomEntries.java              |   12 +
 .../ui/pythonpathconf/IInterpreterProvider.java    |   11 +
 .../IInterpreterProviderFactory.java               |   11 +
 .../pythonpathconf/InterpreterConfigHelpers.java   |  346 +-
 .../InterpreterGeneralPreferencesPage.java         |  129 +
 .../pydev/ui/pythonpathconf/InterpreterInfo.java   |  237 +-
 .../InterpreterNewCustomEntriesAdapter.java        |   12 +
 .../IronpythonInterpreterEditor.java               |    4 +-
 .../IronpythonInterpreterPreferencesPage.java      |    6 +-
 .../IronpythonInterpreterProviderFactory.java      |   11 +
 .../ui/pythonpathconf/JythonInterpreterEditor.java |    2 +-
 .../JythonInterpreterPreferencesPage.java          |    2 +-
 .../JythonInterpreterProviderFactory.java          |   35 +-
 .../pydev/ui/pythonpathconf/MyEnvWorkingCopy.java  |    2 +-
 .../ObtainInterpreterInfoOperation.java            |    9 +-
 .../ui/pythonpathconf/PyListSelectionDialog.java   |   33 +-
 .../ui/pythonpathconf/PythonInterpreterEditor.java |    2 +-
 .../PythonInterpreterPreferencesPage.java          |    2 +-
 .../PythonInterpreterProviderFactory.java          |   40 +-
 .../PythonSelectionLibrariesDialog.java            |    2 +-
 .../ui/wizards/files/AbstractPythonWizard.java     |    2 +-
 .../wizards/files/PythonExistingSourceGroup.java   |   29 +-
 .../pydev/ui/wizards/files/PythonModuleWizard.java |    2 +-
 .../ui/wizards/files/PythonPackageWizard.java      |    2 +-
 .../ui/wizards/files/PythonSourceFolderWizard.java |    2 +-
 .../ui/wizards/files/TemplateSelectDialog.java     |   11 +
 .../gettingstarted/AbstractNewProjectPage.java     |    2 +-
 .../gettingstarted/AbstractNewProjectWizard.java   |    2 +-
 .../wizards/gettingstarted/GettingStartedPage.java |    2 +-
 .../gettingstarted/PythonGettingStartedWizard.java |    2 +-
 .../IWizardNewProjectNameAndLocationPage.java      |    2 +-
 .../NewProjectNameAndLocationWizardPage.java       |   54 +-
 .../ui/wizards/project/PythonProjectWizard.java    |   47 +-
 .../org/python/pydev/utils/ComboFieldEditor.java   |    2 +-
 .../src/org/python/pydev/utils/CounterThread.java  |    2 +-
 .../pydev/utils/CustomizableFieldEditor.java       |    2 +-
 .../python/pydev/utils/JobProgressComunicator.java |    2 +-
 .../org/python/pydev/utils/LabelFieldEditor.java   |   42 -
 .../pydev/utils/LabelFieldEditorWith2Cols.java     |    3 +-
 .../python/pydev/utils/PrintProgressMonitor.java   |    2 +-
 .../src/org/python/pydev/utils/ProgressAction.java |    2 +-
 .../org/python/pydev/utils/ProgressOperation.java  |    2 +-
 .../src/org/python/pydev/utils/PyFileListing.java  |   17 +-
 .../python/pydev/utils/TableComboFieldEditor.java  |    2 +-
 .../python/pydev/utils/tablecombo/TableCombo.java  |    2 +-
 .../pydev/utils/tablecombo/TableComboViewer.java   |    2 +-
 .../utils/tablecombo/TableComboViewerRow.java      |    2 +-
 .../codecompletion/AbstractPyCodeCompletion.java   |    2 +-
 .../AbstractPyCompletionProposalExtension2.java    |    2 +-
 .../AbstractTemplateCodeCompletion.java            |    8 +-
 .../editor/codecompletion/CompletionError.java     |    2 +-
 .../editor/codecompletion/CompletionRequest.java   |    2 +-
 .../IPyCalltipsContextInformation.java             |    2 +-
 .../editor/codecompletion/IPyCodeCompletion.java   |    2 +-
 .../IPyDevCompletionParticipant.java               |    2 +-
 .../IPyDevCompletionParticipant2.java              |    2 +-
 .../OverrideMethodCompletionProposal.java          |    2 +-
 .../editor/codecompletion/ProposalsComparator.java |    2 +-
 .../PyCalltipsContextInformation.java              |    2 +-
 .../PyCalltipsContextInformationFromIToken.java    |    2 +-
 .../editor/codecompletion/PyCodeCompletion.java    |    2 +-
 .../codecompletion/PyCodeCompletionImages.java     |   10 +-
 .../PyCodeCompletionInitializer.java               |    2 +-
 .../PyCodeCompletionPreferencesPage.java           |   39 +-
 .../codecompletion/PyCodeCompletionUtils.java      |    2 +-
 .../editor/codecompletion/PyContentAssistant.java  |    2 +-
 .../PyContextInformationValidator.java             |    2 +-
 .../PyLinkedModeCompletionProposal.java            |    2 +-
 .../codecompletion/PyStringCodeCompletion.java     |   11 +-
 .../codecompletion/PythonCompletionProcessor.java  |    2 +-
 .../PythonStringCompletionProcessor.java           |    2 +-
 .../codecompletion/revisited/ASTManager.java       |    2 +-
 .../revisited/AbstractASTManager.java              |    2 +-
 .../codecompletion/revisited/AbstractToken.java    |    2 +-
 .../codecompletion/revisited/AssignAnalysis.java   |    2 +-
 .../revisited/AssignCompletionInfo.java            |    2 +-
 .../codecompletion/revisited/CompletionCache.java  |    2 +-
 .../revisited/CompletionParticipantsHelper.java    |    2 +-
 .../codecompletion/revisited/CompletionState.java  |    2 +-
 .../revisited/CompletionStateFactory.java          |    2 +-
 .../revisited/CompletionStateWrapper.java          |    2 +-
 .../codecompletion/revisited/ConcreteToken.java    |    2 +-
 .../revisited/ManagerInfoToUpdate.java             |   69 +
 .../revisited/ModulesFoundStructure.java           |    2 +-
 .../codecompletion/revisited/ModulesManager.java   |   66 +-
 .../revisited/ModulesManagerCache.java             |    2 +-
 .../revisited/ModulesManagerWithBuild.java         |    4 +-
 .../revisited/ProjectModulesManager.java           |    2 +-
 .../revisited/PyCodeCompletionVisitor.java         |    2 +-
 .../codecompletion/revisited/PyPublicTreeMap.java  |    2 +-
 .../codecompletion/revisited/PythonPathHelper.java |   66 +-
 .../revisited/SourceModuleProposal.java            |    2 +-
 .../revisited/SynchSystemModulesManager.java       |  570 +
 .../SynchSystemModulesManagerScheduler.java        |  448 +
 .../codecompletion/revisited/SystemASTManager.java |    2 +-
 .../revisited/SystemModulesManager.java            |    2 +-
 .../javaintegration/AbstractJavaClassModule.java   |    2 +-
 .../revisited/javaintegration/JavaDefinition.java  |    2 +-
 .../javaintegration/JavaElementToken.java          |    2 +-
 .../javaintegration/JavaModuleInProject.java       |    3 +-
 .../javaintegration/JavaProjectModulesManager.java |    2 +-
 .../JavaProjectModulesManagerCreator.java          |    2 +-
 .../revisited/javaintegration/JavaZipModule.java   |    3 +-
 .../javaintegration/JythonModulesManagerUtils.java |    2 +-
 .../javaintegration/ModulesKeyForJava.java         |    2 +-
 .../modules/ASTEntryWithSourceModule.java          |    2 +-
 .../revisited/modules/AbstractModule.java          |    2 +-
 .../revisited/modules/CompiledModule.java          |    2 +-
 .../revisited/modules/CompiledToken.java           |    2 +-
 .../revisited/modules/EmptyModule.java             |    2 +-
 .../revisited/modules/EmptyModuleForZip.java       |    2 +-
 .../revisited/modules/PredefinedSourceModule.java  |    2 +-
 .../revisited/modules/SourceModule.java            |    2 +-
 .../revisited/modules/SourceToken.java             |    2 +-
 .../revisited/visitors/AbstractVisitor.java        |    2 +-
 .../revisited/visitors/AssignDefinition.java       |    2 +-
 .../revisited/visitors/Definition.java             |    2 +-
 .../visitors/FindDefinitionModelVisitor.java       |    2 +-
 .../revisited/visitors/FindScopeVisitor.java       |    2 +-
 .../revisited/visitors/GlobalModelVisitor.java     |    2 +-
 .../revisited/visitors/HeuristicFindAttrs.java     |    2 +-
 .../revisited/visitors/InnerModelVisitor.java      |    2 +-
 .../visitors/KeywordParameterDefinition.java       |    2 +-
 .../revisited/visitors/LocalScope.java             |    2 +-
 .../revisited/visitors/StopVisitingException.java  |    2 +-
 .../editor/codecompletion/shell/AbstractShell.java |  160 +-
 .../codecompletion/shell/IronpythonShell.java      |    2 +-
 .../editor/codecompletion/shell/JythonShell.java   |    2 +-
 .../codecompletion/shell/ProcessCreationInfo.java  |    2 +-
 .../editor/codecompletion/shell/PythonShell.java   |    2 +-
 .../DocumentTemplateContextWithIndent.java         |    2 +-
 .../templates/PyDocumentTemplateContext.java       |    2 +-
 .../templates/PyTemplateCompletionProcessor.java   |    2 +-
 .../simpleassist/ISimpleAssistParticipant.java     |    2 +-
 .../simpleassist/ISimpleAssistParticipant2.java    |    2 +-
 .../editor/simpleassist/SimpleAssistProcessor.java |    2 +-
 .../pydev/navigator/InterpreterInfoTreeNode.java   |    2 +-
 .../navigator/InterpreterInfoTreeNodeRoot.java     |    2 +-
 .../org/python/pydev/navigator/LabelAndImage.java  |    2 +-
 .../org/python/pydev/navigator/ModelAdapter.java   |    2 +-
 .../navigator/ProjectInfoForPackageExplorer.java   |    2 +-
 .../pydev/navigator/PyPackageStateSaver.java       |    2 +-
 .../pydev/navigator/PythonBaseModelProvider.java   |   80 +-
 .../pydev/navigator/PythonLabelProvider.java       |    2 +-
 .../pydev/navigator/PythonModelProvider.java       |    2 +-
 .../python/pydev/navigator/PythonpathTreeNode.java |   52 +-
 .../navigator/PythonpathZipChildTreeNode.java      |   11 +-
 .../TopLevelProjectsOrWorkingSetChoice.java        |    2 +-
 .../org/python/pydev/navigator/ZipStructure.java   |   31 +-
 .../python/pydev/navigator/actions/Helpers.java    |    2 +-
 .../navigator/actions/PyCopyResourceAction.java    |    2 +-
 .../navigator/actions/PyDeleteResourceAction.java  |    2 +-
 .../navigator/actions/PyMoveResourceAction.java    |    2 +-
 .../navigator/actions/PyOpenExternalAction.java    |    2 +-
 .../navigator/actions/PyOpenPythonFileAction.java  |    2 +-
 .../navigator/actions/PyOpenResourceAction.java    |    2 +-
 .../pydev/navigator/actions/PyPasteAction.java     |    2 +-
 .../navigator/actions/PyRenameResourceAction.java  |    4 +-
 .../navigator/actions/PySetupCustomFilters.java    |    2 +-
 .../navigator/actions/PythonActionProvider.java    |    2 +-
 .../pydev/navigator/actions/PythonLinkHelper.java  |    2 +-
 .../actions/PythonRefactorActionProvider.java      |    2 +-
 .../pydev/navigator/actions/copied/CopyAction.java |    2 +-
 .../copied/CopyFilesAndFoldersOperation.java       |    2 +-
 .../navigator/actions/copied/PasteAction.java      |    2 +-
 .../copied/PyResourceDropAdapterAssistant.java     |    2 +-
 .../navigator/actions/copied/WorkspaceAction.java  |    2 +-
 .../navigator/decorator/ProblemMarkerManager.java  |    2 +-
 .../decorator/ProblemsLabelDecorator.java          |    2 +-
 .../pydev/navigator/elements/ISortedElement.java   |    2 +-
 .../pydev/navigator/elements/IWrappedResource.java |    2 +-
 .../navigator/elements/ProjectConfigError.java     |    2 +-
 .../pydev/navigator/elements/PythonFile.java       |    2 +-
 .../pydev/navigator/elements/PythonFolder.java     |    2 +-
 .../pydev/navigator/elements/PythonNode.java       |    2 +-
 .../elements/PythonProjectSourceFolder.java        |    2 +-
 .../pydev/navigator/elements/PythonResource.java   |    2 +-
 .../navigator/elements/PythonSourceFolder.java     |    2 +-
 .../elements/PythonSourceFolderActionFilter.java   |    2 +-
 .../pydev/navigator/elements/WrappedResource.java  |    2 +-
 .../pydev/navigator/filters/AbstractFilter.java    |    2 +-
 .../pydev/navigator/filters/ClassFilter.java       |    2 +-
 .../navigator/filters/ClosedProjectsFilter.java    |    2 +-
 .../pydev/navigator/filters/CommentsFilter.java    |    2 +-
 .../pydev/navigator/filters/CustomFilters.java     |    2 +-
 .../pydev/navigator/filters/DotStartFilter.java    |    2 +-
 .../pydev/navigator/filters/ImportsFilter.java     |    2 +-
 .../navigator/filters/InterpreterInfoFilter.java   |    2 +-
 .../pydev/navigator/filters/PyTildaFilter.java     |    2 +-
 .../python/pydev/navigator/filters/PycFilter.java  |    2 +-
 .../navigator/filters/PydevProjectsFilter.java     |    2 +-
 .../python/pydev/navigator/filters/PyoFilter.java  |    2 +-
 .../pydev/navigator/filters/PythonNodeFilter.java  |    2 +-
 .../navigator/properties/PyPropertyTester.java     |    2 +-
 .../pydev/navigator/sorter/PythonModelSorter.java  |    2 +-
 .../pydev/navigator/ui/PydevPackageExplorer.java   |  223 +-
 .../copiedfromeclipsesrc/PythonCodeReaderTest.java |    2 +-
 .../PythonPairMatcherTest.java                     |    2 +-
 .../pydev/builder/todo/PyTodoVisitorTest.java      |    2 +-
 .../eclipseresourcestubs/FileResourceStub.java     |    2 +-
 .../pydev/editor/PyAutoIndentStrategyTest.java     |    2 +-
 .../org/python/pydev/editor/PyCodeScannerTest.java |    2 +-
 .../pydev/editor/PyEditTitleTestWorkbench.java     |    2 +-
 .../pydev/editor/PyInformationPresenterTest.java   |    2 +-
 .../pydev/editor/PyPartitionScannerTest.java       |    2 +-
 .../python/pydev/editor/PyStringScannerTest.java   |   11 +
 .../python/pydev/editor/actions/PyActionTest.java  |    4 +-
 .../editor/actions/PyAddBlockCommentTest.java      |    2 +-
 .../actions/PyAddSingleBlockCommentTest.java       |    2 +-
 .../pydev/editor/actions/PyBackspaceTest.java      |    2 +-
 .../python/pydev/editor/actions/PyCommentTest.java |    2 +-
 .../pydev/editor/actions/PyFormatStdTest.java      |   20 +-
 .../pydev/editor/actions/PyMoveLineActionTest.java |    2 +-
 .../editor/actions/PyOrganizeImportsTest.java      |    2 +-
 .../pydev/editor/actions/PyPeerLinkerTest.java     |    2 +-
 .../editor/actions/PyRemoveBlockCommentTest.java   |    2 +-
 .../pydev/editor/actions/PyScopeSelectionTest.java |    2 +-
 .../pydev/editor/actions/PySelectionTest.java      |    2 +-
 .../pydev/editor/actions/PyShiftLeftTest.java      |    2 +-
 .../pydev/editor/actions/PyToggleCommentTest.java  |    2 +-
 .../pydev/editor/actions/PyUncommentTest.java      |    2 +-
 .../pydev/editor/actions/SelectionKeeperTest.java  |    2 +-
 .../editor/codefolding/CodeFoldingSetterTest.java  |    2 +-
 .../correctionassist/AssistDocStringTest.java      |    3 +-
 .../heuristics/AssistAssignTest.java               |    2 +-
 .../heuristics/AssistCreateInModuleTest.java       |    2 +-
 .../heuristics/AssistSurroundWithTest.java         |    2 +-
 .../heuristics/PercentToBraceConverterTest.java    |   11 +
 .../python/pydev/editor/model/ItemPointerTest.java |    2 +-
 .../pydev/ironpythontests/IronpythonTest.java      |   36 +-
 .../org/python/pydev/jythontests/JythonTest.java   |   43 +-
 .../org/python/pydev/outline/ParsedItemTest.java   |    2 +-
 .../org/python/pydev/plugin/PydevTestUtils.java    |    2 +-
 .../org/python/pydev/plugin/nature/FileStub2.java  |    2 +-
 .../ProjectImportedHasAstManagerTestWorkbench.java |    2 +-
 .../python/pydev/plugin/nature/ProjectStub2.java   |    3 +-
 .../pydev/plugin/nature/PythonNatureStoreTest.java |   15 +-
 .../nature/SaveFileWithoutNatureTestWorkbench.java |    2 +-
 .../pythontests/AbstractBasicRunTestCase.java      |   27 +-
 .../org/python/pydev/pythontests/PythonTest.java   |   14 +-
 .../runners/IronPythonUniversalRunnerTest.java     |    2 +-
 .../pydev/runners/JythonUniversalRunnerTest.java   |   13 +-
 .../pydev/runners/PythonUniversalRunnerTest.java   |    2 +-
 .../python/pydev/runners/SimpleExeRunnerTest.java  |    2 +-
 .../pydev/runners/SimpleIronpythonRunnerTest.java  |    2 +-
 .../pydev/runners/SimpleJythonRunnerTest.java      |   11 +-
 .../pydev/runners/SimplePythonRunnerTest.java      |    2 +-
 .../pydev/runners/ThreadStreamReaderTest.java      |    2 +-
 .../tests/org/python/pydev/ui/BundleInfoStub.java  |    2 +-
 .../tests/org/python/pydev/ui/SWTTest.java         |    2 +-
 .../ui/interpreters/InterpreterManagerTest.java    |    2 +-
 .../ui/pythonpathconf/InterpreterInfoTest.java     |    2 +-
 .../pythonpathconf/MockStringVariableManager.java  |   12 +
 .../IronPythonCodeCompletionTestsBase.java         |    2 +-
 .../IronpythonCompletionWithBuiltinsTest.java      |    2 +-
 .../PyCalltipsContextInformationTest.java          |    2 +-
 .../codecompletion/PyCodeCompletion2Test.java      |    2 +-
 .../codecompletion/PyCodeCompletionTest.java       |    2 +-
 .../codecompletion/PyCodeCompletionUtilsTest.java  |    2 +-
 .../PyContextInformationValidatorTest.java         |    2 +-
 .../codecompletion/PythonApplyCompletionsTest.java |    2 +-
 .../codecompletion/PythonCompletion25Test.java     |    2 +-
 .../PythonCompletionCalltipsTest.java              |    2 +-
 .../PythonCompletionParametersTest.java            |    2 +-
 .../PythonCompletionStringsTest.java               |    2 +-
 .../PythonCompletionWithBuiltinsTest.java          |   35 +-
 ...PythonCompletionWithPredefinedBuiltinsTest.java |    2 +-
 ...ythonCompletionWithoutBuiltinsGrammar3Test.java |    2 +-
 .../PythonCompletionWithoutBuiltinsTest.java       |   35 +-
 .../codecompletion/PythonCompletionZipsTest.java   |    2 +-
 .../codecompletion/revisited/ASTManagerTest.java   |    2 +-
 .../revisited/AbstractTokenTest.java               |    2 +-
 .../revisited/CodeCompletionTestsBase.java         |    3 +-
 .../revisited/FindActualDefinitionTest.java        |    2 +-
 .../IronpythonInterpreterManagerStub.java          |    2 +-
 .../codecompletion/revisited/ModuleTest.java       |    2 +-
 .../revisited/ModulesManagerTest.java              |    2 +-
 .../revisited/ProjectModulesManagerTest.java       |    2 +-
 .../codecompletion/revisited/ProjectStub.java      |    3 +-
 .../revisited/PyCodeCompletionVisitorTest.java     |   11 +
 .../revisited/PythonInterpreterManagerStub.java    |    2 +-
 .../revisited/PythonPathHelperTest.java            |    4 +-
 .../revisited/SynchSystemModulesManagerTest.java   |   12 +
 .../javaintegration/AbstractWorkbenchTestCase.java |   18 +-
 .../JavaClassModuleTestWorkbench.java              |    2 +-
 .../jython/AbstractJythonWorkbenchTests.java       |   15 +-
 .../jython/JythonCodeCompletionTestsBase.java      |    2 +-
 .../JythonCompletionWithBuiltinsTestWorkbench.java |    2 +-
 .../jython/JythonFindDefinitionTestWorkbench.java  |    2 +-
 .../jython/JythonInterpreterManagerStub.java       |    2 +-
 .../revisited/visitors/AbstractVisitorTest.java    |    2 +-
 .../visitors/FindDefinitionModelVisitorTest.java   |    2 +-
 .../revisited/visitors/FindScopeVisitorTest.java   |    2 +-
 .../codecompletion/shell/PythonShellTest.java      |   18 +-
 .../templates/PyDocumentTemplateContextTest.java   |    2 +-
 .../dltk/console/ScriptConsoleHistoryTest.java     |    2 +-
 .../console/codegen/PythonSnippetUtilsTest.java    |   33 +-
 .../console/ui/ScriptConsolePartitionerTest.java   |    2 +-
 .../ScriptConsoleDocumentListenerTest.java         |    3 +-
 .../actions/HandleDeletePreviousWordTest.java      |    2 +-
 .../org/python/pydev/navigator/FileStub.java       |    2 +-
 .../org/python/pydev/navigator/FolderStub.java     |    2 +-
 .../org/python/pydev/navigator/ProjectStub.java    |    2 +-
 .../pydev/navigator/PythonModelProviderTest.java   |    2 +-
 .../pydev/navigator/PythonPathNatureStub.java      |    2 +-
 .../python/pydev/navigator/WorkspaceRootStub.java  |    2 +-
 .../org/python/pydev/navigator/WorkspaceStub.java  |    2 +-
 .../python/pydev/navigator/ZipStructureTest.java   |   62 +-
 plugins/pom.xml                                    |    3 +-
 pom.xml                                            |  256 +-
 rootproject/.project                               |  113 +
 rootproject/features/__directory_not_really_empty  |    2 +
 rootproject/plugins/__directory_not_really_empty   |    2 +
 rootproject/pydev-root.README                      |    1 +
 test_with_tycho.patch                              |  251 +
 travis.TODO                                        |   19 +
 travisdeps.sh                                      |   58 +
 travisgetkeystore.sh                               |   22 +
 travism2_install.sh                                |   18 +
 travism2_upload.sh                                 |   22 +
 travisupload.sh                                    |   71 +
 1849 files changed, 35476 insertions(+), 22343 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git



More information about the pkg-java-commits mailing list