sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- Make ProjectExtensionManager delete resource zip folders when nothing was kept

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9921 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-10-30 16:29:14 +00:00
parent 2f73363107
commit 7a0b6b15fc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/jme3-core/src/com/jme3/gde/core/j2seproject/ProjectExtensionManager.java
View File

@ -46,7 +46,6 @@ import java.util.logging.Logger;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import org.netbeans.api.project.Project; import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ant.AntBuildExtender; import org.netbeans.api.project.ant.AntBuildExtender;
import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.api.project.libraries.LibraryManager;
import org.netbeans.modules.java.j2seproject.J2SEProject; import org.netbeans.modules.java.j2seproject.J2SEProject;
@ -478,6 +477,7 @@ public class ProjectExtensionManager {
return; return;
} }
InputStream in = zipFile.openStream(); InputStream in = zipFile.openStream();
boolean kept = false;
try { try {
ZipInputStream str = new ZipInputStream(in); ZipInputStream str = new ZipInputStream(in);
ZipEntry entry; ZipEntry entry;
@ -492,11 +492,12 @@ public class ProjectExtensionManager {
} }
String fileName = resourcesFolder + "/" + extensionName + "/" + entry.getName(); String fileName = resourcesFolder + "/" + extensionName + "/" + entry.getName();
FileObject obj = projectRoot.getFileObject(fileName); FileObject obj = projectRoot.getFileObject(fileName);
if (obj != null && !obj.equals(projectRoot)) { if (obj != null && !obj.equals(projectRoot) && !obj.isFolder()) {
Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Deleting file " + obj.getNameExt());
if (entry.getSize() != -1 && entry.getSize() == obj.getSize()) { if (entry.getSize() != -1 && entry.getSize() == obj.getSize()) {
Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Deleting file " + obj.getNameExt());
obj.delete(); obj.delete();
} else { } else {
kept = true;
Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Keeping file " + obj.getNameExt()); Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Keeping file " + obj.getNameExt());
} }
} }
@ -505,7 +506,7 @@ public class ProjectExtensionManager {
in.close(); in.close();
} }
FileObject folder = projectRoot.getFileObject(resourcesFolder + "/" + extensionName); FileObject folder = projectRoot.getFileObject(resourcesFolder + "/" + extensionName);
if (folder != null && folder.getChildren().length == 0) { if (folder != null && !kept) {
folder.delete(); folder.delete();
} }
FileObject resourceFolder = projectRoot.getFileObject(resourcesFolder); FileObject resourceFolder = projectRoot.getFileObject(resourcesFolder);