1) Fixed issue #872.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / corext / template / php / Templates.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/Templates.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/Templates.java
index e316f14..e103ef1 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/Templates.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/Templates.java
@@ -11,7 +11,7 @@
 package net.sourceforge.phpdt.internal.corext.template.php;
 
 import java.io.File;
-import java.io.InputStream;
+//import java.io.InputStream;
 import java.util.ResourceBundle;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
@@ -19,17 +19,21 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 
-
 /**
  * <code>Templates</code> gives access to the available templates.
  * 
- * @deprecated As of 3.0, replaced by {@link org.eclipse.jface.text.templates.persistence.TemplateStore}
+ * @deprecated As of 3.0, replaced by
+ *             {@link org.eclipse.jface.text.templates.persistence.TemplateStore}
  */
-public class Templates extends net.sourceforge.phpdt.internal.corext.template.php.TemplateSet {
+public class Templates extends
+               net.sourceforge.phpdt.internal.corext.template.php.TemplateSet {
+
+       //private static final String DEFAULT_FILE = "default-templates.xml"; //$NON-NLS-1$
 
-       private static final String DEFAULT_FILE= "default-templates.xml"; //$NON-NLS-1$
-       private static final String TEMPLATE_FILE= "templates.xml"; //$NON-NLS-1$
-       private static final ResourceBundle fgResourceBundle= ResourceBundle.getBundle(JavaTemplateMessages.class.getName());
+       private static final String TEMPLATE_FILE = "templates.xml"; //$NON-NLS-1$
+
+       private static final ResourceBundle fgResourceBundle = ResourceBundle
+                       .getBundle(JavaTemplateMessages.class.getName());
 
        /** Singleton. */
        private static Templates fgTemplates;
@@ -37,36 +41,37 @@ public class Templates extends net.sourceforge.phpdt.internal.corext.template.ph
        /**
         * Returns an instance of templates.
         * 
-        * @deprecated As of 3.0, replaced by {@link net.sourceforge.phpdt.internal.ui.JavaPlugin#getTemplateStore()}
+        * @deprecated As of 3.0, replaced by
+        *             {@link net.sourceforge.phpdt.internal.ui.JavaPlugin#getTemplateStore()}
         */
        public static Templates getInstance() {
                if (fgTemplates == null)
-                       fgTemplates= new Templates();
-               
+                       fgTemplates = new Templates();
+
                return fgTemplates;
        }
-       
+
        public Templates() {
-               super("template", PHPeclipsePlugin.getDefault().getTemplateContextRegistry()); //$NON-NLS-1$
+               super(
+                               "template", PHPeclipsePlugin.getDefault().getTemplateContextRegistry()); //$NON-NLS-1$
                create();
        }
-       
 
        private void create() {
 
                try {
-                       File templateFile= getTemplateFile();
+                       File templateFile = getTemplateFile();
                        if (templateFile.exists()) {
                                addFromFile(templateFile, true, fgResourceBundle);
                        }
 
                } catch (CoreException e) {
-                 PHPeclipsePlugin.log(e);
+                       PHPeclipsePlugin.log(e);
                        clear();
                }
 
-       }       
-       
+       }
+
        /**
         * Resets the template set.
         */
@@ -78,27 +83,26 @@ public class Templates extends net.sourceforge.phpdt.internal.corext.template.ph
        /**
         * Resets the template set with the default templates.
         */
-       public void restoreDefaults() throws CoreException {
-               clear();
-               addFromStream(getDefaultsAsStream(), true, true, fgResourceBundle);
-       }
+//     public void restoreDefaults() throws CoreException {
+//             clear();
+//             addFromStream(getDefaultsAsStream(), true, true, fgResourceBundle);
+//     }
 
        /**
         * Saves the template set.
         */
-       public void save() throws CoreException {                                       
-               saveToFile(getTemplateFile());
-       }
+//     public void save() throws CoreException {
+//             saveToFile(getTemplateFile());
+//     }
 
-       private static InputStream getDefaultsAsStream() {
-               return Templates.class.getResourceAsStream(DEFAULT_FILE);
-       }
+//     private static InputStream getDefaultsAsStream() {
+//             return Templates.class.getResourceAsStream(DEFAULT_FILE);
+//     }
 
        private static File getTemplateFile() {
-               IPath path= PHPeclipsePlugin.getDefault().getStateLocation();
-               path= path.append(TEMPLATE_FILE);
-               
+               IPath path = PHPeclipsePlugin.getDefault().getStateLocation();
+               path = path.append(TEMPLATE_FILE);
+
                return path.toFile();
        }
 }
-