diff -r f4a875afac55 ide.ergonomics/nbproject/project.xml
--- a/ide.ergonomics/nbproject/project.xml Wed Dec 03 10:10:50 2008 +0100
+++ b/ide.ergonomics/nbproject/project.xml Wed Dec 03 10:05:40 2008 +0100
@@ -55,7 +55,7 @@
1
- 1.32
+ 1.34
diff -r f4a875afac55 ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
--- a/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java Wed Dec 03 10:10:50 2008 +0100
+++ b/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java Wed Dec 03 10:05:40 2008 +0100
@@ -39,29 +39,24 @@
package org.netbeans.modules.ide.ergonomics.fod;
-import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.Collection;
-import java.util.concurrent.ExecutionException;
import javax.swing.Icon;
import org.netbeans.api.autoupdate.UpdateElement;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectManager;
-import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.spi.project.ProjectFactory;
import org.netbeans.spi.project.ProjectState;
-import org.netbeans.spi.project.ui.ProjectOpenedHook;
+import org.netbeans.spi.project.ui.ProjectInitializationHook;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.Lookups;
-import org.openide.util.lookup.ProxyLookup;
import org.openide.util.lookup.ServiceProvider;
/**
@@ -94,7 +89,7 @@
public void saveProject(Project project) throws IOException, ClassCastException {
}
- private static final class FeatureNonProject extends ProjectOpenedHook
+ private static final class FeatureNonProject extends ProjectInitializationHook
implements Project, Runnable {
private final FeatureDelegate delegate;
private final FeatureInfo info;
@@ -118,9 +113,8 @@
}
@Override
- protected void projectOpened() {
+ protected Project projectWillBeOpened() {
RequestProcessor.getDefault ().post (this, 0, Thread.NORM_PRIORITY).waitFinished ();
- ProjectOpenedHook hook;
if (success) {
try {
state.notifyDeleted();
@@ -129,21 +123,14 @@
throw new IllegalStateException("New project shall be found! " + p); // NOI18N
}
delegate.associate(p);
-
- hook = p.getLookup().lookup(ProjectOpenedHook.class);
- Method m = ProjectOpenedHook.class.getDeclaredMethod("projectOpened"); // NOI18N
- m.setAccessible(true);
- m.invoke(hook);
+ return p;
} catch (Exception ex) {
Exceptions.printStackTrace(ex);
}
}
+ return null;
}
- @Override
- protected void projectClosed() {
- }
-
public void run () {
FindComponentModules findModules = new FindComponentModules(info);
findModules.createFindingTask ().waitFinished ();