X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java
index d555c13..709a80a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -37,7 +37,7 @@ public class Resources {
/**
* Checks if the given resource is in sync with the underlying file system.
- *
+ *
* @param resource the resource to be checked
* @return IStatus status describing the check's result. If status.
* isOK()
returns true
then the resource is in sync
@@ -45,11 +45,11 @@ public class Resources {
public static IStatus checkInSync(IResource resource) {
return checkInSync(new IResource[] {resource});
}
-
+
/**
* Checks if the given resources are in sync with the underlying file
* system.
- *
+ *
* @param resources the resources to be checked
* @return IStatus status describing the check's result. If status.
* isOK()
returns true
then the resources are in sync
@@ -60,58 +60,58 @@ public class Resources {
IResource resource= resources[i];
if (!resource.isSynchronized(IResource.DEPTH_INFINITE)) {
result= addOutOfSync(result, resource);
- }
+ }
}
if (result != null)
return result;
- return new Status(IStatus.OK, PHPeclipsePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
+ return new Status(IStatus.OK, PHPeclipsePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
}
/**
* Makes the given resource committable. Committable means that it is
* writeable and that its content hasn't changed by calling
* validateEdit
for the given resource on IWorkspace.
- *
+ *
* @param resource the resource to be checked
- * @param context the context passed to validateEdit
+ * @param context the context passed to validateEdit
* @return status describing the method's result. If status.isOK()
returns true
then the resources are committable.
- *
+ *
* @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
*/
public static IStatus makeCommittable(IResource resource, Object context) {
return makeCommittable(new IResource[] { resource }, context);
}
-
+
/**
* Makes the given resources committable. Committable means that all
* resources are writeable and that the content of the resources hasn't
* changed by calling validateEdit
for a given file on
* IWorkspace.
- *
+ *
* @param resources the resources to be checked
- * @param context the context passed to validateEdit
+ * @param context the context passed to validateEdit
* @return IStatus status describing the method's result. If status.
* isOK()
returns true
then the add resources are
* committable
- *
+ *
* @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
*/
public static IStatus makeCommittable(IResource[] resources, Object context) {
List readOnlyFiles= new ArrayList();
for (int i= 0; i < resources.length; i++) {
IResource resource= resources[i];
- if (resource.getType() == IResource.FILE && resource.isReadOnly())
+ if (resource.getType() == IResource.FILE && resource.getResourceAttributes().isReadOnly())
readOnlyFiles.add(resource);
}
if (readOnlyFiles.size() == 0)
return new Status(IStatus.OK, PHPeclipsePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-
+
Map oldTimeStamps= createModificationStampMap(readOnlyFiles);
IStatus status= ResourcesPlugin.getWorkspace().validateEdit(
(IFile[]) readOnlyFiles.toArray(new IFile[readOnlyFiles.size()]), context);
if (!status.isOK())
return status;
-
+
IStatus modified= null;
Map newTimeStamps= createModificationStampMap(readOnlyFiles);
for (Iterator iter= oldTimeStamps.keySet().iterator(); iter.hasNext();) {
@@ -119,7 +119,7 @@ public class Resources {
if (!oldTimeStamps.get(file).equals(newTimeStamps.get(file)))
modified= addModified(modified, file);
}
- if (modified != null)
+ if (modified != null)
return modified;
return new Status(IStatus.OK, PHPeclipsePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
}
@@ -132,11 +132,11 @@ public class Resources {
}
return map;
}
-
+
private static IStatus addModified(IStatus status, IFile file) {
IStatus entry= PHPUIStatus.createError(
- IJavaStatusConstants.VALIDATE_EDIT_CHANGED_CONTENT,
- CorextMessages.getFormattedString("Resources.fileModified", file.getFullPath().toString()), //$NON-NLS-1$
+ IJavaStatusConstants.VALIDATE_EDIT_CHANGED_CONTENT,
+ CorextMessages.getFormattedString("Resources.fileModified", file.getFullPath().toString()), //$NON-NLS-1$
null);
if (status == null) {
return entry;
@@ -146,19 +146,19 @@ public class Resources {
} else {
MultiStatus result= new MultiStatus(PHPeclipsePlugin.getPluginId(),
IJavaStatusConstants.VALIDATE_EDIT_CHANGED_CONTENT,
- CorextMessages.getString("Resources.modifiedResources"), null); //$NON-NLS-1$
+ CorextMessages.getString("Resources.modifiedResources"), null); //$NON-NLS-1$
result.add(status);
result.add(entry);
return result;
}
- }
+ }
private static IStatus addOutOfSync(IStatus status, IResource resource) {
IStatus entry= new Status(
IStatus.ERROR,
ResourcesPlugin.PI_RESOURCES,
IResourceStatus.OUT_OF_SYNC_LOCAL,
- CorextMessages.getFormattedString("Resources.outOfSync", resource.getFullPath().toString()), //$NON-NLS-1$
+ CorextMessages.getFormattedString("Resources.outOfSync", resource.getFullPath().toString()), //$NON-NLS-1$
null);
if (status == null) {
return entry;
@@ -169,7 +169,7 @@ public class Resources {
MultiStatus result= new MultiStatus(
ResourcesPlugin.PI_RESOURCES,
IResourceStatus.OUT_OF_SYNC_LOCAL,
- CorextMessages.getString("Resources.outOfSyncResources"), null); //$NON-NLS-1$
+ CorextMessages.getString("Resources.outOfSyncResources"), null); //$NON-NLS-1$
result.add(status);
result.add(entry);
return result;