Major code cleanup and refactoring.

1 files changed, 35 insertions, 41 deletions

diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
index 32047a6456..1229657381 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
@@ -8,47 +8,41 @@ import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.wst.jsdt.internal.ui.text.java.TemplateCompletionProposalComputer;
 import org.eclipse.wst.jsdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslationAdapter;
+import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
 
 public class JSDTTemplateAssistProcessor {
- 
-    TemplateCompletionProposalComputer fJavaTemplateCompletion;
-    JSPTranslationAdapter fTranslationAdapter;
-    IProgressMonitor monitor;
-    JSDTProposalCollector fProposalCollector;
-    
-    public JSDTTemplateAssistProcessor(){
-        monitor = new NullProgressMonitor();
-        
-    }
-    
-    private TemplateCompletionProposalComputer getTemplateCompletionProposalComputer(){
-        if(fJavaTemplateCompletion==null){
-            fJavaTemplateCompletion = new TemplateCompletionProposalComputer();
-        }
-        return fJavaTemplateCompletion;
-    }
-    
-    public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-        JavaContentAssistInvocationContext context = getInvocationContext(viewer, offset);
-        List props = getTemplateCompletionProposalComputer().computeCompletionProposals(context, monitor);
-        
-        return (ICompletionProposal[])props.toArray(new ICompletionProposal[]{});
-        
-    }
-    
-    private JavaContentAssistInvocationContext getInvocationContext(ITextViewer viewer, int offset){
-        return JSDTContetAssistInvocationContext.getInstance(viewer,offset,getProposalCollector());
-    }
-    
-    protected JSDTProposalCollector getProposalCollector() {
-        return fProposalCollector;
-       // return new JSPProposalCollector(translation);
-    }
-    
-    public void setProposalCollector(JSDTProposalCollector translation){
-        this.fProposalCollector = translation;
-    }
-
-    
+	TemplateCompletionProposalComputer fJavaTemplateCompletion;
+	JSDTProposalCollector fProposalCollector;
+	JsTranslationAdapter fTranslationAdapter;
+	IProgressMonitor monitor;
+	
+	public JSDTTemplateAssistProcessor() {
+		monitor = new NullProgressMonitor();
+	}
+	
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
+		JavaContentAssistInvocationContext context = getInvocationContext(viewer, offset);
+		List props = getTemplateCompletionProposalComputer().computeCompletionProposals(context, monitor);
+		return (ICompletionProposal[]) props.toArray(new ICompletionProposal[] {});
+	}
+	
+	private JavaContentAssistInvocationContext getInvocationContext(ITextViewer viewer, int offset) {
+		return JSDTContetAssistInvocationContext.getInstance(viewer, offset, getProposalCollector());
+	}
+	
+	protected JSDTProposalCollector getProposalCollector() {
+		return fProposalCollector;
+		// return new JSPProposalCollector(translation);
+	}
+	
+	private TemplateCompletionProposalComputer getTemplateCompletionProposalComputer() {
+		if (fJavaTemplateCompletion == null) {
+			fJavaTemplateCompletion = new TemplateCompletionProposalComputer();
+		}
+		return fJavaTemplateCompletion;
+	}
+	
+	public void setProposalCollector(JSDTProposalCollector translation) {
+		this.fProposalCollector = translation;
+	}
 }