Added some more tests,a nd reformtted the code a little.

[phpeclipse.git] / net.sourceforge.phpeclipse.ui / src / net / sourceforge / phpeclipse / ui / overlaypages / ProjectPrefUtil.java

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/overlaypages/ProjectPrefUtil.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/overlaypages/ProjectPrefUtil.java
index e292e31..7737f47 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/overlaypages/ProjectPrefUtil.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/overlaypages/ProjectPrefUtil.java
@@ -18,68 +18,80 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
 
 public class ProjectPrefUtil {
-  public static String getMiscProjectsPreferenceValue(IResource resource, String key) {
-    return getOverlayedPrefProjectValue(resource, PHPMiscProjectPreferences.PREF_ID, key);
-  }
+       public static String getMiscProjectsPreferenceValue(IResource resource,
+                       String key) {
+               return getOverlayedPrefProjectValue(resource,
+                               PHPMiscProjectPreferences.PREF_ID, key);
+       }
 
-  public static List getIncludePaths(IResource resource) {
-    String includePaths = getMiscProjectsPreferenceValue(resource, IPreferenceConstants.PHP_INCLUDE_PATHS);
-    ArrayList list = new ArrayList();
-    if (includePaths != null) {
-      StringTokenizer st = new StringTokenizer(includePaths, File.pathSeparator + "\n\r");//$NON-NLS-1$
-      while (st.hasMoreElements()) {
-        list.add(st.nextElement());
-      }
-    }
-    return list;
-  }
+       public static List getIncludePaths(IResource resource) {
+               String includePaths = getMiscProjectsPreferenceValue(resource,
+                               IPreferenceConstants.PHP_INCLUDE_PATHS);
+               ArrayList list = new ArrayList();
+               if (includePaths != null) {
+                       StringTokenizer st = new StringTokenizer(includePaths,
+                                       File.pathSeparator + "\n\r");//$NON-NLS-1$
+                       while (st.hasMoreElements()) {
+                               list.add(st.nextElement());
+                       }
+               }
+               return list;
+       }
 
-  public static IPath getDocumentRoot(IResource resource) {
-    String documentRoot = getMiscProjectsPreferenceValue(resource, IPreferenceConstants.PHP_DOCUMENTROOT_PREF);
-    IPath path = new Path(documentRoot);
-    //    documentRoot = documentRoot.replace('\\', '/');
-    return path;
-  }
+       public static IPath getDocumentRoot(IResource resource) {
+               String documentRoot = getMiscProjectsPreferenceValue(resource,
+                               IPreferenceConstants.PHP_DOCUMENTROOT_PREF);
+               IPath path = new Path(documentRoot);
+               // documentRoot = documentRoot.replace('\\', '/');
+               return path;
+       }
 
-  public static String getOverlayedPrefProjectValue(IResource resource, String pageId, String key) {
-    IProject project = resource.getProject();
-    String value = null;
-    if (useProjectSettings(project, pageId)) {
-      value = getProperty(resource, pageId, key);
-    }
-    if (value != null)
-      return value;
-    return WebUI.getDefault().getPreferenceStore().getString(key);
-  }
+       public static String getOverlayedPrefProjectValue(IResource resource,
+                       String pageId, String key) {
+               IProject project = resource.getProject();
+               String value = null;
+               if (useProjectSettings(project, pageId)) {
+                       value = getProperty(resource, pageId, key);
+               }
+               if (value != null)
+                       return value;
+               return WebUI.getDefault().getPreferenceStore().getString(key);
+       }
 
-  public static String getOverlayedPrefResourceValue(IResource resource, String pageId, String key) {
-    String value = null;
-    if (useProjectSettings(resource, pageId)) {
-      value = getProperty(resource, pageId, key);
-    }
-    if (value != null)
-      return value;
-    return WebUI.getDefault().getPreferenceStore().getString(key);
-  }
+       public static String getOverlayedPrefResourceValue(IResource resource,
+                       String pageId, String key) {
+               String value = null;
+               if (useProjectSettings(resource, pageId)) {
+                       value = getProperty(resource, pageId, key);
+               }
+               if (value != null)
+                       return value;
+               return WebUI.getDefault().getPreferenceStore().getString(key);
+       }
 
-  public static boolean getPreviewBooleanValue(IResource resource, String key) {
-    return getOverlayedPrefResourceValue(resource, PHPPreviewProjectPreferences.PREF_ID, key).equals("true");
-  }
+       public static boolean getPreviewBooleanValue(IResource resource, String key) {
+               return getOverlayedPrefResourceValue(resource,
+                               PHPPreviewProjectPreferences.PREF_ID, key).equals("true");
+       }
 
-  public static String getPreviewStringValue(IResource resource, String key) {
-    return getOverlayedPrefResourceValue(resource, PHPPreviewProjectPreferences.PREF_ID, key);
-  }
+       public static String getPreviewStringValue(IResource resource, String key) {
+               return getOverlayedPrefResourceValue(resource,
+                               PHPPreviewProjectPreferences.PREF_ID, key);
+       }
 
-  private static String getProperty(IResource resource, String pageId, String key) {
-    try {
-      return resource.getPersistentProperty(new QualifiedName(pageId, key));
-    } catch (CoreException e) {
-    }
-    return null;
-  }
+       private static String getProperty(IResource resource, String pageId,
+                       String key) {
+               try {
+                       return resource
+                                       .getPersistentProperty(new QualifiedName(pageId, key));
+               } catch (CoreException e) {
+               }
+               return null;
+       }
 
-  private static boolean useProjectSettings(IResource resource, String pageId) {
-    String use = getProperty(resource, pageId, FieldEditorOverlayPage.USEPROJECTSETTINGS);
-    return "true".equals(use);
-  }
+       private static boolean useProjectSettings(IResource resource, String pageId) {
+               String use = getProperty(resource, pageId,
+                               FieldEditorOverlayPage.USEPROJECTSETTINGS);
+               return "true".equals(use);
+       }
 }
\ No newline at end of file