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

SDK:

Browse Source 
- small improvements to ProjectAssetManager and different way to find project sources

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10067 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 12 years ago
parent 61ad771748
commit a6d62a1d16
1 changed files with 40 additions and 47 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 87
      sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java

87
sdk/jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java
Unescape View File

@ -35,7 +35,6 @@ import com.jme3.asset.AssetEventListener;
import com.jme3.asset.AssetKey; import com.jme3.asset.AssetKey;
import com.jme3.asset.AssetManager; import com.jme3.asset.AssetManager;
import com.jme3.asset.DesktopAssetManager; import com.jme3.asset.DesktopAssetManager;
import com.jme3.system.JmeSystem;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
@ -54,6 +53,7 @@ import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.project.Project; import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources; import org.netbeans.api.project.Sources;
import org.openide.filesystems.FileAttributeEvent; import org.openide.filesystems.FileAttributeEvent;
@ -61,7 +61,6 @@ import org.openide.filesystems.FileChangeListener;
import org.openide.filesystems.FileEvent; import org.openide.filesystems.FileEvent;
import org.openide.filesystems.FileObject; import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileRenameEvent; import org.openide.filesystems.FileRenameEvent;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.XMLFileSystem; import org.openide.filesystems.XMLFileSystem;
import org.openide.util.Exceptions; import org.openide.util.Exceptions;
import org.openide.util.Lookup; import org.openide.util.Lookup;
@ -76,8 +75,8 @@ public class ProjectAssetManager extends DesktopAssetManager {
private Project project; private Project project;
private List<String> folderNames = new LinkedList<String>(); private List<String> folderNames = new LinkedList<String>();
private List<AssetEventListener> assetEventListeners = Collections.synchronizedList(new LinkedList<AssetEventListener>()); private final List<AssetEventListener> assetEventListeners = Collections.synchronizedList(new LinkedList<AssetEventListener>());
private List<ClassPathChangeListener> classPathListeners = Collections.synchronizedList(new LinkedList<ClassPathChangeListener>()); private final List<ClassPathChangeListener> classPathListeners = Collections.synchronizedList(new LinkedList<ClassPathChangeListener>());
private URLClassLoader loader; private URLClassLoader loader;
private LinkedList<FileObject> jarItems = new LinkedList<FileObject>(); private LinkedList<FileObject> jarItems = new LinkedList<FileObject>();
private LinkedList<ClassPathItem> classPathItems = new LinkedList<ClassPathItem>(); private LinkedList<ClassPathItem> classPathItems = new LinkedList<ClassPathItem>();
@ -119,13 +118,9 @@ public class ProjectAssetManager extends DesktopAssetManager {
private void clearClassLoader() { private void clearClassLoader() {
for (FileObject fileObject : jarItems) { for (FileObject fileObject : jarItems) {
try { Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Remove locator:{0}", fileObject.toURL());
Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Remove locator:{0}", fileObject.getURL()); unregisterLocator(fileObject.toURL().toExternalForm(),
unregisterLocator(fileObject.toURL().toExternalForm(), com.jme3.asset.plugins.UrlLocator.class);
com.jme3.asset.plugins.UrlLocator.class);
} catch (FileStateInvalidException ex) {
Exceptions.printStackTrace(ex);
}
} }
jarItems.clear(); jarItems.clear();
for (ClassPathItem fileObject : classPathItems) { for (ClassPathItem fileObject : classPathItems) {
@ -136,7 +131,7 @@ public class ProjectAssetManager extends DesktopAssetManager {
} }
private synchronized void loadClassLoader() { private synchronized void loadClassLoader() {
Sources sources = project.getLookup().lookup(Sources.class); Sources sources = ProjectUtils.getSources(project);
if (sources != null) { if (sources != null) {
if (loader != null) { if (loader != null) {
removeClassLoader(loader); removeClassLoader(loader);
@ -146,53 +141,49 @@ public class ProjectAssetManager extends DesktopAssetManager {
for (SourceGroup sourceGroup : groups) { for (SourceGroup sourceGroup : groups) {
ClassPath path = ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.EXECUTE); ClassPath path = ClassPath.getClassPath(sourceGroup.getRootFolder(), ClassPath.EXECUTE);
if (path != null) { if (path != null) {
try { FileObject[] roots = path.getRoots();
FileObject[] roots = path.getRoots(); for (FileObject fileObject : roots) {
for (FileObject fileObject : roots) { if (!fileObject.equals(getAssetFolder())) {
if (!fileObject.equals(getAssetFolder())) { FileChangeListener listener = new FileChangeListener() {
FileChangeListener listener = new FileChangeListener() { public void fileFolderCreated(FileEvent fe) {
public void fileFolderCreated(FileEvent fe) {
// notifyClassPathListeners(); // notifyClassPathListeners();
} }
public void fileDataCreated(FileEvent fe) { public void fileDataCreated(FileEvent fe) {
if (!fe.isExpected()) { if (!fe.isExpected()) {
notifyClassPathListeners(); notifyClassPathListeners();
}
} }
}
public void fileChanged(FileEvent fe) { public void fileChanged(FileEvent fe) {
if (!fe.isExpected()) { if (!fe.isExpected()) {
notifyClassPathListeners(); notifyClassPathListeners();
}
} }
}
public void fileDeleted(FileEvent fe) { public void fileDeleted(FileEvent fe) {
// notifyClassPathListeners(); // notifyClassPathListeners();
} }
public void fileRenamed(FileRenameEvent fre) { public void fileRenamed(FileRenameEvent fre) {
// notifyClassPathListeners(); // notifyClassPathListeners();
} }
public void fileAttributeChanged(FileAttributeEvent fae) { public void fileAttributeChanged(FileAttributeEvent fae) {
// notifyClassPathListeners(); // notifyClassPathListeners();
} }
}; };
fileObject.addRecursiveListener(listener); fileObject.addRecursiveListener(listener);
Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Add classpath:{0}", fileObject); Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Add classpath:{0}", fileObject);
classPathItems.add(new ClassPathItem(fileObject, listener)); classPathItems.add(new ClassPathItem(fileObject, listener));
urls.add(fileObject.toURL()); urls.add(fileObject.toURL());
} }
if (fileObject.toURL().toExternalForm().startsWith("jar")) { if (fileObject.toURL().toExternalForm().startsWith("jar")) {
Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Add locator:{0}", fileObject.getURL()); Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Add locator:{0}", fileObject.toURL());
jarItems.add(fileObject); jarItems.add(fileObject);
registerLocator(fileObject.toURL().toExternalForm(), registerLocator(fileObject.toURL().toExternalForm(),
"com.jme3.asset.plugins.UrlLocator"); "com.jme3.asset.plugins.UrlLocator");
}
} }
} catch (FileStateInvalidException ex) {
Exceptions.printStackTrace(ex);
} }
} }
} }
@ -450,10 +441,12 @@ public class ProjectAssetManager extends DesktopAssetManager {
this.folderNames.add(0, folderName); this.folderNames.add(0, folderName);
} }
@Override
public void addAssetEventListener(AssetEventListener listener) { public void addAssetEventListener(AssetEventListener listener) {
assetEventListeners.add(listener); assetEventListeners.add(listener);
} }
@Override
public void removeAssetEventListener(AssetEventListener listener) { public void removeAssetEventListener(AssetEventListener listener) {
assetEventListeners.remove(listener); assetEventListeners.remove(listener);
} }

Write Preview
Loading…
Cancel
Save