Index: OperationProxy.java =================================================================== RCS file: /cvs/projects/core/src/org/netbeans/modules/projects/Attic/OperationProxy.java,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 OperationProxy.java --- OperationProxy.java 27 May 2003 22:05:27 -0000 1.1.2.2 +++ OperationProxy.java 26 Jun 2003 19:12:00 -0000 @@ -22,6 +22,8 @@ import org.openide.filesystems.FileLock; import org.openide.filesystems.FileObject; +import org.openide.loaders.DataObject; +import org.openide.loaders.DataFolder; /** @@ -136,7 +138,12 @@ protected FileObject perform(OperationParams params) throws IOException { FileObject fSrc = params.getSource().getOriginal(); FileObject fDest = params.getDestination().getOriginal(); - return fSrc.copy(fDest, params.getTargetName(), params.getTargetExt()); + + DataObject dSrc = DataObject.find(fSrc); + DataFolder dDest = DataFolder.findFolder(fDest); + // XXX: before we migrate to something else than DataSystem it is necessary to use them + return dSrc.copy(dDest).getPrimaryFile(); +// return fSrc.copy(fDest, params.getTargetName(), params.getTargetExt()); } } // End of CopyOp class @@ -171,18 +178,25 @@ protected FileObject perform(OperationParams params) throws IOException { FileObject fSrc = params.getSource().getOriginal(); FileObject fDest = params.getDestination().getOriginal(); + + // XXX: before we migrate to something else than DataSystem it is necessary to use them + DataObject dSrc = DataObject.find(fSrc); - FileLock lock = fSrc.lock(); - try { +// FileLock lock = fSrc.lock(); +// try { if (fDest == fSrc.getParent()) { - fSrc.rename(lock, params.getTargetName(), params.getTargetExt()); + dSrc.rename(params.getTargetName()); +// fSrc.rename(lock, params.getTargetName(), params.getTargetExt()); } else { - FileObject f = fSrc.move(lock, fDest, params.getTargetName(), params.getTargetExt()); - API_ACCESSOR.changeOriginal(params.getSource(), f); + DataFolder dDest = DataFolder.findFolder(fDest); + dSrc.move(dDest); + API_ACCESSOR.changeOriginal(params.getSource(), dSrc.getPrimaryFile()); +// FileObject f = fSrc.move(lock, fDest, params.getTargetName(), params.getTargetExt()); +// API_ACCESSOR.changeOriginal(params.getSource(), f); } - } finally { - lock.releaseLock(); - } +// } finally { +// lock.releaseLock(); +// } return null; } @@ -216,7 +230,10 @@ protected FileObject perform(OperationParams params) throws IOException { FileObject fSrc = params.getSource().getOriginal(); - fSrc.delete(); + // XXX: before we migrate to something else than DataSystem it is necessary to use them + DataObject dScr = DataObject.find(fSrc); + dScr.delete(); + //fSrc.delete(); return null; } } // End of DeleteOp class