CompletionProposalLabelProvider related refactoring

diff --git a/plugins/org.eclipse.dltk.python.ui/plugin.xml b/plugins/org.eclipse.dltk.python.ui/plugin.xml
index 2ce941f..e598622 100644
--- a/plugins/org.eclipse.dltk.python.ui/plugin.xml
+++ b/plugins/org.eclipse.dltk.python.ui/plugin.xml

@@ -223,6 +223,13 @@
         type="__dftl_partition_content_type" />
     </scriptCompletionProposalComputer>
   </extension>
+  <extension
+        point="org.eclipse.dltk.ui.completion">
+        <proposalLabelProvider
+              class="org.eclipse.dltk.python.internal.ui.text.completion.PythonCompletionProposalLabelProvider"
+              nature="org.eclipse.dltk.python.core.nature">
+        </proposalLabelProvider>
+  </extension>
  
 <extension
          point="org.eclipse.dltk.ui.dltkElementFilters">

diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonCompletionProcessor.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonCompletionProcessor.java
index 8e609e4..df7c28e 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonCompletionProcessor.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonCompletionProcessor.java

@@ -1,10 +1,7 @@
 package org.eclipse.dltk.python.internal.ui.text.completion;
 
 import org.eclipse.dltk.python.core.PythonNature;
-import org.eclipse.dltk.python.internal.ui.PythonUI;
-import org.eclipse.dltk.ui.text.completion.CompletionProposalLabelProvider;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProcessor;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.ui.IEditorPart;
 
@@ -18,24 +15,9 @@
 		super(editor, assistant, partition);
 	}
 
-	/*
-	 * @see org.eclipse.dltk.ui.text.completion.ScriptCompletionProcessor#getNatureId()
-	 */
+	@Override
 	protected String getNatureId() {
 		return PythonNature.NATURE_ID;
 	}
 
-	/*
-	 * @see org.eclipse.dltk.ui.text.completion.ScriptCompletionProcessor#getProposalLabelProvider()
-	 */
-	protected CompletionProposalLabelProvider getProposalLabelProvider() {
-		return new PythonCompletionProposalLabelProvider();
-	}
-
-	/*
-	 * @see org.eclipse.dltk.ui.text.completion.ContentAssistProcessor#getPreferenceStore()
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return PythonUI.getDefault().getPreferenceStore();
-	}
 }

diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonTypeCompletionProposalComputer.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonTypeCompletionProposalComputer.java
index 90dcadc..4168ab0 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonTypeCompletionProposalComputer.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/completion/PythonTypeCompletionProposalComputer.java

@@ -1,6 +1,7 @@
 package org.eclipse.dltk.python.internal.ui.text.completion;
 
 import org.eclipse.dltk.python.internal.ui.templates.PythonTemplateCompletionProcessor;
+import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalComputer;
 import org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext;
 import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
@@ -13,4 +14,11 @@
 		return new PythonTemplateCompletionProcessor(context);
 	}
 
+	@Override
+	protected ScriptCompletionProposalCollector createCollector(
+			ScriptContentAssistInvocationContext context) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }