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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java
index e895a82..90d60e9 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelStatus.java
@@ -13,7 +13,8 @@ package net.sourceforge.phpdt.internal.core;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelStatus;
 import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
-import net.sourceforge.phpeclipse.PHPCore;
+import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.internal.core.util.Util;
 
 import org.eclipse.core.resources.IResourceStatus;
 import org.eclipse.core.runtime.CoreException;
@@ -68,13 +69,13 @@ public class JavaModelStatus
    */
   public JavaModelStatus() {
     // no code for an multi-status
-    super(ERROR, PHPCore.PLUGIN_ID, 0, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, 0, "JavaModelStatus", null); //$NON-NLS-1$
   }
   /**
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int code) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     //	fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
   }
@@ -83,7 +84,7 @@ public class JavaModelStatus
    * elements.
    */
   public JavaModelStatus(int code, IJavaElement[] elements) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     fElements = elements;
     fPath = null;
   }
@@ -97,7 +98,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int severity, int code, String string) {
-    super(severity, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(severity, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     // fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
     fPath = null;
@@ -107,7 +108,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int code, Throwable throwable) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", throwable); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", throwable); //$NON-NLS-1$
     //	fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
   }
@@ -115,7 +116,7 @@ public class JavaModelStatus
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(int code, IPath path) {
-    super(ERROR, PHPCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
     //		fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
     fPath = path;
@@ -124,31 +125,31 @@ public class JavaModelStatus
    * Constructs an Java model status with the given corresponding
    * element.
    */
-  //	public JavaModelStatus(int code, IJavaElement element) {
-  //		this(code, new IJavaElement[]{element});
-  //	}
+  	public JavaModelStatus(int code, IJavaElement element) {
+  		this(code, new IJavaElement[]{element});
+  	}
   /**
    * Constructs an Java model status with the given corresponding
    * element and string
    */
-  //	public JavaModelStatus(int code, IJavaElement element, String string) {
-  //		this(code, new IJavaElement[]{element});
-  //		fString = string;
-  //	}
-  //	
-  //	/**
-  //	 * Constructs an Java model status with the given corresponding
-  //	 * element and path
-  //	 */
-  //	public JavaModelStatus(int code, IJavaElement element, IPath path) {
-  //		this(code, new IJavaElement[]{element});
-  //		fPath = path;
-  //	}	
+  	public JavaModelStatus(int code, IJavaElement element, String string) {
+  		this(code, new IJavaElement[]{element});
+  		fString = string;
+  	}
+  	
+  	/**
+  	 * Constructs an Java model status with the given corresponding
+  	 * element and path
+  	 */
+  	public JavaModelStatus(int code, IJavaElement element, IPath path) {
+  		this(code, new IJavaElement[]{element});
+  		fPath = path;
+  	}	
   /**
    * Constructs an Java model status with no corresponding elements.
    */
   public JavaModelStatus(CoreException coreException) {
-    super(ERROR, PHPCore.PLUGIN_ID, CORE_EXCEPTION, "JavaModelStatus", coreException); //$NON-NLS-1$
+    super(ERROR, JavaCore.PLUGIN_ID, CORE_EXCEPTION, "JavaModelStatus", coreException); //$NON-NLS-1$
     //	fElements= JavaElementInfo.fgEmptyChildren;
     fElements = fgObjectEmptyChildren;
   }