Refactory: smarty.ui plugin.

diff --git a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
index 97df30f..3619047 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
@@ -10,15 +10,13 @@ Export-Package: net.sourceforge.phpdt.smarty.ui,
  net.sourceforge.phpdt.smarty.ui.internal;x-internal:=true,
  net.sourceforge.phpdt.smarty.ui.internal.editor;x-internal:=true,
  net.sourceforge.phpdt.smarty.ui.internal.text;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.filebuffers,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
+Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.jface.text,
  net.sourceforge.phpeclipse.ui,
- net.sourceforge.phpeclipse.xml.ui
+ org.eclipse.ui.editors;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.1",
+ org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.ui.ide
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyCompletionProcessor.java b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyCompletionProcessor.java
index 1aef925..79a1903 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyCompletionProcessor.java
@@ -12,7 +12,7 @@ package net.sourceforge.phpdt.smarty.ui.internal.text;
 
 import net.sourceforge.phpeclipse.ui.WebUI;
 import net.sourceforge.phpeclipse.ui.templates.template.BasicCompletionProcessor;
-import net.sourceforge.phpeclipse.ui.templates.template.HTMLContextType;
+import net.sourceforge.phpeclipse.ui.templates.template.HTMLTemplateContextType;
 
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
@@ -29,7 +29,7 @@ public class SmartyCompletionProcessor extends BasicCompletionProcessor {
        protected TemplateContextType getContextType(ITextViewer viewer,
                        IRegion region) {
                return WebUI.getDefault().getContextTypeRegistry().getContextType(
-                               HTMLContextType.HTML_CONTEXT_TYPE);
+                               HTMLTemplateContextType.HTML_CONTEXT_TYPE);
        }
 
 }