mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IssueZilla 11986 - Cannot rename java file after creating parcel recipe

Browse Source
This commit is contained in:
Tomas O'Connor
2003-06-17 11:17:16 +00:00
parent a6d4a12836
commit c4a95b943d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ParcelContentsFolder.java,v $ * $RCSfile: ParcelContentsFolder.java,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: toconnor $ $Date: 2003-06-12 11:31:26 $ * last change: $Author: toconnor $ $Date: 2003-06-17 12:17:16 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -68,6 +68,7 @@ import org.openide.NotifyDescriptor;
import org.openide.ErrorManager; import org.openide.ErrorManager;
import org.openide.filesystems.FileObject; import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileUtil; import org.openide.filesystems.FileUtil;
import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileSystem;
import org.openide.filesystems.Repository; import org.openide.filesystems.Repository;
@@ -141,12 +142,16 @@ public class ParcelContentsFolder extends DataFolder {
FileObject fo = result.getPrimaryFile(); FileObject fo = result.getPrimaryFile();
if (fo.getExt().equals("java")) { if (fo.getExt().equals("java")) {
FileLock lock = null;
try { try {
PackageRemover.removeDeclaration(FileUtil.toFile(fo)); PackageRemover.removeDeclaration(FileUtil.toFile(fo));
// IssueZilla 11986 - rename the FileObject // IssueZilla 11986 - rename the FileObject
// so the JavaNode is resynchronized // so the JavaNode is resynchronized
fo.rename(fo.lock(), fo.getName(), fo.getExt()); lock = fo.lock();
if (lock != null) {
fo.rename(lock, fo.getName(), fo.getExt());
}
} }
catch (IOException ioe) { catch (IOException ioe) {
NotifyDescriptor d = new NotifyDescriptor.Message( NotifyDescriptor d = new NotifyDescriptor.Message(
@@ -156,6 +161,11 @@ public class ParcelContentsFolder extends DataFolder {
"before building the Parcel Recipe"); "before building the Parcel Recipe");
TopManager.getDefault().notify(d); TopManager.getDefault().notify(d);
} }
finally {
if (lock != null) {
lock.releaseLock();
}
}
} }
} }
} }