X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 622ca18..46e566a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -494,7 +494,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   }
 
   static IPath getInstallLocation() {
-    return new Path(getDefault().getDescriptor().getInstallURL().getFile());
+    return new Path(getDefault().getBundle().getEntry("/").getFile());
   }
 
   //  public static int getJVM() {
@@ -502,7 +502,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   //  }
 
   public static String getPluginId() {
-    return getDefault().getDescriptor().getUniqueIdentifier();
+    return getDefault().getBundle().getSymbolicName() ;
   }
 
   /**
@@ -711,10 +711,10 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       InputStream is = getDefault().openStream(
       		new Path("prefs/default_" + operatingSystem + ".properties"));
       PropertyResourceBundle resourceBundle = new PropertyResourceBundle(is);
-      Enumeration enum = resourceBundle.getKeys();
+      Enumeration e = resourceBundle.getKeys();
       String key;
-      while (enum.hasMoreElements()) {
-        key = (String)enum.nextElement();
+      while (e.hasMoreElements()) {
+        key = (String)e.nextElement();
         store.setDefault(key, resourceBundle.getString( key ));
       }
     } catch (Exception e) {