org.openide.Places.Nodes interface method.
- * Note: This method is no longer supported.
- * @param f the requested filter
- * @return empty node */
- public Node packages (DataFilter f) {
- //return PackageChildren.createNode (f);
- return Node.EMPTY;
+
+ public void removeChangeListener(ChangeListener l) {
+ synchronized (listeners) {
+ listeners.remove(l);
+ }
}
-
- /** Node with all installed loaders.
- */
- public Node loaderPool () {
- return LoaderPoolNode.getLoaderPoolNode ();
+
+ private void fireChange() {
+ ChangeListener[] l;
+ synchronized (listeners) {
+ l = (ChangeListener[])listeners.toArray(new ChangeListener[listeners.size()]);
+ }
+ ChangeEvent ev = new ChangeEvent(this);
+ for (int i = 0; i < l.length; i++) {
+ l[i].stateChanged(ev);
+ }
}
/** Environment node. Place for all transient information about
@@ -109,18 +101,6 @@
return EnvironmentNode.find (ManifestSection.NodeSection.TYPE_SESSION);
}
- /** Control panel
- */
- public Node controlPanel () {
- return ControlPanelNode.getDefault ();
- }
-
- /** Project Settings.
- */
- public Node project () {
- return ControlPanelNode.getProjectSettings ();
- }
-
/** Node with all workspaces */
public Node workspaces () {
return WorkspacePoolContext.getDefault ();
@@ -128,14 +108,13 @@
/** Repository settings */
public Node repositorySettings () {
- return new org.netbeans.core.ui.MountNode ();
+ return new MountNode ();
}
/** Workspace node for current project. This node can change when project changes.
*/
public Node projectDesktop () {
- Node pn = NbProjectOperation.getProjectDesktop ();
- return pn == null ? EMPTY_PROJECT_DESKTOP_NODE : pn;
+ return workplace().getNodeDelegate();
}
/** Root nodes.
@@ -195,8 +174,8 @@
/** Getter for project workplace. A folder that is presented to the
* user as project desktop.
*/
- public DataFolder workplace () {
- return (DataFolder) TopManager.getDefault().getPlaces().nodes().projectDesktop().getCookie(DataFolder.class);
+ public DataFolder workplace() {
+ return findSessionFolder("Workplace"); // NOI18N
}
/**
@@ -204,9 +183,9 @@
* folders go first (sorted by name) followed by the rest of objects sorted
* by name.
*/
- public static synchronized DataFolder findSessionFolder (String name) {
+ public synchronized DataFolder findSessionFolder (String name) {
try {
- FileSystem fs = NbTopManager.get ().getRepository().getDefaultFileSystem ();
+ FileSystem fs = Repository.getDefault().getDefaultFileSystem ();
FileObject fo = fs.findResource(name);
if (fo == null) {
// resource not found, try to create new folder
@@ -221,8 +200,14 @@
}
}
+ /** Create new children of some type of master nodes.
+ * @param name name of the node section to recognize
+ */
+ public Children createChildren(String name) {
+ return new Ch(name);
+ }
- final static class Ch extends Children.Keys
+ private final class Ch extends Children.Keys
implements LookupListener, NodeListener {
/** result */
private Lookup.Result result;
@@ -257,7 +242,7 @@
/** Static method to compute a Lookup.Result from a template.
*/
- private static Lookup.Result re (String n) {
+ private Lookup.Result re (String n) {
Lookup.Template t = new Lookup.Template (ManifestSection.NodeSection.class);
return Lookup.getDefault ().lookup (t);
}
@@ -272,7 +257,7 @@
if (ManifestSection.NodeSection.TYPE_ROOTS.equals (sectionName)) {
// notify that the set of nodes has changed (probably)
- NbTopManager.get ().firePropertyChange (TopManager.PROP_PLACES, null, null);
+ NbPlaces.this.fireChange();
}
}
Index: core/src/org/netbeans/core/NbPresenter.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NbPresenter.java,v
--- core/src/org/netbeans/core/NbPresenter.java 9 Jul 2002 12:52:53 -0000 1.69
+++ core/src/org/netbeans/core/NbPresenter.java 16 Oct 2002 04:50:00 -0000
@@ -29,7 +29,6 @@
import org.openide.DialogDescriptor;
import org.openide.WizardDescriptor;
-import org.openide.TopManager;
import org.openide.util.*;
import org.openide.explorer.ExplorerManager;
@@ -887,7 +886,7 @@
pressedOption = NotifyDescriptor.CLOSED_OPTION;
} else {
if (evt.getSource() == stdHelpButton) {
- TopManager.getDefault().showHelp(currentHelp);
+ NbTopManager.get().showHelp(currentHelp);
return;
}
Index: core/src/org/netbeans/core/NbTopManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NbTopManager.java,v
--- core/src/org/netbeans/core/NbTopManager.java 8 Oct 2002 20:18:36 -0000 1.162
+++ core/src/org/netbeans/core/NbTopManager.java 16 Oct 2002 04:50:00 -0000
@@ -24,9 +24,12 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.text.MessageFormat;
+import java.util.List;
import javax.swing.*;
import javax.swing.text.Keymap;
import javax.swing.border.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.openide.util.datatransfer.ExClipboard;
import org.openide.*;
@@ -34,19 +37,16 @@
import org.openide.loaders.*;
import org.openide.actions.*;
import org.openide.cookies.SaveCookie;
-import org.openide.cookies.ProjectCookie;
-import org.openide.debugger.Debugger;
-import org.openide.debugger.DebuggerNotFoundException;
import org.openide.filesystems.*;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.JarFileSystem;
import org.openide.modules.Dependency;
import org.openide.modules.SpecificationVersion;
-import org.openide.options.ControlPanel;
import org.openide.windows.WindowManager;
import org.openide.windows.OutputWriter;
import org.openide.windows.InputOutput;
import org.openide.windows.TopComponent;
+import org.openide.windows.IOProvider;
import org.openide.explorer.*;
import org.openide.explorer.view.BeanTreeView;
import org.openide.util.*;
@@ -58,16 +58,20 @@
import org.netbeans.core.output.OutputTabTerm;
import org.netbeans.core.windows.WindowManagerImpl;
import org.netbeans.core.execution.TopSecurityManager;
+import org.netbeans.core.modules.Module;
import org.netbeans.core.perftool.StartLog;
import org.netbeans.core.modules.ModuleManager;
import org.netbeans.core.modules.ModuleSystem;
+import org.netbeans.core.projects.TrivialProjectManager;
import org.netbeans.core.windows.util.WindowUtils;
+import org.openide.modules.ModuleInfo;
+import org.openide.util.lookup.InstanceContent;
/** This class is a TopManager for Corona environment.
*
* @author Ales Novak, Jaroslav Tulach, Ian Formanek, Petr Hamernik, Jan Jancura, Jesse Glick
*/
-public abstract class NbTopManager extends TopManager {
+public abstract class NbTopManager /*extends TopManager*/ {
/* masks to define the interactivity level */
/** initialize the main window?
@@ -88,14 +92,6 @@
public static final int IL_ALL = 0xffff;
- /** property for status text */
- public static final String PROP_STATUS_TEXT = "statusText"; // NOI18N
-
- /** property for system class loader */
- public static final String PROP_SYSTEM_CLASS_LOADER = "systemClassLoader"; // NOI18N
- /** property for current class loader */
- public static final String PROP_CURRENT_CLASS_LOADER = "currentClassLoader"; // NOI18N
-
/** stores main shortcut context*/
private Keymap shortcutContext;
@@ -110,15 +106,6 @@
/** error manager */
private static ErrorManager defaultErrorManager;
- /** WWW browser window. */
- private HtmlBrowser.BrowserComponent htmlViewer;
-
- /** ProjectOperation main variable */
- static NbProjectOperation projectOperation;
-
- /** support for listeners */
- private PropertyChangeSupport change = new PropertyChangeSupport (this);
-
/** repository */
private Repository defaultRepository;
@@ -128,29 +115,19 @@
/** status text */
private String statusText = " "; // NOI18N
- /** the debugger listener listening on adding/removing debugger*/
- private static LookupListener debuggerLsnr = null;
- /** the lookup query finding all registered debuggers */
- private static Lookup.Result debuggerLkpRes = null;
-
/** initializes properties about builds etc. */
static {
+ org.openide.filesystems.FileObject fo = null;
// Set up module-versioning properties, which logger prints.
- Package p = Package.getPackage ("org.openide"); // NOI18N
+ // The package here must be one which exists only in openide.jar, not openide-deprecated.jar:
+ Object ignoreme = FileSystem.class;
+ Package p = Package.getPackage ("org.openide.filesystems"); // NOI18N
- putSystemProperty ("org.openide.specification.version", p.getSpecificationVersion (), "3.12"); // NOI18N
+ putSystemProperty ("org.openide.specification.version", p.getSpecificationVersion (), "3.14"); // NOI18N
putSystemProperty ("org.openide.version", p.getImplementationVersion (), "OwnBuild"); // NOI18N
putSystemProperty ("org.openide.major.version", p.getSpecificationTitle (), "IDE/1"); // NOI18N
putSystemProperty ("netbeans.buildnumber", p.getImplementationVersion (), "OwnBuild"); // NOI18N
- if (System.getProperties ().get ("org.openide.util.Lookup") == null) { // NOI18N
- // update the top manager to our main if it has not been provided yet
- System.getProperties().put (
- "org.openide.util.Lookup", // NOI18N
- "org.netbeans.core.NbTopManager$Lkp" // NOI18N
- );
- }
-
// Enforce JDK 1.3+ since we would not work without it.
if (Dependency.JAVA_SPEC.compareTo(new SpecificationVersion("1.3")) < 0) { // NOI18N
System.err.println("The IDE requires JDK 1.3 or higher to run."); // XXX I18N?
@@ -218,13 +195,53 @@
public NbTopManager() {
instanceContent = new InstanceContent ();
instanceLookup = new AbstractLookup (instanceContent);
- register (ClassLoaderConvertor.CLASSLOADER, ClassLoaderConvertor.CLASSLOADER);
+ if (!(Lookup.getDefault() instanceof Lkp)) {
+ throw new ClassCastException("Wrong Lookup impl found: " + Lookup.getDefault());
+ }
}
/** Getter for instance of this manager.
*/
public static NbTopManager get () {
- return (NbTopManager)TopManager.getDefault ();
+// return (NbTopManager)TopManager.getDefault ();
+ return getNbTopManager();
+ }
+
+ private static NbTopManager defaultTopManager;
+
+ public static synchronized boolean isInitialized () {
+ return defaultTopManager != null;
+ }
+
+ private static /*synchronized*/ NbTopManager getNbTopManager () {
+ // synchronization check
+ if (defaultTopManager != null) {
+ return defaultTopManager;
+ }
+
+ // XXX double check like it was in TopManager, otherwise led to deadlock at
+ // start, needs to be revised.
+ synchronized(NbTopManager.class) {
+ String className = System.getProperty(
+ "org.openide.TopManager", // NOI18N
+ "org.netbeans.core.Plain" // NOI18N
+ );
+
+ try {
+ Class c = Class.forName(className);
+ defaultTopManager = (NbTopManager)c.newInstance();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new IllegalStateException();
+ }
+
+ // late initialization of the manager if needed
+ if (defaultTopManager instanceof Runnable) {
+ ((Runnable)defaultTopManager).run ();
+ }
+
+ return defaultTopManager;
+ }
}
/** Test method to check whether some level of interactivity is enabled.
@@ -292,11 +309,12 @@
/** Shows a specified HelpCtx in IDE's help window.
* @param helpCtx thehelp to be shown
+ * @deprecated Better to use org.netbeans.api.javahelp.Help
*/
public void showHelp(HelpCtx helpCtx) {
// Awkward but should work.
try {
- Class c = systemClassLoader().loadClass("org.netbeans.api.javahelp.Help"); // NOI18N
+ Class c = ((ClassLoader)Lookup.getDefault().lookup(ClassLoader.class)).loadClass("org.netbeans.api.javahelp.Help"); // NOI18N
Object o = Lookup.getDefault().lookup(c);
if (o != null) {
Method m = c.getMethod("showHelp", new Class[] {HelpCtx.class}); // NOI18N
@@ -307,28 +325,31 @@
// ignore - maybe javahelp module is not installed, not so strange
} catch (Exception e) {
// potentially more serious
- getErrorManager().notify(ErrorManager.INFORMATIONAL, e);
+ ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
}
// Did not work.
Toolkit.getDefaultToolkit().beep();
}
- /** Provides support for www documents.
- * @param url Url of WWW document to be showen.
- */
- public void showUrl (URL url) {
- if (htmlViewer == null) htmlViewer = new NbBrowser ();
-
- ((NbBrowser)htmlViewer).showUrl (url);
+ public static final class NbURLDisplayer extends HtmlBrowser.URLDisplayer {
+ /** WWW browser window. */
+ HtmlBrowser.BrowserComponent htmlViewer;
+ public void showURL(URL u) {
+ if (htmlViewer == null) htmlViewer = new NbBrowser ();
+ ((NbBrowser)htmlViewer).showUrl(u);
+ }
}
private static WindowManager wmgr = null;
+ private static final Object windowManagerLock = new String("NbTopManager.windowManagerLock"); // NOI18N
/** @return a window manager impl or null */
- private static synchronized WindowManager getDefaultWindowManager() {
- if (wmgr == null) {
- wmgr = (WindowManager)Lookup.getDefault().lookup(WindowManager.class);
+ private static WindowManager getDefaultWindowManager() {
+ synchronized (windowManagerLock) {
+ if (wmgr == null) {
+ wmgr = (WindowManager)Lookup.getDefault().lookup(WindowManager.class);
+ }
+ return wmgr;
}
- return wmgr;
}
/** @return the main window from the window manager impl or null */
static Frame getMainWindow() {
@@ -354,6 +375,8 @@
}
}
+ public static final class NbDialogDisplayer extends DialogDisplayer {
+
/** Creates new dialog.
*/
public Dialog createDialog (final DialogDescriptor d) {
@@ -370,20 +393,7 @@
}
});
}
-
- /** Opens specified project. Asks to save the previously opened project.
- * @exception IOException if error occurs accessing the project
- * @exception UserCancelException if the selection is interrupted by the user
- */
- public void openProject (ProjectCookie project) throws IOException, UserCancelException {
- if (ExitDialog.showDialog (null, true)) {
- NbProjectOperation.setOpeningProject (project);
- }
- else {
- throw new UserCancelException ();
- }
- }
-
+
/** Notifies user by a dialog.
* @param descriptor description that contains needed informations
* @return the option that has been choosen in the notification
@@ -431,64 +441,52 @@
});
}
- /** Shows specified text in MainWindow's status line.
- * @param text the text to be shown
- */
- public final void setStatusText(String text) {
- if (text == null || text.length () == 0) {
- text = " "; // NOI18N
- }
- if (text.equals(statusText)) return;
- String old = statusText;
- statusText = text;
- setStatusTextImpl(text);
- firePropertyChange (PROP_STATUS_TEXT, old, text);
}
- protected abstract void setStatusTextImpl(String text);
- /** Getter for status text.
+ /** Opens specified project. Asks to save the previously opened project.
+ * @exception IOException if error occurs accessing the project
+ * @exception UserCancelException if the selection is interrupted by the user
*/
- public String getStatusText () {
- return statusText;
- }
+// public void openProject (ProjectCookie project) throws IOException, UserCancelException {
+// if (ExitDialog.showDialog (null, true)) {
+// NbProjectOperation.setOpeningProject (project);
+// }
+// else {
+// throw new UserCancelException ();
+// }
+// }
- /** Returns currently installed debugger or throws
- * DebuggerException (when no debugger is installed)
- * @return currently installed debugger.
- */
- public Debugger getDebugger () throws DebuggerNotFoundException {
- Iterator it = getDebuggerResult().allInstances().iterator();
- if (it.hasNext()) return (Debugger) it.next();
- throw new DebuggerNotFoundException();
- }
-
- /** get the lookup query finding all registered debuggers */
- private synchronized Lookup.Result getDebuggerResult() {
- if (debuggerLkpRes == null) {
- debuggerLkpRes = Lookup.getDefault().lookup(new Lookup.Template(Debugger.class));
- }
- return debuggerLkpRes;
- }
-
- /** fire property change PROP_DEBUGGER */
- private void fireDebuggerChange() {
- firePropertyChange (PROP_DEBUGGER, null, null);
- }
-
- /** initialize listening on adding/removing debugger. */
- private void initDebuggerListener() {
- Lookup.Result res;
- synchronized (this) {
- if (debuggerLsnr != null) return;
- res = getDebuggerResult();
- debuggerLsnr = new LookupListener() {
- public void resultChanged(LookupEvent ev) {
- fireDebuggerChange();
+
+ public static final class NbStatusDisplayer extends org.openide.awt.StatusDisplayer {
+ private List listeners = null;
+ private String text = ""; // NOI18N
+ public void setStatusText(String text) {
+ ChangeListener[] _listeners;
+ synchronized (this) {
+ this.text = text;
+ if (listeners == null || listeners.isEmpty()) {
+ _listeners = null;
+ } else {
+ _listeners = (ChangeListener[])listeners.toArray(new ChangeListener[listeners.size()]);
}
- };
- res.addLookupListener(debuggerLsnr);
+ }
+ if (_listeners != null) {
+ ChangeEvent e = new ChangeEvent(this);
+ for (int i = 0; i < _listeners.length; i++) {
+ _listeners[i].stateChanged(e);
+ }
+ }
+ }
+ public synchronized String getStatusText() {
+ return text;
+ }
+ public synchronized void addChangeListener(ChangeListener l) {
+ if (listeners == null) listeners = new ArrayList();
+ listeners.add(l);
+ }
+ public synchronized void removeChangeListener(ChangeListener l) {
+ listeners.remove(l);
}
- res.allClasses();
}
/** Print output writer.
@@ -505,6 +503,15 @@
public InputOutput getIO(String name, boolean newIO) {
return OutputTabTerm.getIO (name, newIO);
}
+
+ public static final class NbIOProvider extends IOProvider {
+ public InputOutput getIO(String name, boolean newIO) {
+ return NbTopManager.get().getIO(name, newIO);
+ }
+ public OutputWriter getStdOut() {
+ return NbTopManager.get().getStdOut();
+ }
+ }
/** saves all opened objects */
public void saveAll () {
@@ -516,7 +523,7 @@
dobj = modifs[i];
SaveCookie sc = (SaveCookie)dobj.getCookie(SaveCookie.class);
if (sc != null) {
- TopManager.getDefault().setStatusText (
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText (
java.text.MessageFormat.format (
NbBundle.getBundle (NbTopManager.class).getString ("CTL_FMT_SavingMessage"),
new Object[] { dobj.getName () }
@@ -538,10 +545,10 @@
new Object[] { ((DataObject)ee.next()).getPrimaryFile().getName() }
)
);
- TopManager.getDefault ().notify (descriptor);
+ org.openide.DialogDisplayer.getDefault().notify (descriptor);
}
// notify user that everything is done
- TopManager.getDefault().setStatusText(
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
NbBundle.getBundle (NbTopManager.class).getString ("MSG_AllSaved"));
}
@@ -560,8 +567,21 @@
// hide windows explicitly, they are of no use during exit process
WindowUtils.hideAllFrames();
try {
- // save project
- NbProjectOperation.storeLastProject ();
+ try {
+ LoaderPoolNode.store();
+ } catch (IOException ioe) {
+ ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
+ }
+ // save project, if applicable
+ try {
+ ((TrivialProjectManager)Lookup.getDefault().lookup(TrivialProjectManager.class)).store();
+ } catch (IOException ioe) {
+ ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
+ }
+ // save window system, [PENDING] remove this after the winsys will
+ // persist its state automaticaly
+ ((WindowManagerImpl)getDefaultWindowManager()).persistenceManager ().writeXML ();
+ org.netbeans.core.projects.XMLSettingsHandler.saveOptions();
org.netbeans.core.projects.SessionManager.getDefault().close();
} catch (ThreadDeath td) {
throw td;
@@ -579,6 +599,15 @@
}
}
}
+
+ public static final class NbLifecycleManager extends LifecycleManager {
+ public void saveAll() {
+ NbTopManager.get().saveAll();
+ }
+ public void exit() {
+ NbTopManager.get().exit();
+ }
+ }
/** Shows exit dialog for activated File system nodes
* after unmounting filesystem(s)
@@ -591,63 +620,6 @@
/** Get the module subsystem. */
public abstract ModuleSystem getModuleSystem();
- /** Obtains current up-to system classloader
- */
- public ClassLoader systemClassLoader () {
- ModuleSystem ms = getModuleSystem();
- if (ms != null) {
- // #16265: do not go straight to ModuleManager
- return ms.getSystemClassLoader();
- } else {
- // This can be called very early: if lookup asks for ClassLoader.
- // For now, just give the startup classloader.
- //System.err.println("Warning: giving out bogus systemClassLoader for now");
- //Thread.dumpStack();
- return NbTopManager.class.getClassLoader();
- }
- }
- // Access from ModuleSystem and from subclasses when moduleSystem is created:
- public final void fireSystemClassLoaderChange() {
- //System.err.println("change: systemClassLoader -> " + systemClassLoader());
- firePropertyChange(PROP_SYSTEM_CLASS_LOADER, null, null);
- Lkp.systemClassLoaderChanged(); // #26245
- }
-
- /** Obtains current up-to data te classloader
- */
- public ClassLoader currentClassLoader () {
- ClassLoader l = ClassLoaderSupport.currentClassLoader ();
- if (l == null) {
- System.err.println("SHOULD NEVER HAPPEN: currentClassLoader==null"); // NOI18N
- l = systemClassLoader ();
- }
- return l;
- }
- // Access from ClassLoaderSupport:
- final void fireCurrentClassLoaderChange() {
- //System.err.println("change: currentClassLoader");
- firePropertyChange(PROP_CURRENT_CLASS_LOADER, null, null);
- }
-
-
-
- /** Add listener */
- public void addPropertyChangeListener (PropertyChangeListener l) {
- initDebuggerListener();
- change.addPropertyChangeListener (l);
- }
-
- /** Removes the listener */
- public void removePropertyChangeListener (PropertyChangeListener l) {
- change.removePropertyChangeListener (l);
- }
-
- /** Fires property change
- */
- public void firePropertyChange (String p, Object o, Object n) {
- change.firePropertyChange (p, o, n);
- }
-
/** Someone running NonGuiMain might want to set this to true.
* This variable is read from CompilationEngineImpl to determine
* whether to do synchronous compile.
@@ -733,7 +705,7 @@
((IDESettings)IDESettings.findObject (IDESettings.class, true)).removePropertyChangeListener (idePCL);
idePCL = null;
}
- NbTopManager.get ().htmlViewer = null;
+ ((NbURLDisplayer)HtmlBrowser.URLDisplayer.getDefault()).htmlViewer = null;
return super.closeLast ();
}
@@ -767,7 +739,7 @@
public void readExternal (ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal (in);
setListener ();
- NbTopManager.get ().htmlViewer = this;
+ ((NbURLDisplayer)HtmlBrowser.URLDisplayer.getDefault()).htmlViewer = this;
}
/**
@@ -783,7 +755,7 @@
String name = evt.getPropertyName ();
if (name == null) return;
if (name.equals (IDESettings.PROP_WWWBROWSER)) {
- NbTopManager.get ().htmlViewer = null;
+ ((NbURLDisplayer)HtmlBrowser.URLDisplayer.getDefault()).htmlViewer = null;
if (idePCL != null) {
((IDESettings)IDESettings.findObject (IDESettings.class, true))
.removePropertyChangeListener (idePCL);
@@ -795,7 +767,7 @@
((IDESettings)IDESettings.findObject (IDESettings.class, true)).addPropertyChangeListener (idePCL);
}
catch (Exception ex) {
- NbTopManager.get ().notifyException (ex);
+ ErrorManager.getDefault().notify(ex);
}
}
}
@@ -807,71 +779,58 @@
private Task initTask;
/** thread that initialized the task and has to recieve good results */
private Thread initThread;
+ /** currently effective ClassLoader */
+ private static ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
/** Initialize the lookup to delegate to NbTopManager.
*/
public Lkp () {
super (new Lookup[] {
// #14722: pay attention also to META-INF/services/class.Name resources:
- createMetaInfServicesLookup(false),
+ createMetaInfServicesLookup(),
+ Lookups.singleton(classLoader),
});
}
-
- /** @param modules if true, use module classloader, else not */
- private static Lookup createMetaInfServicesLookup(boolean modules) {
+
+ private static Lookup createMetaInfServicesLookup() {
//System.err.println("cMISL: modules=" + modules);
try {
// XXX consider just making this a public class!
+ // or making Lookups.metaInfServices(ClassLoader) static utility method
Class clazz = Class.forName("org.openide.util.MetaInfServicesLookup"); // NOI18N
Constructor c = clazz.getDeclaredConstructor(new Class[] {ClassLoader.class});
c.setAccessible(true);
- ClassLoader loader;
- if (modules) {
- loader = get().getModuleSystem().getManager().getClassLoader();
- } else {
- loader = Lkp.class.getClassLoader();
- }
- return (Lookup)c.newInstance(new Object[] {loader});
+ return (Lookup)c.newInstance(new Object[] {classLoader});
} catch (Exception e) {
e.printStackTrace();
return Lookup.EMPTY;
}
}
- private static final class ConvertorListener
- implements PropertyChangeListener {
- public void propertyChange(PropertyChangeEvent evt) {
- if (evt == null || ModuleManager.PROP_ENABLED_MODULES.equals(evt.getPropertyName())) {
- //System.err.println("modules changed; changing metaInfServicesLookup");
- // Time to refresh META-INF/services/ lookup; modules turned on or off.
- Lookup lookup = Lookup.getDefault();
- if (lookup instanceof Lkp) {
- Lkp lkp = (Lkp)lookup;
- Lookup[] old = lkp.getLookups();
- Lookup[] nue = (Lookup[])old.clone();
- nue[0] = createMetaInfServicesLookup(true);
- lkp.setLookups(nue);
- //System.err.println("lookups: " + java.util.Arrays.asList(nue));
- }
- /* just testing:
- {
- try {
- Class c = get().systemClassLoader().loadClass("org.foo.Interface");
- System.err.println("org.foo.Interface: " + Lookup.getDefault().lookup(new Lookup.Template(c)).allInstances());
- } catch (Exception e) {
- System.err.println(e.toString());
- }
- }
- */
- }
+ /** Called when a system classloader changes.
+ */
+ public static final void systemClassLoaderChanged (ClassLoader nue) {
+ if (classLoader != nue) {
+ classLoader = nue;
+ Lkp l = (Lkp)Lookup.getDefault();
+ Lookup[] delegates = l.getLookups();
+ Lookup[] newDelegates = (Lookup[])delegates.clone();
+ // Replace classloader.
+ newDelegates[0] = createMetaInfServicesLookup();
+ newDelegates[1] = Lookups.singleton(classLoader);
+ l.setLookups(newDelegates);
}
}
-
- /** Called when a system classloader changes.
+
+ /** Called when modules are about to be turned on.
*/
- public static final void systemClassLoaderChanged () {
- NbTopManager.get ().unregister (ClassLoaderConvertor.CLASSLOADER, ClassLoaderConvertor.CLASSLOADER);
- NbTopManager.get ().register (ClassLoaderConvertor.CLASSLOADER, ClassLoaderConvertor.CLASSLOADER);
+ public static final void moduleClassLoadersUp() {
+ Lkp l = (Lkp)Lookup.getDefault();
+ Lookup[] newDelegates = null;
+ Lookup[] delegates = l.getLookups();
+ newDelegates = (Lookup[])delegates.clone();
+ newDelegates[0] = createMetaInfServicesLookup();
+ l.setLookups(newDelegates);
}
/** When all module classes are accessible thru systemClassLoader, this
@@ -912,7 +871,8 @@
final void doInitializeLookup () {
//System.err.println("doInitializeLookup");
- FileObject services = TopManager.getDefault().getRepository().getDefaultFileSystem().findResource("Services");
+ FileObject services = Repository.getDefault().getDefaultFileSystem()
+ .findResource("Services");
Lookup nue;
if (services != null) {
StartLog.logProgress("Got Services folder"); // NOI18N
@@ -925,25 +885,18 @@
// extend the lookup
Lookup[] arr = new Lookup[] {
- getLookups()[0], // metaInfServicesLookup; still keep classpath one till later...
+ getLookups()[0], // metaInfServicesLookup
+ getLookups()[1], // ClassLoader lookup
+ // XXX figure out how to put this ahead of MetaInfServicesLookup (for NonGuiMain):
NbTopManager.get ().getInstanceLookup (),
nue,
- NbTopManager.get().getModuleSystem().getManager().getModuleLookup(),
+ NbTopManager.get().getModuleSystem().getManager().getModuleLookup()
};
StartLog.logProgress ("prepared other Lookups"); // NOI18N
setLookups (arr);
StartLog.logProgress ("Lookups set"); // NOI18N
- // Also listen for changes in modules, as META-INF/services/ would change:
- ModuleManager mgr = get().getModuleSystem().getManager();
- ConvertorListener l = new ConvertorListener();
- mgr.addPropertyChangeListener(l);
- if (!mgr.getEnabledModules().isEmpty()) {
- // Ready now.
- l.propertyChange(null);
- }
-
//StartLog.logEnd ("NbTopManager$Lkp: initialization of FolderLookup"); // NOI18N
synchronized (this) {
@@ -965,32 +918,14 @@
t.waitFinished();
}
+ // Force module system to be initialize by looking up ModuleInfo.
+ // Good for unit tests, etc.
+ if (templ.getType() == ModuleInfo.class || templ.getType() == Module.class) {
+ get();
+ }
+
super.beforeLookup(templ);
}
}
-
- /** Special item for system class loader (which is dynamic).
- */
- private final static class ClassLoaderConvertor
- implements InstanceContent.Convertor {
- public static final ClassLoaderConvertor CLASSLOADER = new ClassLoaderConvertor ();
-
- public Object convert(Object obj) {
- return NbTopManager.get ().systemClassLoader();
- }
-
- public String displayName(Object obj) {
- return id (obj);
- }
-
- public String id(Object obj) {
- return "TM[systemClassLoader"; // NOI18N
- }
-
- public Class type(Object obj) {
- return ClassLoader.class;
- }
-
- } // end of ClassLoaderConvertor
}
Index: core/src/org/netbeans/core/NetworkOptionsBeanInfo.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NetworkOptionsBeanInfo.java,v
--- core/src/org/netbeans/core/NetworkOptionsBeanInfo.java 17 Jan 2002 15:46:01 -0000 1.11
+++ core/src/org/netbeans/core/NetworkOptionsBeanInfo.java 16 Oct 2002 04:50:00 -0000
@@ -16,7 +16,6 @@
import java.awt.Image;
import java.beans.*;
-import org.openide.TopManager;
import org.openide.util.Utilities;
import org.openide.ErrorManager;
Index: core/src/org/netbeans/core/NonGui.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NonGui.java,v
--- core/src/org/netbeans/core/NonGui.java 15 Sep 2002 20:22:39 -0000 1.78
+++ core/src/org/netbeans/core/NonGui.java 16 Oct 2002 04:50:00 -0000
@@ -40,6 +40,7 @@
import org.openide.explorer.*;
import org.openide.explorer.view.BeanTreeView;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.SharedClassObject;
import org.openide.util.RequestProcessor;
@@ -53,9 +54,11 @@
import org.netbeans.core.actions.*;
import org.netbeans.core.projects.ModuleLayeredFileSystem;
import org.netbeans.core.perftool.StartLog;
+import org.netbeans.core.projects.TrivialProjectManager;
import org.netbeans.core.modules.ModuleSystem;
import org.netbeans.core.execution.ExecutionSettings;
import org.netbeans.core.execution.TopSecurityManager;
+import org.openide.awt.StatusDisplayer;
/** This class is a TopManager for Corona environment.
*
@@ -171,9 +174,6 @@
return systemDir;
}
- /** Subclasses will do better. */
- protected void setStatusTextImpl(String text) {}
-
/** Everything is interactive */
public boolean isInteractive (int il) {
return true;
@@ -348,29 +348,37 @@
// Initialize beans - [PENDING - better place for this ?]
// [PENDING - can PropertyEditorManager garbage collect ?]
- java.beans.Introspector.setBeanInfoSearchPath (new String[] {
- "org.netbeans.beaninfo", // NOI18N
- "org.netbeans.beaninfo.awt", // NOI18N
- "org.netbeans.beaninfo.swing", // NOI18N
- "sun.beans.infos" // NOI18N
- });
- java.beans.PropertyEditor pe = java.beans.PropertyEditorManager.findEditor(java.lang.Byte.TYPE); // to enforce initialization of registering PE for primitive types
- java.beans.PropertyEditorManager.setEditorSearchPath (
- new String[] { "org.netbeans.beaninfo.editors", "org.openide.explorer.propertysheet.editors" }); // NOI18N
- java.beans.PropertyEditorManager.registerEditor (getKlass("[Ljava.lang.String;"), getKlass("org.openide.explorer.propertysheet.editors.StringArrayEditor"));
- java.beans.PropertyEditorManager.registerEditor (getKlass("[Lorg.openide.src.MethodParameter;"), getKlass("org.openide.explorer.propertysheet.editors.MethodParameterArrayEditor"));
- java.beans.PropertyEditorManager.registerEditor (getKlass("[Lorg.openide.src.Identifier;"), getKlass("org.openide.explorer.propertysheet.editors.IdentifierArrayEditor"));
- java.beans.PropertyEditorManager.registerEditor (java.lang.Character.TYPE, getKlass("org.netbeans.beaninfo.editors.CharEditor"));
+ String[] sysbisp = Introspector.getBeanInfoSearchPath();
+ String[] nbbisp = new String[] {
+ "org.netbeans.beaninfo", // NOI18N
+ "org.netbeans.beaninfo.awt", // NOI18N
+ "org.netbeans.beaninfo.swing", // NOI18N
+ };
+ String[] allbisp = new String[sysbisp.length + nbbisp.length];
+ System.arraycopy(nbbisp, 0, allbisp, 0, nbbisp.length);
+ System.arraycopy(sysbisp, 0, allbisp, nbbisp.length, sysbisp.length);
+ Introspector.setBeanInfoSearchPath(allbisp);
+ String[] syspesp = PropertyEditorManager.getEditorSearchPath();
+ String[] nbpesp = new String[] {
+ "org.netbeans.beaninfo.editors", // NOI18N
+ "org.openide.explorer.propertysheet.editors", // NOI18N
+ };
+ String[] allpesp = new String[syspesp.length + nbpesp.length];
+ System.arraycopy(nbpesp, 0, allpesp, 0, nbpesp.length);
+ System.arraycopy(syspesp, 0, allpesp, nbpesp.length, syspesp.length);
+ PropertyEditorManager.setEditorSearchPath(allpesp);
+ PropertyEditorManager.registerEditor (java.lang.Character.TYPE, getKlass("org.netbeans.beaninfo.editors.CharEditor"));
+ PropertyEditorManager.registerEditor(getKlass("[Ljava.lang.String;"), getKlass("org.netbeans.beaninfo.editors.StringArrayEditor")); // NOI18N
StartLog.logProgress ("PropertyEditors registered"); // NOI18N
// -----------------------------------------------------------------------------------------------------
- setStatusText (getString("MSG_IDEInit"));
+ StatusDisplayer.getDefault().setStatusText (getString("MSG_IDEInit"));
// -----------------------------------------------------------------------------------------------------
// 7. Initialize FileSystems
- getRepository ();
+ Repository.getDefault();
StartLog.logProgress ("Repository initialized"); // NOI18N
// -----------------------------------------------------------------------------------------------------
@@ -440,7 +448,7 @@
{
StartLog.logStart ("Modules initialization"); // NOI18N
- FileSystem sfs = getRepository().getDefaultFileSystem();
+ FileSystem sfs = Repository.getDefault().getDefaultFileSystem();
getUserDir();
File moduleDirHome = new File(homeDir, DIR_MODULES);
File moduleDirUser;
@@ -450,15 +458,14 @@
moduleDirUser = new File(userDir, DIR_MODULES);
}
try {
- moduleSystem = new ModuleSystem(getRepository().getDefaultFileSystem(), moduleDirHome, moduleDirUser);
+ moduleSystem = new ModuleSystem(Repository.getDefault().getDefaultFileSystem(), moduleDirHome, moduleDirUser);
} catch (IOException ioe) {
// System will be screwed up.
IllegalStateException ise = new IllegalStateException("Module system cannot be created"); // NOI18N
- getErrorManager().annotate(ise, ioe);
+ ErrorManager.getDefault().annotate(ise, ioe);
throw ise;
}
StartLog.logProgress ("ModuleSystem created"); // NOI18N
- fireSystemClassLoaderChange();
moduleSystem.loadBootModules();
moduleSystem.readList();
@@ -476,9 +483,14 @@
// -----------------------------------------------------------------------------------------------------
// 10. Initialization of project (because it can change loader pool and it influences main window menu)
try {
- NbProjectOperation.openOrCreateProject ();
+ LoaderPoolNode.load();
+ } catch (IOException ioe) {
+ ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
+ }
+ try {
+ ((TrivialProjectManager)Lookup.getDefault().lookup(TrivialProjectManager.class)).load();
} catch (IOException e) {
- getErrorManager ().notify (ErrorManager.INFORMATIONAL, e);
+ ErrorManager.getDefault().notify (ErrorManager.INFORMATIONAL, e);
}
StartLog.logProgress ("Project opened"); // NOI18N
Main.incrementSplashProgressBar(10);
@@ -565,8 +577,9 @@
Main.incrementSplashProgressBar();
// run classes int Startup folder
-
- startFolder (getDefault ().getPlaces ().folders ().startup ());
+
+ // Could be places = NbPlaces.getDefault();
+ startFolder(NbPlaces.getDefault().startup ());
StartLog.logProgress ("StartFolder content started"); // NOI18N
Main.incrementSplashProgressBar();
}
Index: core/src/org/netbeans/core/NonGuiMain.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NonGuiMain.java,v
--- core/src/org/netbeans/core/NonGuiMain.java 24 Apr 2002 14:27:29 -0000 1.10
+++ core/src/org/netbeans/core/NonGuiMain.java 16 Oct 2002 04:50:00 -0000
@@ -399,7 +399,8 @@
java.awt.Font nbDialogPlain = new java.awt.Font ("Dialog", java.awt.Font.PLAIN, uiFontSize); // NOI18N
if (load) {
- org.openide.TopManager.getDefault();
+// org.openide.TopManager.getDefault();
+ NbTopManager.get();
}
try {
@@ -461,9 +462,10 @@
/** Calls TopManager.getDefault().exit(); */
public static void myExit(int status) {
- if (TopManager.isInitialized()) {
+ if (NbTopManager.isInitialized()) {
- TopManager.getDefault().exit();
+// TopManager.getDefault().exit();
+ org.openide.LifecycleManager.getDefault().exit();
}
TopSecurityManager.exit(status);
}
@@ -507,7 +509,7 @@
}
public OutputWriter getStdOut () {
- return getIO("").getOut(); // NOI18N
+ return getIO("", true).getOut(); // NOI18N
}
/** Prints the notification to the out.*/
Index: core/src/org/netbeans/core/NotifyException.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NotifyException.java,v
--- core/src/org/netbeans/core/NotifyException.java 8 Jul 2002 11:46:18 -0000 1.35
+++ core/src/org/netbeans/core/NotifyException.java 16 Oct 2002 04:50:00 -0000
@@ -119,7 +119,7 @@
descriptor.setClosingOptions (new Object[0]);
descriptor.setButtonListener (this);
- dialog = TopManager.getDefault ().createDialog (descriptor);
+ dialog = org.openide.DialogDisplayer.getDefault ().createDialog (descriptor);
}
/** Adds new exception into the queue.
@@ -133,13 +133,13 @@
int gs = t.getSeverity();
if (gs == ErrorManager.WARNING && glm != null && !glm.equals("")) // NOI18N
- TopManager.getDefault().notify(
+ org.openide.DialogDisplayer.getDefault().notify(
new NotifyDescriptor.Message(glm, NotifyDescriptor.WARNING_MESSAGE));
else if (gs == ErrorManager.USER && glm != null && !glm.equals("")) // NOI18N
- TopManager.getDefault().notify(
+ org.openide.DialogDisplayer.getDefault().notify(
new NotifyDescriptor.Message(glm, NotifyDescriptor.INFORMATION_MESSAGE));
else if (gs == ErrorManager.ERROR && glm != null && !glm.equals("")) // NOI18N
- TopManager.getDefault().notify(
+ org.openide.DialogDisplayer.getDefault().notify(
new NotifyDescriptor.Message(glm, NotifyDescriptor.ERROR_MESSAGE));
else {
if (INSTANCE == null)
@@ -164,7 +164,7 @@
// Dialog held in dialog variable is disposed for sure
// (see code in actionPerformed),
// so we can safely send it to gc and recreate dialog
- dialog = TopManager.getDefault ().createDialog (descriptor);
+ dialog = org.openide.DialogDisplayer.getDefault ().createDialog (descriptor);
}
// the dialog is not shown
current = t;
Index: core/src/org/netbeans/core/Plain.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/Plain.java,v
--- core/src/org/netbeans/core/Plain.java 27 Aug 2002 09:38:22 -0000 1.27
+++ core/src/org/netbeans/core/Plain.java 16 Oct 2002 04:50:00 -0000
@@ -7,7 +7,7 @@
* http://www.sun.com/
*
* The Original Code is NetBeans. The Initial Developer of the Original
- * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
+ * Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
* Microsystems, Inc. All Rights Reserved.
*/
@@ -16,6 +16,8 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.openide.filesystems.*;
import org.openide.filesystems.FileSystem;
@@ -23,22 +25,27 @@
import org.netbeans.core.modules.ModuleSystem;
import org.netbeans.core.projects.ModuleLayeredFileSystem;
import org.netbeans.core.xml.NbSAXParserFactoryImpl;
+import org.openide.awt.StatusDisplayer;
/** Default implementation of TopManager that is used when
* the system is used without initialization.
*
* @author Jaroslav Tulach
*/
-public class Plain extends NbTopManager implements Runnable {
+public class Plain extends NbTopManager implements Runnable, ChangeListener {
static {
NbSAXParserFactoryImpl.install();
}
+
+ private final StatusDisplayer status;
- /** Creates new Plain. */
- public Plain() {
- if (Boolean.getBoolean("org.netbeans.core.Plain.CULPRIT")) Thread.dumpStack(); // NOI18N
- }
+ /** Creates new Plain. */
+ public Plain() {
+ if (Boolean.getBoolean("org.netbeans.core.Plain.CULPRIT")) Thread.dumpStack(); // NOI18N
+ status = StatusDisplayer.getDefault();
+ status.addChangeListener(this);
+ }
private ModuleSystem moduleSystem;
@@ -77,14 +84,10 @@
return new Object();
}
- protected void setStatusTextImpl(String text) {
- System.out.println(text);
- }
-
/** Create the module system. Subclasses may override. */
protected ModuleSystem createModuleSystem() throws IOException {
String userDir = System.getProperty("modules.dir"); // NOI18N
- FileSystem fs = getRepository().getDefaultFileSystem();
+ FileSystem fs = Repository.getDefault().getDefaultFileSystem();
return new ModuleSystem(fs, userDir == null ? null : new File(userDir), null);
}
@@ -97,9 +100,8 @@
notifyException(ioe);
return;
}
- fireSystemClassLoaderChange();
moduleSystem.loadBootModules();
- if (!getRepository().getDefaultFileSystem().isReadOnly()) {
+ if (!Repository.getDefault().getDefaultFileSystem().isReadOnly()) {
moduleSystem.readList();
moduleSystem.scanForNewAndRestore();
LoaderPoolNode.installationFinished();
@@ -114,14 +116,8 @@
return moduleSystem;
}
-/* JST: not needed anymore.
- static class ClassLoaderFinder extends SecurityManager implements org.openide.util.NbBundle.ClassLoaderFinder {
-
- public ClassLoader find() {
- Class[] classes = getClassContext();
- return classes[Math.min(4, classes.length - 1)].getClassLoader();
+ public void stateChanged(ChangeEvent e) {
+ System.out.println(status.getStatusText());
}
- }
-*/
-
+
}
Index: core/src/org/netbeans/core/RootFolderNode.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/RootFolderNode.java,v
--- core/src/org/netbeans/core/RootFolderNode.java 19 Jun 2002 19:57:04 -0000 1.45
+++ core/src/org/netbeans/core/RootFolderNode.java 16 Oct 2002 04:50:00 -0000
@@ -30,7 +30,6 @@
import org.openide.DialogDescriptor;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.actions.*;
import org.openide.filesystems.*;
import org.openide.loaders.DataFilter;
@@ -293,7 +292,7 @@
if (i instanceof DialogDescriptor) {
DialogDescriptor dd = (DialogDescriptor)i;
- return TopManager.getDefault ().createDialog (dd);
+ return org.openide.DialogDisplayer.getDefault ().createDialog (dd);
}
} catch (Exception ex) {
ErrorManager.getDefault ().notify (ex);
@@ -322,7 +321,7 @@
/** Unmounts the filesystem from the FSPool */
public void unmount() {
MountNode.unmount (fs);
- NbTopManager.get ().getRepository ().removeFileSystem (fs);
+ Repository.getDefault().removeFileSystem (fs);
}
/** Checks whether the name of FS is changed and if so it updates
Index: core/src/org/netbeans/core/Services.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/Services.java,v
--- core/src/org/netbeans/core/Services.java 14 Aug 2002 18:22:38 -0000 1.61
+++ core/src/org/netbeans/core/Services.java 16 Oct 2002 04:50:00 -0000
@@ -31,8 +31,8 @@
import org.openide.util.Lookup.Template;
import org.netbeans.beaninfo.editors.ExecutorEditor;
-import org.netbeans.beaninfo.editors.CompilerTypeEditor;
-import org.netbeans.beaninfo.editors.DebuggerTypeEditor;
+//import org.netbeans.beaninfo.editors.CompilerTypeEditor;
+//import org.netbeans.beaninfo.editors.DebuggerTypeEditor;
/** Works with all service types.
*
@@ -61,18 +61,18 @@
private static void fillMap(Map map) {
map.put(ExecutorEditor.NO_EXECUTOR.getName(), ExecutorEditor.NO_EXECUTOR);
- map.put(CompilerTypeEditor.NO_COMPILER.getName(), CompilerTypeEditor.NO_COMPILER);
- map.put(DebuggerTypeEditor.NO_DEBUGGER.getName(), DebuggerTypeEditor.NO_DEBUGGER);
+// map.put(CompilerTypeEditor.NO_COMPILER.getName(), CompilerTypeEditor.NO_COMPILER);
+// map.put(DebuggerTypeEditor.NO_DEBUGGER.getName(), DebuggerTypeEditor.NO_DEBUGGER);
}
/** Override to specially look up no-op services. */
public ServiceType find (Class clazz) {
if (clazz == ExecutorEditor.NoExecutor.class)
return ExecutorEditor.NO_EXECUTOR;
- else if (clazz == CompilerTypeEditor.NoCompiler.class)
- return CompilerTypeEditor.NO_COMPILER;
- else if (clazz == DebuggerTypeEditor.NoDebugger.class)
- return DebuggerTypeEditor.NO_DEBUGGER;
+// else if (clazz == CompilerTypeEditor.NoCompiler.class)
+// return CompilerTypeEditor.NO_COMPILER;
+// else if (clazz == DebuggerTypeEditor.NoDebugger.class)
+// return DebuggerTypeEditor.NO_DEBUGGER;
else if (clazz == null)
return null;
else
@@ -144,7 +144,7 @@
arr = ensureSingleness(arr);
HashMap services = new HashMap(20); //
- searchServices(NbPlaces.findSessionFolder("Services").getPrimaryFile(), services); // NOI18N
+ searchServices(NbPlaces.getDefault().findSessionFolder("Services").getPrimaryFile(), services); // NOI18N
// storing services
HashMap order = new HashMap(10); // >
@@ -223,7 +223,7 @@
java.beans.BeanInfo info = org.openide.util.Utilities.getBeanInfo(stype);
String folder = org.openide.util.Utilities.getShortClassName(stype);
- DataFolder dfServices = NbPlaces.findSessionFolder("Services"); // NOI18N
+ DataFolder dfServices = NbPlaces.getDefault().findSessionFolder("Services"); // NOI18N
DataFolder dfTarget = DataFolder.create(dfServices, folder);
return InstanceDataObject.create(dfTarget, null, st, null);
Index: core/src/org/netbeans/core/ShortcutsEditor.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ShortcutsEditor.java,v
--- core/src/org/netbeans/core/ShortcutsEditor.java 10 Jan 2002 15:22:04 -0000 1.30
+++ core/src/org/netbeans/core/ShortcutsEditor.java 16 Oct 2002 04:50:00 -0000
@@ -26,7 +26,6 @@
import javax.swing.event.*;
import javax.swing.text.Keymap;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.loaders.XMLDataObject;
import org.openide.util.Utilities;
Index: core/src/org/netbeans/core/ShortcutsFolder.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ShortcutsFolder.java,v
--- core/src/org/netbeans/core/ShortcutsFolder.java 26 Sep 2002 14:33:44 -0000 1.7
+++ core/src/org/netbeans/core/ShortcutsFolder.java 16 Oct 2002 04:50:01 -0000
@@ -25,6 +25,7 @@
import org.openide.loaders.*;
import org.openide.cookies.InstanceCookie;
import org.openide.util.actions.SystemAction;
+import org.openide.util.Lookup;
import org.openide.util.Utilities;
@@ -98,7 +99,7 @@
map.put (stroke, action);
}
- Keymap globalMap = TopManager.getDefault ().getGlobalKeymap ();
+ Keymap globalMap = (Keymap)Lookup.getDefault().lookup(Keymap.class);
globalMap.removeBindings();
// globalMap is synchronized
if (globalMap instanceof NbKeymap) {
@@ -145,7 +146,7 @@
* It is used in ShortcutsPanel.
*/
static String getKeyStrokeName (KeyStroke stroke) {
- Keymap map = TopManager.getDefault ().getGlobalKeymap ();
+ Keymap map = (Keymap)Lookup.getDefault().lookup(Keymap.class);
Action action = map.getAction (stroke);
if (action instanceof SystemAction) {
String name = ((SystemAction)action).getName ();
@@ -165,7 +166,7 @@
String name = Utilities.replaceString (action.getName (), "&", ""); // remove mnemonics marker // NOI18N
name = Utilities.replaceString (name, "...", ""); // remove trailing "..." // NOI18N
- Keymap map = TopManager.getDefault ().getGlobalKeymap ();
+ Keymap map = (Keymap)Lookup.getDefault().lookup(Keymap.class);
KeyStroke[] strokes = map.getKeyStrokesForAction(action);
if (strokes.length > 0) {
@@ -235,7 +236,8 @@
private static void transformOldFiles() {
// used to be installCurrentBindings
try {
- org.openide.filesystems.FileSystem systemFS = TopManager.getDefault().getRepository().getDefaultFileSystem ();
+ org.openide.filesystems.FileSystem systemFS
+ = Repository.getDefault().getDefaultFileSystem ();
boolean defaultsUsed = false;
HashMap moduleKeyFiles = new HashMap (11);
@@ -301,8 +303,8 @@
* the shortcuts folder.
*/
public static void installBindings (HashMap strokesMap) throws IOException {
- FileObject fo = TopManager.getDefault().getRepository().
- getDefaultFileSystem().getRoot().getFileObject(SHORTCUTS_FOLDER);
+ FileObject fo = Repository.getDefault().getDefaultFileSystem()
+ .getRoot().getFileObject(SHORTCUTS_FOLDER);
DataFolder f = DataFolder.findFolder(fo);
for (Iterator it = strokesMap.keySet().iterator(); it.hasNext (); ) {
KeyStroke key = (KeyStroke)it.next ();
@@ -367,7 +369,8 @@
act = nl.item (i).getAttributes ().getNamedItem (ATTR_BINDING_ACTION).getNodeValue ();
KeyStroke stroke = Utilities.stringToKey (key);
- SystemAction action = SystemAction.get (Class.forName(act, true, TopManager.getDefault ().systemClassLoader ()));
+ SystemAction action = SystemAction.get (
+ Class.forName(act, true, (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class)));
map.put (stroke, action);
} catch (ClassNotFoundException cnfe) {
if (Boolean.getBoolean ("netbeans.debug.exceptions")) // NOI18N
@@ -382,7 +385,7 @@
*/
public static void initShortcuts() {
transformOldFiles();
- DataFolder f = NbPlaces.findSessionFolder(SHORTCUTS_FOLDER);
+ DataFolder f = NbPlaces.getDefault().findSessionFolder(SHORTCUTS_FOLDER);
shortcutsFolder = new ShortcutsFolder(f);
shortcutsFolder.recreate();
}
@@ -400,8 +403,8 @@
* @param List changes - the elements of the List are ChangeRequests
*/
public static void applyChanges(java.util.List changes) {
- FileObject fo = TopManager.getDefault().getRepository().getDefaultFileSystem ().
- getRoot().getFileObject(SHORTCUTS_FOLDER);
+ FileObject fo = Repository.getDefault().getDefaultFileSystem()
+ .getRoot().getFileObject(SHORTCUTS_FOLDER);
DataFolder f = DataFolder.findFolder(fo);
Iterator it = changes.listIterator();
while (it.hasNext()) {
Index: core/src/org/netbeans/core/ShortcutsPanel.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ShortcutsPanel.java,v
--- core/src/org/netbeans/core/ShortcutsPanel.java 10 Jan 2002 15:22:04 -0000 1.17
+++ core/src/org/netbeans/core/ShortcutsPanel.java 16 Oct 2002 04:50:01 -0000
@@ -24,9 +24,9 @@
import javax.swing.*;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.util.actions.SystemAction;
import org.openide.util.Utilities;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
/** A panel used in SHortcutsEditor for editing shortcuts (list of shortcuts).
@@ -160,7 +160,7 @@
addActionsPanel.setBorder(new javax.swing.border.EmptyBorder(12, 12, 0, 11));
}
DialogDescriptor dd = new DialogDescriptor (addActionsPanel, org.openide.util.NbBundle.getBundle(ShortcutsPanel.class).getString("ShortcutsPanel.AddActionTitle"));
- java.awt.Dialog d = TopManager.getDefault().createDialog(dd);
+ java.awt.Dialog d = org.openide.DialogDisplayer.getDefault().createDialog(dd);
d.show ();
if (dd.getValue() == DialogDescriptor.OK_OPTION) {
updateData ();
@@ -191,7 +191,7 @@
}//GEN-LAST:event_removeButtonActionPerformed
private void updateData () {
- map = TopManager.getDefault ().getGlobalKeymap ();
+ map = (Keymap)Lookup.getDefault ().lookup (Keymap.class);
KeyStroke[] strokesArray = map.getBoundKeyStrokes();
strokes = new Vector ();
for (int i = 0; i < strokesArray.length; i++) {
Index: core/src/org/netbeans/core/Splash.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/Splash.java,v
--- core/src/org/netbeans/core/Splash.java 11 Sep 2002 16:43:55 -0000 1.67
+++ core/src/org/netbeans/core/Splash.java 16 Oct 2002 04:50:01 -0000
@@ -31,11 +31,14 @@
import javax.swing.*;
import java.lang.ref.WeakReference;
import java.lang.ref.Reference;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.openide.util.Utilities;
import org.openide.util.NbBundle;
import org.netbeans.core.ui.ProductInformationPanel;
+import org.openide.awt.StatusDisplayer;
import org.openide.windows.WindowManager;
/** A class that encapsulates all the splash screen things.
@@ -49,6 +52,8 @@
/** The about image */
static Reference aboutRef;
+
+ private static StatusDisplayer status;
private static String getMainWindowTitle () {
String buildNumber = System.getProperty ("netbeans.buildnumber"); // NOI18N
@@ -68,11 +73,16 @@
// show splash
splashWindow.show ();
splashWindow.toFront ();
+ status = StatusDisplayer.getDefault();
+ status.addChangeListener((ChangeListener)splashWindow);
+
return (SplashOutput) splashWindow;
}
public static void hideSplash (SplashOutput xsplashWindow) {
final Window splashWindow = (Window) xsplashWindow;
+ status.removeChangeListener((ChangeListener)splashWindow);
+ status = null;
((SplashOutputInternal) xsplashWindow).hideRequested();
javax.swing.SwingUtilities.invokeLater (new Runnable () {
public void run () {
@@ -481,7 +491,7 @@
}
}
- static class SplashWindow extends Window implements SplashOutput, SplashOutputInternal {
+ static class SplashWindow extends Window implements SplashOutput, SplashOutputInternal, ChangeListener {
/** generated Serialized Version UID */
static final long serialVersionUID = 4838519880359397841L;
@@ -538,9 +548,13 @@
splashComponent.addAndSetMaxSteps(steps);
}
+ public void stateChanged(ChangeEvent e) {
+ print(status.getStatusText());
+ }
+
}
- static class SplashFrame extends JFrame implements SplashOutput, SplashOutputInternal {
+ static class SplashFrame extends JFrame implements SplashOutput, SplashOutputInternal, ChangeListener {
/** generated Serialized Version UID */
static final long serialVersionUID = 3200319077899134000L;
@@ -588,6 +602,10 @@
public void addAndSetMaxSteps(int steps) {
splashComponent.addAndSetMaxSteps(steps);
+ }
+
+ public void stateChanged(ChangeEvent e) {
+ print(status.getStatusText());
}
}
Index: core/src/org/netbeans/core/TipsOnStartup.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/TipsOnStartup.java,v
--- core/src/org/netbeans/core/TipsOnStartup.java 11 Apr 2002 16:27:58 -0000 1.22
+++ core/src/org/netbeans/core/TipsOnStartup.java 16 Oct 2002 04:50:01 -0000
@@ -30,7 +30,6 @@
import javax.swing.text.html.*;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.NotifyDescriptor;
import org.openide.util.NbBundle;
@@ -105,16 +104,17 @@
browser.setBackground (java.awt.Color.white);
browser.setBorder(new EtchedBorder(EtchedBorder.LOWERED));
browser.addHyperlinkListener(new HyperlinkListener() {
- public void hyperlinkUpdate(HyperlinkEvent e) {
- if (e.getEventType () == HyperlinkEvent.EventType.ACTIVATED) {
- TopManager tom = TopManager.getDefault();
- tom.setStatusText(bundle.getString("CTL_OpeningBrowser"));
- tom.showUrl(e.getURL());
- TopManager.getDefault().setStatusText(""); // NOI18N
- }
- }
- }
- );
+ public void hyperlinkUpdate(HyperlinkEvent e) {
+ if (e.getEventType () == HyperlinkEvent.EventType.ACTIVATED) {
+
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ bundle.getString("CTL_OpeningBrowser"));
+ org.openide.awt.HtmlBrowser.URLDisplayer.getDefault().showURL(e.getURL());
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(""); // NOI18N
+ }
+ }
+ }
+ );
add(new JScrollPane(browser), BorderLayout.CENTER);
jcx = new JCheckBox(bundle.getString("CTL_NEXTSTARTUP"), true);
@@ -152,7 +152,7 @@
}
}
if (url == null) {
- TopManager.getDefault ().notify (
+ org.openide.DialogDisplayer.getDefault ().notify (
new NotifyDescriptor.Message (
NbBundle.getBundle (TipsOnStartup.class).getString ("ERR_NoTipsFound"),
NotifyDescriptor.WARNING_MESSAGE));
Index: core/src/org/netbeans/core/ToolbarFolderNode.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ToolbarFolderNode.java,v
--- core/src/org/netbeans/core/ToolbarFolderNode.java 26 Sep 2002 14:33:44 -0000 1.30
+++ core/src/org/netbeans/core/ToolbarFolderNode.java 16 Oct 2002 04:50:01 -0000
@@ -24,7 +24,6 @@
import org.openide.cookies.InstanceCookie;
import org.openide.NotifyDescriptor;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileSystem;
import org.openide.loaders.DataFolder;
@@ -33,6 +32,7 @@
import org.openide.util.datatransfer.NewType;
import org.openide.util.actions.SystemAction;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.WeakListener;
import org.openide.awt.Toolbar;
@@ -57,7 +57,7 @@
public static final ResourceBundle bundle = NbBundle.getBundle (ToolbarFolderNode.class);
public ToolbarFolderNode () {
- this (NbTopManager.getDefault ().getPlaces ().folders ().toolbars ());
+ this (NbPlaces.getDefault().toolbars ());
}
/** Constructs this node with given node to filter.
@@ -106,7 +106,7 @@
bundle.getString ("PROP_newToolbarDialog"));
il.setInputText (bundle.getString ("PROP_newToolbar"));
- Object ok = TopManager.getDefault ().notify (il);
+ Object ok = org.openide.DialogDisplayer.getDefault ().notify (il);
if (ok == NotifyDescriptor.OK_OPTION) {
String s = il.getInputText();
if (!s.equals ("")) { // NOI18N
@@ -138,7 +138,7 @@
bundle.getString ("PROP_newToolbarConfigDialog"));
il.setInputText (bundle.getString ("PROP_newToolbarConfig"));
- Object ok = TopManager.getDefault ().notify (il);
+ Object ok = org.openide.DialogDisplayer.getDefault ().notify (il);
if (ok == NotifyDescriptor.OK_OPTION) {
String s = il.getInputText();
if (!s.equals ("")) { // NOI18N
@@ -630,7 +630,7 @@
/** Returns ToolbarConfiguration found by its name or null if such config doesn't exist. */
ToolbarConfiguration configuration(String conf) {
- DataObject[] obj = NbTopManager.getDefault ().getPlaces ().folders ().toolbars ().getChildren();
+ DataObject[] obj = NbPlaces.getDefault().toolbars ().getChildren();
for (int i = 0; i < obj.length; i++) {
DataObject o = obj[i];
org.openide.cookies.InstanceCookie ic = (org.openide.cookies.InstanceCookie)o.getCookie(org.openide.cookies.InstanceCookie.class);
Index: core/src/org/netbeans/core/actions/CloseMaximizedFrameAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/CloseMaximizedFrameAction.java,v
--- core/src/org/netbeans/core/actions/CloseMaximizedFrameAction.java 8 Apr 2002 14:39:57 -0000 1.2
+++ core/src/org/netbeans/core/actions/CloseMaximizedFrameAction.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.awt.event.*;
import java.util.*;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.awt.JMenuPlus;
@@ -77,7 +76,7 @@
public boolean isEnabled () {
if (WindowUtils.isMdi()) {
WindowManagerImpl wm =
- (WindowManagerImpl)TopManager.getDefault().getWindowManager();
+ (WindowManagerImpl)WindowManager.getDefault();
WorkspaceImpl currentWorkspace = (WorkspaceImpl) wm.getCurrentWorkspace();
ModeImpl maximizedMode = currentWorkspace.getTopMaximizedMode();
if (maximizedMode != null) {
@@ -100,7 +99,7 @@
/** Implementation of runnable interface, runs the action command */
public void run() {
WindowManagerImpl wm =
- (WindowManagerImpl)TopManager.getDefault().getWindowManager();
+ (WindowManagerImpl)WindowManager.getDefault();
WorkspaceImpl currentWorkspace = (WorkspaceImpl) wm.getCurrentWorkspace();
ModeImpl maximizedMode = currentWorkspace.getTopMaximizedMode();
if (maximizedMode != null) {
Index: core/src/org/netbeans/core/actions/ConfigureShortcutsAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/ConfigureShortcutsAction.java,v
--- core/src/org/netbeans/core/actions/ConfigureShortcutsAction.java 19 Feb 2002 14:17:23 -0000 1.15
+++ core/src/org/netbeans/core/actions/ConfigureShortcutsAction.java 16 Oct 2002 04:50:01 -0000
@@ -14,7 +14,6 @@
package org.netbeans.core.actions;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
@@ -40,7 +39,7 @@
null,
null
);
- TopManager.getDefault ().createDialog (dd).show ();
+ org.openide.DialogDisplayer.getDefault ().createDialog (dd).show ();
se.flushChanges();
}
Index: core/src/org/netbeans/core/actions/DisplayToolbarsAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/DisplayToolbarsAction.java,v
--- core/src/org/netbeans/core/actions/DisplayToolbarsAction.java 19 Feb 2002 14:17:23 -0000 1.2
+++ core/src/org/netbeans/core/actions/DisplayToolbarsAction.java 16 Oct 2002 04:50:01 -0000
@@ -17,9 +17,10 @@
import org.netbeans.core.ToolbarFolderNode;
-import org.openide.TopManager;
+import org.openide.nodes.NodeOperation;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
/** Displayes a toolbar tree in the explorer
@@ -54,7 +55,9 @@
/** An action
*/
public void performAction () {
- TopManager.getDefault().getNodeOperation ().explore(new ToolbarFolderNode());
+ NodeOperation no = (NodeOperation)Lookup.getDefault()
+ .lookup (NodeOperation.class);
+ no.explore(new ToolbarFolderNode());
}
/** Getter for a ResourceBundle
Index: core/src/org/netbeans/core/actions/EditorViewAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/EditorViewAction.java,v
--- core/src/org/netbeans/core/actions/EditorViewAction.java 21 Mar 2002 11:35:08 -0000 1.22
+++ core/src/org/netbeans/core/actions/EditorViewAction.java 16 Oct 2002 04:50:01 -0000
@@ -16,7 +16,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.WeakListener;
Index: core/src/org/netbeans/core/actions/FrameResidenceAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/FrameResidenceAction.java,v
--- core/src/org/netbeans/core/actions/FrameResidenceAction.java 16 Jul 2002 08:27:59 -0000 1.7
+++ core/src/org/netbeans/core/actions/FrameResidenceAction.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.awt.event.*;
import java.util.*;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.awt.JMenuPlus;
Index: core/src/org/netbeans/core/actions/GlobalPropertiesAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/GlobalPropertiesAction.java,v
--- core/src/org/netbeans/core/actions/GlobalPropertiesAction.java 19 Feb 2002 14:17:23 -0000 1.12
+++ core/src/org/netbeans/core/actions/GlobalPropertiesAction.java 16 Oct 2002 04:50:01 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.actions;
-import org.openide.TopManager;
import org.openide.windows.TopComponent;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
Index: core/src/org/netbeans/core/actions/HTMLViewAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/HTMLViewAction.java,v
--- core/src/org/netbeans/core/actions/HTMLViewAction.java 21 Mar 2002 11:35:09 -0000 1.22
+++ core/src/org/netbeans/core/actions/HTMLViewAction.java 16 Oct 2002 04:50:01 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.actions;
-import org.openide.TopManager;
import org.openide.awt.HtmlBrowser;
import org.openide.windows.*;
import org.openide.util.HelpCtx;
@@ -25,7 +24,7 @@
import org.openide.windows.WindowManager;
/** Activates last opened HTML browser or opens a HTML Browser on the home URL
- * specified in IDESettings using TopManager.showUrl().
+ * specified in IDESettings using HtmlBrowser.URLDisplayer.showURL().
*
* @author Ian Formanek
*/
@@ -41,10 +40,8 @@
}
public void performAction() {
- TopManager tm = TopManager.getDefault();
- tm.setStatusText (NbBundle.getBundle(HTMLViewAction.class).
- getString("CTL_OpeningBrowser")
- );
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getBundle(HTMLViewAction.class).getString("CTL_OpeningBrowser"));
try {
boolean notFound = true;
@@ -78,8 +75,8 @@
}
}
if (notFound) {
- tm.showUrl (new java.net.URL (
- HtmlBrowser.getHomePage ()
+ HtmlBrowser.URLDisplayer.getDefault().showURL(
+ new java.net.URL(HtmlBrowser.getHomePage ()
));
}
} catch (java.net.MalformedURLException e) {
@@ -87,16 +84,17 @@
startsWith ("http://") // NOI18N
) {
try {
- tm.showUrl (new java.net.URL (
- "http://" + HtmlBrowser.getHomePage () // NOI18N
+ HtmlBrowser.URLDisplayer.getDefault().showURL(
+ new java.net.URL("http://" + HtmlBrowser.getHomePage () // NOI18N
));
} catch (java.net.MalformedURLException e1) {
- tm.showUrl (IDESettings.getRealHomeURL ());
+ HtmlBrowser.URLDisplayer.getDefault().showURL(
+ IDESettings.getRealHomeURL ());
}
} else
- tm.showUrl (IDESettings.getRealHomeURL ());
+ HtmlBrowser.URLDisplayer.getDefault().showURL(IDESettings.getRealHomeURL ());
}
- tm.setStatusText (""); // NOI18N
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText (""); // NOI18N
}
public String getName() {
Index: core/src/org/netbeans/core/actions/MinimizeMaximizedFrameAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/MinimizeMaximizedFrameAction.java,v
--- core/src/org/netbeans/core/actions/MinimizeMaximizedFrameAction.java 8 Apr 2002 14:39:58 -0000 1.2
+++ core/src/org/netbeans/core/actions/MinimizeMaximizedFrameAction.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.awt.event.*;
import java.util.*;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.awt.JMenuPlus;
@@ -77,7 +76,7 @@
return false;
}
WindowManagerImpl wm =
- (WindowManagerImpl)TopManager.getDefault().getWindowManager();
+ (WindowManagerImpl)WindowManager.getDefault();
WorkspaceImpl currentWorkspace = (WorkspaceImpl) wm.getCurrentWorkspace();
ModeImpl maximizedMode = currentWorkspace.getTopMaximizedMode();
if (maximizedMode != null) {
@@ -99,7 +98,7 @@
/** Implementation of runnable interface, runs the action command */
public void run() {
WindowManagerImpl wm =
- (WindowManagerImpl)TopManager.getDefault().getWindowManager();
+ (WindowManagerImpl)WindowManager.getDefault();
WorkspaceImpl currentWorkspace = (WorkspaceImpl) wm.getCurrentWorkspace();
ModeImpl maximizedMode = currentWorkspace.getTopMaximizedMode();
if (maximizedMode != null) {
Index: core/src/org/netbeans/core/actions/MountAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/MountAction.java,v
--- core/src/org/netbeans/core/actions/MountAction.java 10 Apr 2002 11:59:23 -0000 1.8
+++ core/src/org/netbeans/core/actions/MountAction.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import javax.swing.JMenuItem;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction;
Index: core/src/org/netbeans/core/actions/NewTemplateCallableAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/NewTemplateCallableAction.java,v
--- core/src/org/netbeans/core/actions/NewTemplateCallableAction.java 11 Apr 2002 16:28:00 -0000 1.6
+++ core/src/org/netbeans/core/actions/NewTemplateCallableAction.java 16 Oct 2002 04:50:01 -0000
@@ -16,14 +16,16 @@
import java.util.ResourceBundle;
import java.util.Enumeration;
import java.awt.event.ActionEvent;
+import org.netbeans.core.NbPlaces;
-import org.openide.TopManager;
+import org.openide.actions.ActionManager;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.Repository;
import org.openide.nodes.Node;
import org.openide.actions.NewTemplateAction;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.SharedClassObject;
@@ -82,8 +84,9 @@
if (isWritable) {
((NewTemplateAction) SharedClassObject.findObject (NewTemplateAction.class, true)).performAction ();
} else {
- Node mountNode = TopManager.getDefault ().getPlaces ().nodes ().repositorySettings ();
- TopManager.getDefault ().getActionManager ().invokeAction (
+ Node mountNode = NbPlaces.getDefault().repositorySettings ();
+ ActionManager am = (ActionManager)Lookup.getDefault ().lookup (ActionManager.class);
+ am.invokeAction (
(NewTemplateAction)SharedClassObject.findObject (NewTemplateAction.class, true),
new ActionEvent (mountNode, ActionEvent.ACTION_PERFORMED, null)
);
Index: core/src/org/netbeans/core/actions/OptionsAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/OptionsAction.java,v
--- core/src/org/netbeans/core/actions/OptionsAction.java 25 Sep 2002 13:43:10 -0000 1.44
+++ core/src/org/netbeans/core/actions/OptionsAction.java 16 Oct 2002 04:50:01 -0000
@@ -32,7 +32,6 @@
import org.openide.util.actions.SystemAction;
import org.openide.util.actions.ActionPerformer;
import org.openide.util.actions.CallableSystemAction;
-import org.openide.TopManager;
import org.openide.nodes.*;
import org.openide.explorer.ExplorerPanel;
import org.openide.explorer.propertysheet.PropertySheetView;
@@ -51,6 +50,7 @@
import org.netbeans.core.projects.SettingChildren;
import org.netbeans.core.projects.SessionManager;
import org.netbeans.core.NbMainExplorer;
+import org.netbeans.core.NbPlaces;
import org.netbeans.core.windows.ModeImpl;
import org.netbeans.core.windows.PersistenceManager;
import org.netbeans.core.windows.WindowManagerImpl;
@@ -73,7 +73,8 @@
/** Shows options panel. */
public void performAction () {
- TopManager.getDefault().setStatusText(NbBundle.getBundle(OptionsAction.class).getString("MSG_Preparing_options"));
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getBundle(OptionsAction.class).getString("MSG_Preparing_options"));
OptionsPanel singleton = OptionsPanel.singleton();
singleton.prepareNodes ();
@@ -109,7 +110,7 @@
optionPanel.requestFocus();
optionPanel.requestDefaultFocus();
- TopManager.getDefault ().setStatusText (""); // NOI18N
+ org.openide.awt.StatusDisplayer.getDefault ().setStatusText (""); // NOI18N
}
});
}
@@ -248,7 +249,8 @@
gridBagConstraints.insets.left = 5;
help.addActionListener (new ActionListener () {
public void actionPerformed (ActionEvent e) {
- TopManager.getDefault ().showHelp (OptionsPanel.this.getHelpCtx ());
+ org.netbeans.core.NbTopManager.get().showHelp (
+ OptionsPanel.this.getHelpCtx ());
}
});
add (help, gridBagConstraints);
@@ -517,8 +519,8 @@
private static class OptionsFilterNode extends FilterNode {
public OptionsFilterNode () {
super (
- TopManager.getDefault().getPlaces().nodes().session(),
- new SettingChildren (TopManager.getDefault().getPlaces().nodes().session())
+ NbPlaces.getDefault().session(),
+ new SettingChildren (NbPlaces.getDefault().session())
);
}
public HelpCtx getHelpCtx () {
Index: core/src/org/netbeans/core/actions/RestoreMaximizedFrameAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/RestoreMaximizedFrameAction.java,v
--- core/src/org/netbeans/core/actions/RestoreMaximizedFrameAction.java 8 Apr 2002 14:39:59 -0000 1.2
+++ core/src/org/netbeans/core/actions/RestoreMaximizedFrameAction.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.awt.event.*;
import java.util.*;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.awt.JMenuPlus;
@@ -77,7 +76,7 @@
return false;
}
WindowManagerImpl wm =
- (WindowManagerImpl)TopManager.getDefault().getWindowManager();
+ (WindowManagerImpl)WindowManager.getDefault();
WorkspaceImpl currentWorkspace = (WorkspaceImpl) wm.getCurrentWorkspace();
ModeImpl maximizedMode = currentWorkspace.getTopMaximizedMode();
if (maximizedMode != null) {
@@ -99,7 +98,7 @@
/** Implementation of runnable interface, runs the action command */
public void run() {
WindowManagerImpl wm =
- (WindowManagerImpl)TopManager.getDefault().getWindowManager();
+ (WindowManagerImpl)WindowManager.getDefault();
WorkspaceImpl currentWorkspace = (WorkspaceImpl) wm.getCurrentWorkspace();
ModeImpl maximizedMode = currentWorkspace.getTopMaximizedMode();
if (maximizedMode != null) {
Index: core/src/org/netbeans/core/actions/SetArgumentsAction.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/SetArgumentsAction.java,v
--- core/src/org/netbeans/core/actions/SetArgumentsAction.java 28 Oct 2001 19:21:46 -0000 1.22
+++ core/src/org/netbeans/core/actions/SetArgumentsAction.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.util.StringTokenizer;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.NotifyDescriptor;
import org.openide.cookies.ArgumentsCookie;
import org.openide.execution.ExecInfo;
@@ -93,7 +92,7 @@
HelpCtx.setHelpIDString(ap, "set.arguments.window"); // NOI18N
DialogDescriptor dd = new DialogDescriptor (ap, NbBundle.getBundle(SetArgumentsAction.class).getString("CTL_SetArgumentsTitle"));
dd.setHelpCtx(new HelpCtx("set.arguments.window"));
- TopManager.getDefault ().createDialog (dd).show ();
+ org.openide.DialogDisplayer.getDefault ().createDialog (dd).show ();
if (dd.getValue () == DialogDescriptor.OK_OPTION) {
StringTokenizer st = new StringTokenizer (ap.getArguments ());
@@ -105,7 +104,7 @@
try {
cookie.setArguments (args);
} catch (IOException ex) {
- TopManager.getDefault().notify(
+ org.openide.DialogDisplayer.getDefault().notify(
new NotifyDescriptor.Message(
NbBundle.getBundle(SetArgumentsAction.class).getString("MSG_ArgumentsCannotBeSet"),
NotifyDescriptor.ERROR_MESSAGE
Index: core/src/org/netbeans/core/actions/SystemExit.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/actions/SystemExit.java,v
--- core/src/org/netbeans/core/actions/SystemExit.java 18 Jun 2002 13:39:35 -0000 1.23
+++ core/src/org/netbeans/core/actions/SystemExit.java 16 Oct 2002 04:50:01 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.actions;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.openide.util.actions.CallableSystemAction;
import org.openide.util.NbBundle;
@@ -57,8 +56,8 @@
RequestProcessor.getDefault().post(this);
}
- /* Performs the exit (by calling TopManager).*/
+ /* Performs the exit (by calling LifecycleManager).*/
public void run() {
- org.openide.TopManager.getDefault().exit();
+ org.openide.LifecycleManager.getDefault().exit();
}
}
Index: core/src/org/netbeans/core/awt/TabControl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/awt/TabControl.java,v
--- core/src/org/netbeans/core/awt/TabControl.java 27 Sep 2002 15:56:42 -0000 1.18
+++ core/src/org/netbeans/core/awt/TabControl.java 16 Oct 2002 04:50:01 -0000
@@ -25,7 +25,6 @@
import java.lang.Thread;
import java.io.*;
-import org.openide.TopManager;
import org.openide.util.NbBundle;
import org.openide.windows.WindowManager;
import org.netbeans.core.windows.MainWindow;
Index: core/src/org/netbeans/core/execution/DefaultSysProcess.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/DefaultSysProcess.java,v
--- core/src/org/netbeans/core/execution/DefaultSysProcess.java 17 Jan 2002 15:46:04 -0000 1.18
+++ core/src/org/netbeans/core/execution/DefaultSysProcess.java 16 Oct 2002 04:50:01 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.execution;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.execution.ExecutorTask;
import org.openide.windows.InputOutput;
Index: core/src/org/netbeans/core/execution/ExecutionEngine.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/ExecutionEngine.java,v
--- core/src/org/netbeans/core/execution/ExecutionEngine.java 20 Aug 2002 19:48:16 -0000 1.65
+++ core/src/org/netbeans/core/execution/ExecutionEngine.java 16 Oct 2002 04:50:01 -0000
@@ -37,7 +37,6 @@
import org.openide.loaders.DataObject;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.execution.NbClassPath;
import org.openide.execution.ExecInfo;
Index: core/src/org/netbeans/core/execution/ExecutionSettingsBeanInfo.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/ExecutionSettingsBeanInfo.java,v
--- core/src/org/netbeans/core/execution/ExecutionSettingsBeanInfo.java 17 Jan 2002 15:46:04 -0000 1.18
+++ core/src/org/netbeans/core/execution/ExecutionSettingsBeanInfo.java 16 Oct 2002 04:50:01 -0000
@@ -16,7 +16,6 @@
import java.awt.Image;
import java.beans.*;
-import org.openide.TopManager;
import org.openide.util.Utilities;
import org.openide.ErrorManager;
Index: core/src/org/netbeans/core/execution/IOTable.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/IOTable.java,v
--- core/src/org/netbeans/core/execution/IOTable.java 10 Jan 2002 15:22:07 -0000 1.28
+++ core/src/org/netbeans/core/execution/IOTable.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.util.HashMap;
import java.util.Hashtable;
-import org.openide.TopManager;
import org.openide.windows.InputOutput;
import org.openide.windows.OutputWriter;
import org.openide.windows.TopComponent;
@@ -120,7 +119,7 @@
String allName = ((TopComponent) inout).getName();
io = getTaskIO(allName);
if (io == null) { // executed for the first time
- inout = TopManager.getDefault().getIO(allName);
+ inout = org.openide.windows.IOProvider.getDefault().getIO(allName, true);
io = new TaskIO(inout, allName);
} else {
inout = io.getInout();
Index: core/src/org/netbeans/core/execution/RunClassThread.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/RunClassThread.java,v
--- core/src/org/netbeans/core/execution/RunClassThread.java 9 Jul 2002 16:03:05 -0000 1.4
+++ core/src/org/netbeans/core/execution/RunClassThread.java 16 Oct 2002 04:50:01 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.execution;
-import org.openide.TopManager;
import org.openide.windows.InputOutput;
/** Simple class for executing tasks in extra threads */
@@ -91,7 +90,7 @@
TaskIO tIO = null;
tIO = engine.getTaskIOs().getTaskIO(ioname);
if (tIO == null) { // executed for the first time
- io = TopManager.getDefault().getIO(ioname);
+ io = org.openide.windows.IOProvider.getDefault().getIO(ioname, true);
tIO = new TaskIO(io, ioname);
} else {
io = tIO.getInout();
Index: core/src/org/netbeans/core/execution/TabHandlerEditor.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/TabHandlerEditor.java,v
--- core/src/org/netbeans/core/execution/TabHandlerEditor.java 10 Jan 2002 15:22:07 -0000 1.3
+++ core/src/org/netbeans/core/execution/TabHandlerEditor.java 16 Oct 2002 04:50:01 -0000
@@ -18,7 +18,6 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.openide.TopManager;
import org.openide.util.NbBundle;
/** A property editor for available workspaces.
Index: core/src/org/netbeans/core/execution/TopSecurityManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/execution/TopSecurityManager.java,v
--- core/src/org/netbeans/core/execution/TopSecurityManager.java 25 Feb 2002 12:14:51 -0000 1.49
+++ core/src/org/netbeans/core/execution/TopSecurityManager.java 16 Oct 2002 04:50:01 -0000
@@ -27,11 +27,7 @@
import java.util.*;
import java.lang.reflect.Field;
-import org.openide.TopManager;
import org.openide.ErrorManager;
-import org.openide.execution.NbClassLoader;
-
-//import ice.iblite.BrowserClassLoader;
/** See java.lang.SecurityManager for more details.
*
@@ -50,12 +46,14 @@
private static final Class classLoaderClass;
private static final Class nbClassLoaderClass;
private static final Class URLClass;
+ private static final Class runtimePermissionClass;
static {
try {
classLoaderClass = Class.forName("java.lang.ClassLoader"); // NOI18N
nbClassLoaderClass = Class.forName("org.openide.execution.NbClassLoader"); // NOI18N
URLClass = Class.forName("java.net.URL"); // NOI18N
+ runtimePermissionClass = Class.forName("java.lang.RuntimePermission"); // NOI18N
getAccessControllerClass();
} catch (ClassNotFoundException e) {
throw new ExceptionInInitializerError();
@@ -268,7 +266,7 @@
/** Prohibits to set another SecurityManager */
private static void checkSetSecurityManager(Permission perm) {
- if (perm instanceof RuntimePermission) {
+ if (runtimePermissionClass.isInstance(perm)) {
if ("setSecurityManager".equals(perm.getName())) { // NOI18N - hardcoded in java.lang
throw new SecurityException();
}
@@ -292,7 +290,7 @@
ClassLoader cloader;
for (int i = 0; i < ctx.length; i++) {
- if ((ctx[i].getClassLoader() instanceof NbClassLoader) &&
+ if ((nbClassLoaderClass.isInstance(ctx[i].getClassLoader())) &&
(ctx[i].getProtectionDomain().getCodeSource() != null)) {
return true;
}
Index: core/src/org/netbeans/core/modules/ManifestSection.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/ManifestSection.java,v
--- core/src/org/netbeans/core/modules/ManifestSection.java 26 Jun 2002 16:45:05 -0000 1.12
+++ core/src/org/netbeans/core/modules/ManifestSection.java 16 Oct 2002 04:50:02 -0000
@@ -27,7 +27,6 @@
import org.openide.loaders.DataLoader;
import org.openide.options.SystemOption;
import org.openide.filesystems.FileSystem;
-import org.openide.debugger.Debugger;
import org.openide.ServiceType;
import org.openide.util.actions.SystemAction;
import org.openide.nodes.Node;
@@ -35,6 +34,7 @@
import org.openide.util.datatransfer.ExClipboard;
import org.openide.util.SharedClassObject;
import org.openide.ErrorManager;
+import org.openide.util.Lookup;
// XXX synchronization?
@@ -356,7 +356,16 @@
*/
public static final class DebuggerSection extends ManifestSection {
DebuggerSection(String name, Attributes attrs, Module module) throws InvalidException {
- super(name, module, Debugger.class);
+ super(name, module, getDebuggerClazz(module));
+ }
+ private static Class getDebuggerClazz(Module m) throws InvalidException {
+ try {
+ return ((ClassLoader)Lookup.getDefault().lookup(ClassLoader.class)).loadClass("org.openide.debugger.Debugger"); // NOI18N
+ } catch (ClassNotFoundException cnfe) {
+ InvalidException e = new InvalidException(m, "Debugger sections may only be used if you depend on org.openide.deprecated to be able to access Debugger"); // NOI18N
+ Util.err.annotate(e, cnfe);
+ throw e;
+ }
}
}
Index: core/src/org/netbeans/core/modules/Module.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/Module.java,v
--- core/src/org/netbeans/core/modules/Module.java 8 Oct 2002 20:18:37 -0000 1.38
+++ core/src/org/netbeans/core/modules/Module.java 16 Oct 2002 04:50:02 -0000
@@ -1088,6 +1088,13 @@
return null;
}
}
+
+ protected boolean isSpecialResource(String pkg) {
+ if (mgr.isSpecialResource(pkg)) {
+ return true;
+ }
+ return super.isSpecialResource(pkg);
+ }
protected boolean shouldDelegateResource(String pkg, ClassLoader parent) {
if (!super.shouldDelegateResource(pkg, parent)) {
Index: core/src/org/netbeans/core/modules/ModuleInstaller.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/ModuleInstaller.java,v
--- core/src/org/netbeans/core/modules/ModuleInstaller.java 8 Oct 2002 20:18:37 -0000 1.7
+++ core/src/org/netbeans/core/modules/ModuleInstaller.java 16 Oct 2002 04:50:02 -0000
@@ -156,5 +156,16 @@
public void refineClassLoader(Module m, List parents) {
// do nothing
}
+
+ /** Is this package special in that the package domain cache should be disabled for it?
+ * The result must never change between subsequent calls for the same argument.
+ * The default implementation always says no.
+ * @param pkg a package in the form "org/netbeans/modules/foo/"
+ * @return true if this package might be split across modules, otherwise false
+ * @since org.netbeans.core/1 > 1.7
+ */
+ public boolean isSpecialResource(String pkg) {
+ return false;
+ }
}
Index: core/src/org/netbeans/core/modules/ModuleList.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/ModuleList.java,v
--- core/src/org/netbeans/core/modules/ModuleList.java 15 Sep 2002 20:22:40 -0000 1.38
+++ core/src/org/netbeans/core/modules/ModuleList.java 16 Oct 2002 04:50:02 -0000
@@ -34,6 +34,7 @@
import org.openide.util.Utilities;
import org.openide.util.WeakListener;
import java.lang.reflect.Method;
+import org.netbeans.core.LoaderPoolNode;
import org.openide.util.io.NbObjectInputStream;
import org.openide.util.io.NbObjectOutputStream;
import org.openide.util.RequestProcessor;
@@ -1063,7 +1064,7 @@
private static final byte[] SERNULL = {0xAC - 0x100, 0xED - 0x100, 0x00, 0x05, 0x70};
private void transferLoaderPool (ObjectInput oi) throws IOException {
- FileObject pool = org.netbeans.core.NbProjectOperation.getLoaderPoolStorage ();
+ FileObject pool = LoaderPoolNode.getLoaderPoolStorage(true);
FileLock lock = pool.lock ();
try {
ObjectOutput os = new ObjectOutputStream (pool.getOutputStream (lock));
@@ -1084,7 +1085,7 @@
lock.releaseLock ();
}
}
-
+
/** Read an XML file using an XMLReader and parse into a map of properties.
* One distinguished property 'name' is the code name base
* and is taken from the root element. Others are taken
Index: core/src/org/netbeans/core/modules/ModuleManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/ModuleManager.java,v
--- core/src/org/netbeans/core/modules/ModuleManager.java 8 Oct 2002 20:18:38 -0000 1.44
+++ core/src/org/netbeans/core/modules/ModuleManager.java 16 Oct 2002 04:50:02 -0000
@@ -309,7 +309,7 @@
}
/** A classloader giving access to all the module classloaders at once. */
- private static final class SystemClassLoader extends ProxyClassLoader {
+ private final class SystemClassLoader extends ProxyClassLoader {
private final StringBuffer debugme;
private boolean empty = true;
@@ -351,6 +351,13 @@
return debugme.toString();
}
+ protected boolean isSpecialResource(String pkg) {
+ if (installer.isSpecialResource(pkg)) {
+ return true;
+ }
+ return super.isSpecialResource(pkg);
+ }
+
}
/** @see #create(File,Object,boolean,boolean,boolean)
@@ -476,6 +483,9 @@
}
// The installer can perform additional checks:
return installer.shouldDelegateResource(m, parent, pkg);
+ }
+ boolean isSpecialResource(String pkg) {
+ return installer.isSpecialResource(pkg);
}
// Again, access from Module to ModuleInstaller:
Manifest loadManifest(File jar) throws IOException {
Index: core/src/org/netbeans/core/modules/ModuleSystem.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/ModuleSystem.java,v
--- core/src/org/netbeans/core/modules/ModuleSystem.java 12 Sep 2002 22:12:54 -0000 1.25
+++ core/src/org/netbeans/core/modules/ModuleSystem.java 16 Oct 2002 04:50:02 -0000
@@ -65,6 +65,15 @@
ev = Boolean.getBoolean("netbeans.modules.quiet") ? (Events)new QuietEvents() : new NbEvents();
installer = new NbInstaller(ev);
mgr = new ModuleManager(installer, ev);
+ PropertyChangeListener l = new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent ev) {
+ if (ModuleManager.PROP_CLASS_LOADER.equals(ev.getPropertyName())) {
+ NbTopManager.Lkp.systemClassLoaderChanged(mgr.getClassLoader());
+ }
+ }
+ };
+ mgr.addPropertyChangeListener(l);
+ NbTopManager.Lkp.systemClassLoaderChanged(mgr.getClassLoader());
if (systemFileSystem.isReadOnly()) {
list = null;
} else {
@@ -116,31 +125,6 @@
public Events getEvents() {
return ev;
}
-
- /** Get the system classloader, for use from NbTopManager.
- * When it changes, NbTopManager will likewise be notified.
- */
- public ClassLoader getSystemClassLoader() {
- if (! addedClassLoaderListener) {
- addedClassLoaderListener = true;
- class ListenerFirer implements PropertyChangeListener, Runnable {
- public void propertyChange(PropertyChangeEvent ev) {
- if (ModuleManager.PROP_CLASS_LOADER.equals(ev.getPropertyName())) {
- // Exit read mutex first for safety.
- RequestProcessor.getDefault().post(ListenerFirer.this);
- }
- }
- public void run() {
- NbTopManager.get().fireSystemClassLoaderChange();
- Util.err.log("fired change in system classloader");
- }
- }
- mgr.addPropertyChangeListener(new ListenerFirer());
- }
- // #16265: no need for write mutex any more.
- return mgr.getClassLoader();
- }
- private boolean addedClassLoaderListener = false;
/** Produce a list of JAR files including all installed modules,
* their extensions, and enabled locale variants of both.
Index: core/src/org/netbeans/core/modules/NbEvents.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/NbEvents.java,v
--- core/src/org/netbeans/core/modules/NbEvents.java 11 Oct 2002 15:19:32 -0000 1.27
+++ core/src/org/netbeans/core/modules/NbEvents.java 16 Oct 2002 04:50:03 -0000
@@ -15,9 +15,9 @@
// May use core, GUI, ad nauseum.
-import org.openide.TopManager;
import java.io.File;
import java.util.*;
+import org.openide.awt.StatusDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.modules.SpecificationVersion;
@@ -33,8 +33,6 @@
*/
final class NbEvents extends Events {
- private final TopManager tm = TopManager.getDefault();
-
/** Handle a logged event.
* CAREFUL that this is called synchronously, usually within a write
* mutex or other sensitive environment. So do not call anything
@@ -51,55 +49,68 @@
} else if (message == START_CREATE_BOOT_MODULE) {
Main.addToSplashMaxSteps(1);
} else if (message == START_LOAD_BOOT_MODULES) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_load_boot_modules"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_load_boot_modules"));
StartLog.logStart("ModuleSystem.loadBootModules"); // NOI18N
} else if (message == START_LOAD) {
StartLog.logStart("NbInstaller.load"); // NOI18N
} else if (message == FINISH_LOAD_BOOT_MODULES) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_load_boot_modules"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_load_boot_modules"));
StartLog.logEnd( "ModuleSystem.loadBootModules" ); // NOI18N
} else if (message == FINISH_LOAD) {
StartLog.logEnd("NbInstaller.load"); // NOI18N
} else if (message == START_AUTO_INSTALL) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_auto_install"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_auto_install"));
} else if (message == START_AUTO_RESTORE) {
Set modules = (Set)args[0];
if (! modules.isEmpty()) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_auto_restore"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_auto_restore"));
}
} else if (message == FINISH_AUTO_INSTALL) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_auto_install"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_auto_install"));
} else if (message == FINISH_AUTO_RESTORE) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_auto_restore"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_auto_restore"));
} else if (message == START_ENABLE_MODULES) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_enable_modules"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_enable_modules"));
} else if (message == FINISH_ENABLE_MODULES) {
List modules = (List)args[0];
if (! modules.isEmpty()) {
System.err.println(NbBundle.getMessage(NbEvents.class, "TEXT_finish_enable_modules"));
dumpModulesList(modules);
}
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_enable_modules"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_enable_modules"));
StartLog.logEnd("ModuleManager.enable"); // NOI18N
} else if (message == START_DISABLE_MODULES) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_disable_modules"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_disable_modules"));
} else if (message == FINISH_DISABLE_MODULES) {
List modules = (List)args[0];
if (! modules.isEmpty()) {
System.err.println(NbBundle.getMessage(NbEvents.class, "TEXT_finish_disable_modules"));
dumpModulesList(modules);
}
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_disable_modules"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_disable_modules"));
} else if (message == CONVERTING) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "TEXT_converting"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "TEXT_converting"));
} else if (message == START_DEPLOY_TEST_MODULE) {
// No need to print anything. ModuleSystem.deployTestModule prints
// its own stuff (it needs to be printed synchronously to console
// in order to appear in the output window). But status text is OK.
// Again no need for I18N as this is only for module developers.
- tm.setStatusText("Deploying test module in " + (File)args[0] + "..."); // NOI18N
+ StatusDisplayer.getDefault().setStatusText(
+ "Deploying test module in " + (File)args[0] + "..."); // NOI18N
} else if (message == FINISH_DEPLOY_TEST_MODULE) {
- tm.setStatusText("Finished deploying test module."); // NOI18N
+ StatusDisplayer.getDefault().setStatusText(
+ "Finished deploying test module."); // NOI18N
} else if (message == FAILED_INSTALL_NEW) {
StringBuffer buf = new StringBuffer(NbBundle.getMessage(NbEvents.class, "MSG_failed_install_new"));
Iterator it = ((Set)args[0]).iterator();
@@ -122,7 +133,7 @@
}
}
notify(buf.toString(), true);
- tm.setStatusText("");
+ StatusDisplayer.getDefault().setStatusText("");
} else if (message == FAILED_INSTALL_NEW_UNEXPECTED) {
Module m = (Module)args[0];
// ignore args[1]: InvalidException
@@ -141,9 +152,10 @@
throw new IllegalStateException("Module " + m + " could not be installed but had no problems"); // NOI18N
}
notify(buf.toString(), true);
- tm.setStatusText("");
+ StatusDisplayer.getDefault().setStatusText("");
} else if (message == START_READ) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_read"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_read"));
StartLog.logStart("ModuleList.readInitial"); // NOI18N
} else if (message == MODULES_FILE_PROCESSED) {
Main.incrementSplashProgressBar();
@@ -153,12 +165,15 @@
} else if (message == FINISH_READ) {
Set modules = (Set)args[0];
Main.addToSplashMaxSteps(modules.size() + modules.size());
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_read"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_read"));
StartLog.logEnd("ModuleList.readInitial"); // NOI18N
} else if (message == START_SCAN) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_start_scan"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_start_scan"));
} else if (message == FINISH_SCAN) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_finish_scan"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_finish_scan"));
Set modules = (Set)args[0];
Main.addToSplashMaxSteps(modules.size());
if (! modules.isEmpty()) {
@@ -167,25 +182,31 @@
}
} else if (message == RESTORE) {
// Don't look for display name. Just takes too long.
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_restore"/*, ((Module)args[0]).getDisplayName()*/));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_restore"/*, ((Module)args[0]).getDisplayName()*/));
Main.incrementSplashProgressBar();
} else if (message == INSTALL) {
// Nice to see the real title; not that common, after all.
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_install", ((Module)args[0]).getDisplayName()));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_install", ((Module)args[0]).getDisplayName()));
System.err.println(NbBundle.getMessage(NbEvents.class, "TEXT_install", ((Module)args[0]).getDisplayName()));
Main.incrementSplashProgressBar();
} else if (message == UPDATE) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_update", ((Module)args[0]).getDisplayName()));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_update", ((Module)args[0]).getDisplayName()));
System.err.println(NbBundle.getMessage(NbEvents.class, "TEXT_update", ((Module)args[0]).getDisplayName()));
Main.incrementSplashProgressBar();
} else if (message == UNINSTALL) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_uninstall", ((Module)args[0]).getDisplayName()));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_uninstall", ((Module)args[0]).getDisplayName()));
} else if (message == LOAD_SECTION) {
// Again avoid finding display name now.
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_load_section"/*, ((Module)args[0]).getDisplayName()*/));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_load_section"/*, ((Module)args[0]).getDisplayName()*/));
Main.incrementSplashProgressBar();
} else if (message == LOAD_LAYERS) {
- tm.setStatusText(NbBundle.getMessage(NbEvents.class, "MSG_load_layers"));
+ StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(NbEvents.class, "MSG_load_layers"));
} else if (message == WRONG_CLASS_LOADER) {
if (! Boolean.getBoolean("netbeans.moduleitem.dontverifyclassloader")) { // NOI18N
Class clazz = (Class)args[1];
@@ -343,7 +364,7 @@
this.desc = desc;
}
public void run() {
- TopManager.getDefault().notify(desc);
+ org.openide.DialogDisplayer.getDefault().notify(desc);
}
}
Index: core/src/org/netbeans/core/modules/NbInstaller.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/NbInstaller.java,v
--- core/src/org/netbeans/core/modules/NbInstaller.java 8 Oct 2002 20:18:38 -0000 1.49
+++ core/src/org/netbeans/core/modules/NbInstaller.java 16 Oct 2002 04:50:03 -0000
@@ -201,6 +201,12 @@
public void load(List modules) {
ev.log(Events.START_LOAD, modules);
+
+ // Not necessary during unload() since then the class loader will change
+ // anyway and Lkp.systemClassLoaderChanged will be called.
+ NbTopManager.Lkp.moduleClassLoadersUp();
+ ev.log(Events.PERF_TICK, "META-INF/services/ additions registered"); // NOI18N
+
loadLayers(modules, true);
ev.log(Events.PERF_TICK, "layers loaded"); // NOI18N
@@ -702,20 +708,28 @@
return openide;
}
+ /** If true, no automatic deps are made on modules for old client modules.
+ * Useful for unit tests.
+ */
+ private static final boolean NO_COMPAT_AUTO_DEPS_JH = Boolean.getBoolean("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_DEPS_JH");
+ private static final boolean NO_COMPAT_AUTO_DEPS_DEPRECATED = Boolean.getBoolean("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_DEPS_DEPRECATED");
+
/** Overridden to perform automatic API upgrades.
* That is, should do nothing on new modules, but for older ones will
* automatically make them depend on things they need.
*/
public void refineDependencies(Module m, Set dependencies) {
- // Special case.
+ // Special cases.
if (m.getCodeNameBase().equals("org.netbeans.core")) return; // NOI18N
+ if (m.getCodeNameBase().startsWith("org.netbeans.core.")) return; // NOI18N
+ if (m.getCodeNameBase().equals("org.openide")) return; // NOI18N
+ if (m.getCodeNameBase().startsWith("org.openide.")) return; // NOI18N
// First find out what API this module is expecting.
// Format: release.major.minor, e.g. IDE/1 > 2.3 => "1.2.3"
SpecificationVersion openide = getIDEDep(dependencies);
// Handle JavaHelp. For modules before API 2.2, they should have an
// automatic dependency on token org.netbeans.api.javahelp.Help.
- if (!m.getCodeNameBase().equals("org.netbeans.modules.javahelp") && // NOI18N
- !m.getCodeNameBase().equals("org.openide") && // NOI18N
+ if (!NO_COMPAT_AUTO_DEPS_JH && !m.getCodeNameBase().equals("org.netbeans.modules.javahelp") && // NOI18N
(openide == null || openide.compareTo(new SpecificationVersion("1.2.2")) < 0)) { // NOI18N
// Older than IDE/1 2.2, or at least does not claim to be newer.
// First make sure it does not *already* depend on this module.
@@ -735,14 +749,53 @@
"org.netbeans.api.javahelp.Help")); // NOI18N
}
}
+ // For pre-3.14, add automatic deps on org.openide.src and org.openide.deprecated.
+ if (!NO_COMPAT_AUTO_DEPS_DEPRECATED && (openide == null || openide.compareTo(new SpecificationVersion("1.3.14")) < 0)) { // NOI18N
+ String[] nue = new String[] {
+ "org.openide.deprecated", // NOI18N
+ "org.openide.src", // NOI18N
+ };
+ for (int i = 0; i < nue.length; i++) {
+ boolean alreadyHave = false;
+ Iterator it = dependencies.iterator();
+ while (it.hasNext()) {
+ Dependency d = (Dependency)it.next();
+ if (d.getType() == Dependency.TYPE_MODULE &&
+ d.getName().equals(nue[i])) {
+ alreadyHave = true;
+ break;
+ }
+ }
+ if (!alreadyHave) {
+ Util.err.log("Adding automatic dependency on " + nue[i] + " for module " + m.getCodeNameBase());
+ dependencies.addAll(Dependency.create(Dependency.TYPE_MODULE, nue[i] + " > 1.0")); // NOI18N
+ }
+ }
+ boolean alreadyHave = false;
+ Iterator it = dependencies.iterator();
+ while (it.hasNext()) {
+ Dependency d = (Dependency)it.next();
+ if (d.getType() == Dependency.TYPE_REQUIRES &&
+ d.getName().equals("org.openide.TopManager")) { // NOI18N
+ alreadyHave = true;
+ break;
+ }
+ }
+ if (!alreadyHave) {
+ Util.err.log("Adding automatic dependency on org.openide.TopManager for module " + m.getCodeNameBase());
+ dependencies.addAll(Dependency.create(Dependency.TYPE_REQUIRES, "org.openide.TopManager")); // NOI18N
+ }
+ }
}
+ private static final boolean NO_COMPAT_AUTO_TRANSITIVE_DEPS = Boolean.getBoolean("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_TRANSITIVE_DEPS");
+
// Compat for #27853: if an old module (pre-3.12) declares some dependencies,
// interpret them recursively to force its classloader to "see" accessible
// classes from even indirect dependencies.
public void refineClassLoader(Module m, List parents) {
SpecificationVersion openide = getIDEDep(m.getDependencies());
- if (openide == null || openide.compareTo(new SpecificationVersion("1.3.12")) < 0) { // NOI18N
+ if (!NO_COMPAT_AUTO_TRANSITIVE_DEPS && (openide == null || openide.compareTo(new SpecificationVersion("1.3.12")) < 0)) { // NOI18N
Dependency[] deps = m.getDependenciesArray();
Set parentModules = new HashSet(deps.length * 3 + 5); // Set
addLoadersRecursively(parents, deps, parentModules, m);
@@ -900,6 +953,15 @@
// No one ought to be using boot.jar:
{"boot"}, // NOI18N
};
+
+ /** These packages have been refactored into several modules.
+ * Disable the domain cache for them.
+ */
+ public boolean isSpecialResource(String pkg) {
+ if (pkg.startsWith("org/openide/")) return true; // NOI18N
+ if (pkg.startsWith("org/netbeans/core/")) return true; // NOI18N
+ return super.isSpecialResource(pkg);
+ }
/** Get the effective "classpath" used by a module.
* Specific syntax: classpath entries as usual, but
Index: core/src/org/netbeans/core/output/FindDialogPanel.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/output/FindDialogPanel.java,v
--- core/src/org/netbeans/core/output/FindDialogPanel.java 24 Sep 2002 09:23:23 -0000 1.1
+++ core/src/org/netbeans/core/output/FindDialogPanel.java 16 Oct 2002 04:50:03 -0000
@@ -21,7 +21,6 @@
import javax.swing.JCheckBox;
import javax.swing.SwingUtilities;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.util.NbBundle;
/**
@@ -220,7 +219,7 @@
}
});
- dialog = TopManager.getDefault().createDialog( dialogDescriptor );
+ dialog = org.openide.DialogDisplayer.getDefault().createDialog( dialogDescriptor );
}
}
Index: core/src/org/netbeans/core/output/OutputSettingsBeanInfo.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/output/OutputSettingsBeanInfo.java,v
--- core/src/org/netbeans/core/output/OutputSettingsBeanInfo.java 15 Sep 2002 20:22:41 -0000 1.21
+++ core/src/org/netbeans/core/output/OutputSettingsBeanInfo.java 16 Oct 2002 04:50:03 -0000
@@ -16,7 +16,6 @@
import java.awt.Image;
import java.beans.*;
-import org.openide.TopManager;
import org.openide.util.Utilities;
import org.netbeans.beaninfo.editors.FileEditor;
import org.openide.ErrorManager;
Index: core/src/org/netbeans/core/output/OutputTabTerm.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/output/OutputTabTerm.java,v
--- core/src/org/netbeans/core/output/OutputTabTerm.java 30 Sep 2002 13:33:57 -0000 1.87
+++ core/src/org/netbeans/core/output/OutputTabTerm.java 16 Oct 2002 04:50:03 -0000
@@ -39,6 +39,8 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.Observable;
+import java.util.Observer;
import javax.swing.JFrame;
import javax.swing.JPanel;
@@ -49,7 +51,6 @@
import javax.swing.SwingUtilities;
import javax.swing.text.Keymap;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.windows.*;
import org.openide.awt.SplittedPanel;
@@ -78,6 +79,7 @@
import org.netbeans.core.windows.*;
import org.netbeans.core.actions.NextOutJumpAction;
import org.netbeans.core.actions.PreviousOutJumpAction;
+import org.netbeans.core.NbTopManager;
import org.netbeans.lib.terminalemulator.*;
import org.openide.filesystems.FileSystem;
@@ -717,14 +719,17 @@
keyStrokeSet = new HashSet();
// Arrange so that we track changes in global keymap
- TopManager tm = TopManager.getDefault();
- tm.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange (PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals(TopManager.PROP_GLOBAL_KEYMAP)) {
+ Keymap map = (Keymap)org.openide.util.Lookup.getDefault().lookup(Keymap.class);
+ // This is a hack. Since there is no official API for notifying changes
+ // from Keymap, just rely on fact that core impl is an Observable.
+ if (map instanceof Observable) {
+ Observable o = (Observable)map;
+ o.addObserver(new Observer() {
+ public void update(Observable o, Object arg) {
updateKeyStrokeSet();
- }
- }
- } );
+ }
+ });
+ }
updateKeyStrokeSet();
@@ -1280,7 +1285,7 @@
} else {
String msg = NbBundle.getBundle(OutputTabTerm.class).
getString("MSG_AtLastError");
- TopManager.getDefault().setStatusText(msg);
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(msg);
next_wrap_warned = true;
return false;
}
@@ -1304,7 +1309,7 @@
} else {
String msg = NbBundle.getBundle(OutputTabTerm.class).
getString("MSG_AtFirstError");
- TopManager.getDefault().setStatusText(msg);
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(msg);
prev_wrap_warned = true;
return false;
}
Index: core/src/org/netbeans/core/perftool/PerformanceMeterFactory.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/perftool/PerformanceMeterFactory.java,v
--- core/src/org/netbeans/core/perftool/PerformanceMeterFactory.java 17 Jan 2002 15:46:05 -0000 1.2
+++ core/src/org/netbeans/core/perftool/PerformanceMeterFactory.java 16 Oct 2002 04:50:03 -0000
@@ -13,8 +13,8 @@
package org.netbeans.core.perftool;
-import org.openide.TopManager;
import org.openide.ErrorManager;
+import org.openide.util.Lookup;
/** Creates PerformanceMeter
*
@@ -30,7 +30,8 @@
String opt = System.getProperty(PerformanceMeter.NAMING_NAME);
if (opt != null && !opt.equals(Boolean.TRUE.toString())) {
try {
- Class clz = Class.forName(opt, false, TopManager.getDefault().systemClassLoader());
+ Class clz = Class.forName(opt, false,
+ (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class));
} catch (ClassNotFoundException e) {
ErrorManager.getDefault().notify(ErrorManager.WARNING, e);
instance = PerformanceMeterImpl.getInstance();
Index: core/src/org/netbeans/core/perftool/PerformanceMeterImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/perftool/PerformanceMeterImpl.java,v
--- core/src/org/netbeans/core/perftool/PerformanceMeterImpl.java 17 Jan 2002 15:46:06 -0000 1.5
+++ core/src/org/netbeans/core/perftool/PerformanceMeterImpl.java 16 Oct 2002 04:50:03 -0000
@@ -15,7 +15,6 @@
import java.text.MessageFormat;
-import org.openide.TopManager;
import org.openide.ErrorManager;
/** The class collects performance info about different
Index: core/src/org/netbeans/core/projects/FileStateManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/FileStateManager.java,v
--- core/src/org/netbeans/core/projects/FileStateManager.java 25 Sep 2002 11:43:30 -0000 1.8
+++ core/src/org/netbeans/core/projects/FileStateManager.java 16 Oct 2002 04:50:03 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.projects;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.util.WeakListener;
Index: core/src/org/netbeans/core/projects/FixedFileSystem.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/FixedFileSystem.java,v
--- core/src/org/netbeans/core/projects/FixedFileSystem.java 16 Apr 2002 12:34:46 -0000 1.7
+++ core/src/org/netbeans/core/projects/FixedFileSystem.java 16 Oct 2002 04:50:03 -0000
@@ -20,6 +20,7 @@
import org.openide.filesystems.*;
import org.openide.filesystems.FileSystem;
+import org.openide.util.Lookup;
import org.openide.util.enum.EmptyEnumeration;
/** Read-only, fixed-structure filesystem.
@@ -286,8 +287,8 @@
if (inst.beanName == null) return null;
try {
- Class clazz = org.openide.TopManager.getDefault().
- systemClassLoader().loadClass(inst.beanName);
+ Class clazz = ((ClassLoader)Lookup.getDefault()
+ .lookup(ClassLoader.class)).loadClass(inst.beanName);
return org.openide.util.Utilities.getBeanInfo(clazz).getIcon(
BeanInfo.ICON_COLOR_16x16);
} catch (Exception ex) {
Index: core/src/org/netbeans/core/projects/LocalFileSystemEx.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/LocalFileSystemEx.java,v
--- core/src/org/netbeans/core/projects/LocalFileSystemEx.java 11 Apr 2002 16:28:05 -0000 1.6
+++ core/src/org/netbeans/core/projects/LocalFileSystemEx.java 16 Oct 2002 04:50:03 -0000
@@ -21,7 +21,6 @@
import java.util.Set;
import java.util.Iterator;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.filesystems.*;
Index: core/src/org/netbeans/core/projects/ModuleLayeredFileSystem.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/ModuleLayeredFileSystem.java,v
--- core/src/org/netbeans/core/projects/ModuleLayeredFileSystem.java 12 Sep 2002 22:26:40 -0000 1.19
+++ core/src/org/netbeans/core/projects/ModuleLayeredFileSystem.java 16 Oct 2002 04:50:03 -0000
@@ -20,7 +20,6 @@
import java.util.*;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.filesystems.FileSystem;
import org.openide.modules.Dependency;
@@ -109,7 +108,8 @@
private static FileSystem loadCache(LayerCacheManager mgr) throws IOException {
if (mgr.cacheExists()) {
// XXX use Events to log!
- TopManager.getDefault().setStatusText(NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_start_load_cache"));
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_start_load_cache"));
String msg = "Loading layers from " + mgr.getCacheDirectory(); // NOI18N
StartLog.logStart(msg);
FileSystem fs;
@@ -121,7 +121,8 @@
cleanStamp(mgr.getCacheDirectory());
fs = mgr.createEmptyFileSystem();
}
- TopManager.getDefault().setStatusText(NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_end_load_cache"));
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_end_load_cache"));
StartLog.logEnd(msg);
return fs;
} else {
@@ -162,7 +163,7 @@
* if working within the core.
*/
public static ModuleLayeredFileSystem getInstallationModuleLayer () {
- FileSystem fs = TopManager.getDefault ().getRepository ().getDefaultFileSystem();
+ FileSystem fs = Repository.getDefault ().getDefaultFileSystem();
SystemFileSystem sfs = (SystemFileSystem)fs;
ModuleLayeredFileSystem home = sfs.getInstallationLayer ();
if (home != null)
@@ -177,7 +178,7 @@
*/
public static ModuleLayeredFileSystem getUserModuleLayer () {
SystemFileSystem sfs = (SystemFileSystem)
- TopManager.getDefault ().getRepository ().getDefaultFileSystem();
+ Repository.getDefault().getDefaultFileSystem();
return sfs.getUserLayer ();
}
@@ -233,7 +234,8 @@
public void run() throws IOException {
synchronized (ModuleLayeredFileSystem.this) {
if (manager != null) {
- TopManager.getDefault().setStatusText(NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_start_rewrite_cache"));
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_start_rewrite_cache"));
err.log("Rewriting cache in " + cacheDir);
try {
manager.store(getDelegates()[1], urls);
@@ -268,7 +270,8 @@
} finally {
wr.close();
}
- TopManager.getDefault().setStatusText(NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_end_rewrite_cache"));
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(
+ NbBundle.getMessage(ModuleLayeredFileSystem.class, "MSG_end_rewrite_cache"));
} else {
try {
((XMLFileSystem)getDelegates()[1]).setXmlUrls((URL[])urls.toArray(new URL[urls.size()]));
Index: core/src/org/netbeans/core/projects/SettingChildren.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/SettingChildren.java,v
--- core/src/org/netbeans/core/projects/SettingChildren.java 19 Jun 2002 15:34:33 -0000 1.16
+++ core/src/org/netbeans/core/projects/SettingChildren.java 16 Oct 2002 04:50:04 -0000
@@ -14,7 +14,6 @@
package org.netbeans.core.projects;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.NotifyDescriptor;
import org.openide.cookies.InstanceCookie;
import org.openide.nodes.*;
@@ -174,7 +173,7 @@
NbBundle.getMessage (SettingChildren.class, "MSG_ask_remove_above_defined_files"), // NOI18N
NotifyDescriptor.YES_NO_OPTION);
- Object answer = TopManager.getDefault ().notify (nd);
+ Object answer = org.openide.DialogDisplayer.getDefault ().notify (nd);
if (answer.equals (NotifyDescriptor.NO_OPTION))
go = false;
Index: core/src/org/netbeans/core/projects/SystemFileSystem.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/SystemFileSystem.java,v
--- core/src/org/netbeans/core/projects/SystemFileSystem.java 27 Sep 2002 14:23:15 -0000 1.32
+++ core/src/org/netbeans/core/projects/SystemFileSystem.java 16 Oct 2002 04:50:04 -0000
@@ -23,12 +23,12 @@
import javax.swing.JMenuItem;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.filesystems.FileSystem;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.nodes.*;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.util.WeakListener;
@@ -269,7 +269,8 @@
if (bundleName != null) {
try {
bundleName = org.openide.util.Utilities.translate(bundleName);
- ResourceBundle b = NbBundle.getBundle (bundleName, Locale.getDefault (), TopManager.getDefault ().systemClassLoader ());
+ ResourceBundle b = NbBundle.getBundle (bundleName, Locale.getDefault (),
+ (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class)); // systemclassloader
try {
return b.getString (fo.getPath());
} catch (MissingResourceException ex) {
@@ -434,7 +435,7 @@
private static final class SingletonSerializer extends Object implements Serializable {
private static final long serialVersionUID = 6436781994611L;
private Object readResolve () throws ObjectStreamException {
- return TopManager.getDefault ().getRepository ().getDefaultFileSystem ();
+ return Repository.getDefault().getDefaultFileSystem ();
}
}
// --- SAFETY ---
@@ -446,7 +447,7 @@
public static class StructureNode extends AbstractNode {
public StructureNode () {
- this (TopManager.getDefault ().getRepository ().getDefaultFileSystem ());
+ this (Repository.getDefault().getDefaultFileSystem ());
}
public StructureNode (FileSystem fs) {
Index: core/src/org/netbeans/core/projects/SystemFileSystemBeanInfo.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/SystemFileSystemBeanInfo.java,v
--- core/src/org/netbeans/core/projects/SystemFileSystemBeanInfo.java 17 Jan 2002 15:46:06 -0000 1.6
+++ core/src/org/netbeans/core/projects/SystemFileSystemBeanInfo.java 16 Oct 2002 04:50:04 -0000
@@ -16,7 +16,6 @@
import java.awt.Image;
import java.beans.*;
-import org.openide.TopManager;
import org.openide.util.Utilities;
import org.openide.ErrorManager;
Index: core/src/org/netbeans/core/projects/XMLSettingsHandler.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/XMLSettingsHandler.java,v
--- core/src/org/netbeans/core/projects/XMLSettingsHandler.java 16 May 2002 17:32:22 -0000 1.24
+++ core/src/org/netbeans/core/projects/XMLSettingsHandler.java 16 Oct 2002 04:50:04 -0000
@@ -21,7 +21,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.cookies.InstanceCookie;
import org.openide.filesystems.FileObject;
Index: core/src/org/netbeans/core/projects/XMLSettingsSupport.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/projects/XMLSettingsSupport.java,v
--- core/src/org/netbeans/core/projects/XMLSettingsSupport.java 2 Oct 2002 17:32:56 -0000 1.9
+++ core/src/org/netbeans/core/projects/XMLSettingsSupport.java 16 Oct 2002 04:50:04 -0000
@@ -20,12 +20,12 @@
import java.util.Set;
import java.util.Stack;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.filesystems.*;
import org.openide.modules.ModuleInfo;
import org.openide.modules.SpecificationVersion;
import org.openide.util.io.SafeException;
+import org.openide.util.Lookup;
import org.openide.util.SharedClassObject;
import org.openide.windows.TopComponent;
@@ -633,13 +633,9 @@
return loadClass(instanceClass);
}
- /** try to load class from system and current classloader. */
+ /** try to load class from system classloader. */
private Class loadClass(String clazz) throws ClassNotFoundException {
- try {
- return TopManager.getDefault().systemClassLoader().loadClass(clazz);
- } catch (ClassNotFoundException ex) {
- return TopManager.getDefault().currentClassLoader().loadClass(clazz);
- }
+ return ((ClassLoader)Lookup.getDefault().lookup(ClassLoader.class)).loadClass(clazz);
}
/** get class name of instance */
Index: core/src/org/netbeans/core/ui/LookupNode.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/LookupNode.java,v
--- core/src/org/netbeans/core/ui/LookupNode.java 25 Sep 2002 11:43:32 -0000 1.25
+++ core/src/org/netbeans/core/ui/LookupNode.java 16 Oct 2002 04:50:04 -0000
@@ -18,7 +18,6 @@
import org.openide.nodes.*;
import org.openide.actions.*;
import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataFolder;
Index: core/src/org/netbeans/core/ui/ModuleBean.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/ModuleBean.java,v
--- core/src/org/netbeans/core/ui/ModuleBean.java 6 Sep 2002 19:58:12 -0000 1.18
+++ core/src/org/netbeans/core/ui/ModuleBean.java 16 Oct 2002 04:50:04 -0000
@@ -615,7 +615,7 @@
NotifyDescriptor d = new NotifyDescriptor.Confirmation(c,
NbBundle.getMessage(ModuleBean.class, "MB_TITLE_disabling"),
NotifyDescriptor.OK_CANCEL_OPTION);
- if (TopManager.getDefault().notify(d) != NotifyDescriptor.OK_OPTION) {
+ if (org.openide.DialogDisplayer.getDefault().notify(d) != NotifyDescriptor.OK_OPTION) {
// User refused.
// Fire changes again since modules are now wrong & need recalc.
ModuleBean[] _modules = this.modules;
@@ -664,7 +664,7 @@
NotifyDescriptor d = new NotifyDescriptor.Confirmation(c,
NbBundle.getMessage(ModuleBean.class, "MB_TITLE_enabling"),
NotifyDescriptor.OK_CANCEL_OPTION);
- if (TopManager.getDefault().notify(d) != NotifyDescriptor.OK_OPTION) {
+ if (org.openide.DialogDisplayer.getDefault().notify(d) != NotifyDescriptor.OK_OPTION) {
// User refused.
// Fire changes again since modules are now wrong & need recalc.
ModuleBean[] _modules = this.modules;
Index: core/src/org/netbeans/core/ui/ModuleSelectionPanel.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/ModuleSelectionPanel.java,v
--- core/src/org/netbeans/core/ui/ModuleSelectionPanel.java 5 Aug 2002 15:57:39 -0000 1.11
+++ core/src/org/netbeans/core/ui/ModuleSelectionPanel.java 16 Oct 2002 04:50:04 -0000
@@ -29,7 +29,6 @@
import org.openide.WizardDescriptor;
import org.openide.NotifyDescriptor;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.nodes.*;
import org.openide.util.HelpCtx;
import org.openide.util.RequestProcessor;
Index: core/src/org/netbeans/core/ui/MountIterator.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/MountIterator.java,v
--- core/src/org/netbeans/core/ui/MountIterator.java 9 Apr 2002 10:31:26 -0000 1.23
+++ core/src/org/netbeans/core/ui/MountIterator.java 16 Oct 2002 04:50:04 -0000
@@ -35,7 +35,6 @@
import org.openide.explorer.propertysheet.DefaultPropertyModel;
import org.openide.WizardDescriptor.ArrayIterator;
import org.openide.WizardDescriptor.Panel;
-import org.openide.TopManager;
import org.openide.util.NbBundle;
import org.openide.util.WeakListener;
import org.openide.util.HelpCtx;
Index: core/src/org/netbeans/core/ui/ProductInformationPanel.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/ProductInformationPanel.java,v
--- core/src/org/netbeans/core/ui/ProductInformationPanel.java 23 Oct 2001 16:15:12 -0000 1.13
+++ core/src/org/netbeans/core/ui/ProductInformationPanel.java 16 Oct 2002 04:50:04 -0000
@@ -32,7 +32,6 @@
import org.openide.DialogDescriptor;
import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
import org.openide.util.NbBundle;
import org.netbeans.core.TopLogging;
Index: core/src/org/netbeans/core/ui/ProxySettingsDialog.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/ProxySettingsDialog.java,v
--- core/src/org/netbeans/core/ui/ProxySettingsDialog.java 1 Aug 2001 08:57:16 -0000 1.4
+++ core/src/org/netbeans/core/ui/ProxySettingsDialog.java 16 Oct 2002 04:50:04 -0000
@@ -21,7 +21,6 @@
import java.awt.Dialog;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.util.HelpCtx;
import org.netbeans.core.IDESettings;
@@ -151,7 +150,7 @@
DialogDescriptor.BOTTOM_ALIGN, // Align
new HelpCtx(ProxySettingsDialog.class), // Help
null);
- Dialog dialog=TopManager.getDefault().createDialog(dialogdescriptor);
+ Dialog dialog = org.openide.DialogDisplayer.getDefault().createDialog(dialogdescriptor);
dialog.show();
if (dialogdescriptor.getValue()==DialogDescriptor.OK_OPTION) {
IDESettings settings = (IDESettings)IDESettings.findObject(IDESettings.class, true);
Index: core/src/org/netbeans/core/ui/SetupWizard.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/SetupWizard.java,v
--- core/src/org/netbeans/core/ui/SetupWizard.java 15 Sep 2002 20:22:42 -0000 1.11
+++ core/src/org/netbeans/core/ui/SetupWizard.java 16 Oct 2002 04:50:04 -0000
@@ -25,7 +25,6 @@
import java.awt.AWTEvent;
import java.awt.Toolkit;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.WizardDescriptor;
import org.openide.cookies.InstanceCookie;
@@ -314,7 +313,7 @@
for (int i = 0; i < modules.length; i++) {
modules[i].addPropertyChangeListener(this);
}
- java.awt.Dialog d = TopManager.getDefault().createDialog(wd);
+ java.awt.Dialog d = org.openide.DialogDisplayer.getDefault().createDialog(wd);
d.show();
d.dispose();
allModules.removePropertyChangeListener(this);
Index: core/src/org/netbeans/core/ui/SwingBrowser.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/SwingBrowser.java,v
--- core/src/org/netbeans/core/ui/SwingBrowser.java 29 Aug 2001 12:35:20 -0000 1.2
+++ core/src/org/netbeans/core/ui/SwingBrowser.java 16 Oct 2002 04:50:04 -0000
@@ -16,7 +16,6 @@
import java.beans.*;
import java.lang.reflect.Constructor;
-import org.openide.TopManager;
import org.openide.NotifyDescriptor;
import org.openide.awt.HtmlBrowser;
import org.openide.util.NbBundle;
@@ -61,7 +60,7 @@
return (HtmlBrowser.Impl)con.newInstance (new Object [] {});
}
catch (Exception ex) {
- TopManager.getDefault ().notify (
+ org.openide.DialogDisplayer.getDefault ().notify (
new NotifyDescriptor.Message (NbBundle.getMessage (SwingBrowser.class, "MSG_cannot_create_browser"))
);
return null;
Index: core/src/org/netbeans/core/ui/UINodes.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/UINodes.java,v
--- core/src/org/netbeans/core/ui/UINodes.java 6 Mar 2002 14:19:14 -0000 1.5
+++ core/src/org/netbeans/core/ui/UINodes.java 16 Oct 2002 04:50:04 -0000
@@ -16,6 +16,8 @@
import java.awt.Image;
import java.beans.BeanInfo;
import java.io.*;
+import org.netbeans.core.LoaderPoolNode;
+import org.netbeans.core.NbPlaces;
import org.openide.*;
import org.openide.actions.*;
@@ -27,6 +29,7 @@
import org.openide.nodes.*;
import org.openide.nodes.Node.PropertySet;
import org.openide.util.actions.*;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.HelpCtx;
import org.openide.util.RequestProcessor;
@@ -65,8 +68,7 @@
* @return environment node
*/
public static Node createEnvironmentNode () {
- Places.Nodes ns = TopManager.getDefault ().getPlaces ().nodes ();
- Node environmentNode = ns.environment ().cloneNode ();
+ Node environmentNode = NbPlaces.getDefault().environment ().cloneNode ();
environmentNode.setShortDescription (bundle.getString ("CTL_Environment_Hint"));
return environmentNode;
}
@@ -75,8 +77,7 @@
* @return session settings node
*/
public static Node createSessionNode () {
- Places.Nodes ns = TopManager.getDefault ().getPlaces ().nodes ();
- Node sessionNode = ns.session ().cloneNode ();
+ Node sessionNode = NbPlaces.getDefault().session ().cloneNode ();
sessionNode.setShortDescription (bundle.getString ("CTL_Session_Settings_Hint"));
return sessionNode;
}
@@ -86,7 +87,7 @@
*/
public static Node createFileSystems () {
return new MountNode (
- org.netbeans.core.NbPlaces.findSessionFolder ("Mount") // NOI18N
+ NbPlaces.getDefault().findSessionFolder ("Mount") // NOI18N
);
}
@@ -180,12 +181,6 @@
}
}
- /** Getter for folders.
- */
- private static Places.Folders fs () {
- return TopManager.getDefault ().getPlaces ().folders ();
- }
-
/** Node representing templates folder */
private static class TemplatesNode extends IconSubstituteNode {
/** generated Serialized Version UID */
@@ -194,7 +189,7 @@
private static SystemAction[] staticActions;
public TemplatesNode () {
- this (fs ().templates ().getNodeDelegate ());
+ this (NbPlaces.getDefault().templates ().getNodeDelegate ());
}
public TemplatesNode(Node ref) {
@@ -229,7 +224,7 @@
private static SystemAction[] staticActions;
public StartupNode() {
- super (fs ().startup ().getNodeDelegate (), startupIconURL, startupIcon32URL);
+ super (NbPlaces.getDefault().startup ().getNodeDelegate (), startupIconURL, startupIcon32URL);
super.setDisplayName(bundle.getString("CTL_Startup_name"));
super.setShortDescription(bundle.getString("CTL_Startup_hint"));
}
@@ -262,7 +257,7 @@
private static SystemAction[] staticActions;
public ObjectTypesNode() {
- this (TopManager.getDefault ().getPlaces ().nodes ().loaderPool ());
+ this (LoaderPoolNode.getLoaderPoolNode());
}
public ObjectTypesNode(Node ref) {
Index: core/src/org/netbeans/core/ui/WelcomePanel.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/WelcomePanel.java,v
--- core/src/org/netbeans/core/ui/WelcomePanel.java 29 Sep 2002 14:47:34 -0000 1.45
+++ core/src/org/netbeans/core/ui/WelcomePanel.java 16 Oct 2002 04:50:04 -0000
@@ -29,7 +29,6 @@
import javax.swing.text.*;
import org.openide.*;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.NotifyDescriptor;
import org.openide.loaders.*;
import org.openide.filesystems.*;
@@ -37,10 +36,12 @@
import org.openide.nodes.*;
import org.openide.util.actions.*;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.SharedClassObject;
import org.netbeans.core.IDESettings;
+import org.netbeans.core.NbPlaces;
/**
* This class implements "Getting started" dialog.
@@ -118,7 +119,7 @@
}
});
try {
- DataFolder df = TopManager.getDefault ().getPlaces ().folders ().welcome ();
+ DataFolder df = NbPlaces.getDefault().welcome ();
startLoading(df);
contextBrowser.setPage(INFO_URL);
tipsBrowser.setPage(INFO_URL);
@@ -128,10 +129,9 @@
HyperlinkListener hpl = new HyperlinkListener() {
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType () == HyperlinkEvent.EventType.ACTIVATED) {
- TopManager tom = TopManager.getDefault();
- tom.setStatusText(bundle.getString("CTL_OpeningBrowser"));
- tom.showUrl(e.getURL());
- TopManager.getDefault().setStatusText(""); // NOI18N
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(bundle.getString("CTL_OpeningBrowser"));
+ org.openide.awt.HtmlBrowser.URLDisplayer.getDefault().showURL(e.getURL());
+ org.openide.awt.StatusDisplayer.getDefault().setStatusText(""); // NOI18N
}
}
};
@@ -845,7 +845,7 @@
null // action listener
);
- gettingStartedDialog = TopManager.getDefault ().createDialog (descriptor);
+ gettingStartedDialog = org.openide.DialogDisplayer.getDefault ().createDialog (descriptor);
if (gettingStartedDialog instanceof JDialog)
((JDialog)gettingStartedDialog).getRootPane().setDefaultButton(gettingStartedComponent.getCloseButton());
Index: core/src/org/netbeans/core/ui/WizardFolder.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/WizardFolder.java,v
--- core/src/org/netbeans/core/ui/WizardFolder.java 14 Mar 2002 16:03:08 -0000 1.14
+++ core/src/org/netbeans/core/ui/WizardFolder.java 16 Oct 2002 04:50:04 -0000
@@ -21,7 +21,6 @@
import javax.swing.event.*;
import javax.swing.JComponent;
-import org.openide.TopManager;
import org.openide.WizardDescriptor;
import org.openide.cookies.InstanceCookie;
import org.openide.filesystems.FileObject;
Index: core/src/org/netbeans/core/windows/MainWindow.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/MainWindow.java,v
--- core/src/org/netbeans/core/windows/MainWindow.java 6 Aug 2002 14:41:46 -0000 1.48
+++ core/src/org/netbeans/core/windows/MainWindow.java 16 Oct 2002 04:50:05 -0000
@@ -22,11 +22,11 @@
import javax.swing.*;
import javax.swing.border.EmptyBorder;
-import org.openide.TopManager;
import org.openide.awt.MenuBar;
import org.openide.filesystems.*;
import org.openide.nodes.*;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.SharedClassObject;
import org.openide.util.Utilities;
@@ -36,6 +36,7 @@
import org.openide.awt.ToolbarPool;
import org.netbeans.core.actions.SystemExit;
+import org.netbeans.core.NbTopManager;
import org.netbeans.core.windows.frames.DesktopPane;
import org.netbeans.core.windows.toolbars.ToolbarConfiguration;
import org.netbeans.core.windows.util.WindowUtils;
@@ -66,10 +67,6 @@
private MenuBar menuBar;
/** The MainWindow's toolbar */
private JPanel toolbars;
- /** Current project desktop node. */
- transient private Node projectNode = null;
- /** Current listener to changes in project name (other than project itself changing). */
- transient private NodeListener projectNameListener = null;
/** Desktop panel */
private DesktopPane desktopPane;
/** holds "pre-show" event listeners */
@@ -110,31 +107,6 @@
MainWindow.class.getClassLoader()
)));
setIconImage (ideIcon.getImage ());
- projectNameListener = new NodeAdapter () {
- public void propertyChange (PropertyChangeEvent ev2) {
- if (Node.PROP_DISPLAY_NAME.equals (ev2.getPropertyName ())) {
- updateTitle ();
- }
- }
- };
- TopManager.getDefault ().addPropertyChangeListener (new PropertyChangeListener () {
- public void propertyChange (PropertyChangeEvent ev) {
- if (TopManager.PROP_PLACES.equals (ev.getPropertyName ())) {
- if (projectNode != null) {
- projectNode.removeNodeListener (projectNameListener);
- }
- projectNode = TopManager.getDefault ().getPlaces ().nodes ().projectDesktop ();
- if (projectNode != null) {
- projectNode.addNodeListener (projectNameListener);
- }
- updateTitle ();
- }
- }
- });
- projectNode = TopManager.getDefault ().getPlaces ().nodes ().projectDesktop ();
- if (projectNode != null) {
- projectNode.addNodeListener (projectNameListener);
- }
updateTitle ();
setDefaultCloseOperation (DO_NOTHING_ON_CLOSE);
@@ -247,18 +219,21 @@
frameTitle = " - " + mi.frameTitle();
}
}
- String title;
- if ((projectNode == null) || (projectNode.equals(org.netbeans.core.ui.WorkplaceNode.getDefault()))) {
- title = NbBundle.getMessage (
+ String title = NbBundle.getMessage (
MainWindow.class, "CTL_MainWindow_Title_Project",
buildNumber, NbBundle.getMessage (MainWindow.class, "CTL_NoProject"));
- setTitle (title + frameTitle);
- } else {
+ setTitle (title + frameTitle);
+ // XXX if we have some means of finding the name of the "active project" then change to:
+ /*
+ {
+ String projectTitle = "change me"; // NOI18N
title = NbBundle.getMessage (
MainWindow.class, "CTL_MainWindow_Title_Project",
- buildNumber, projectNode.getDisplayName ());
+ buildNumber, projectTitle);
setTitle (title + frameTitle);
}
+ */
+ // and of course add a listener which will call updateTitle
}
});
}
Index: core/src/org/netbeans/core/windows/ModeImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/ModeImpl.java,v
--- core/src/org/netbeans/core/windows/ModeImpl.java 14 Oct 2002 15:52:57 -0000 1.163
+++ core/src/org/netbeans/core/windows/ModeImpl.java 16 Oct 2002 04:50:05 -0000
@@ -44,11 +44,11 @@
import javax.swing.JDesktopPane;
import org.openide.windows.*;
+import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.Utilities;
import org.openide.util.io.SafeException;
import org.openide.util.NbBundle;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.netbeans.core.windows.util.*;
@@ -2788,7 +2788,8 @@
for (Iterator iter = readList.iterator(); iter.hasNext(); ) {
curName = (String)iter.next();
ignoredTcList.add(
- Class.forName(curName, false, TopManager.getDefault().systemClassLoader())
+ Class.forName(curName, false,
+ (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class))
);
}
}
Index: core/src/org/netbeans/core/windows/PersistenceManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/PersistenceManager.java,v
--- core/src/org/netbeans/core/windows/PersistenceManager.java 8 Aug 2002 13:57:17 -0000 1.42
+++ core/src/org/netbeans/core/windows/PersistenceManager.java 16 Oct 2002 04:50:05 -0000
@@ -38,12 +38,10 @@
import org.openide.windows.TopComponent;
import org.openide.loaders.DataFolder;
import org.openide.loaders.InstanceDataObject;
-import org.openide.TopManager;
import org.openide.loaders.DataObject;
import org.openide.cookies.SaveCookie;
import org.openide.cookies.InstanceCookie;
-import org.netbeans.core.projects.SessionManager;
import org.netbeans.core.windows.layers.WSLoader;
import org.netbeans.core.windows.util.WindowUtils;
import java.util.Collections;
Index: core/src/org/netbeans/core/windows/StatusLine.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/StatusLine.java,v
--- core/src/org/netbeans/core/windows/StatusLine.java 17 Jul 2002 14:41:53 -0000 1.15
+++ core/src/org/netbeans/core/windows/StatusLine.java 16 Oct 2002 04:50:05 -0000
@@ -14,47 +14,40 @@
package org.netbeans.core.windows;
import java.awt.*;
-import java.beans.*;
import javax.swing.*;
import javax.swing.border.*;
+import javax.swing.event.*;
+import org.openide.awt.StatusDisplayer;
import org.openide.util.WeakListener;
-import org.netbeans.core.NbTopManager;
-
/** The status line component of the main window. A text can be put into it.
*
-* @author Jaroslav Tulach
+* @author Jaroslav Tulach, Jesse Glick
*/
public class StatusLine extends JLabel
-implements PropertyChangeListener, Runnable {
+implements ChangeListener, Runnable {
/** generated Serialized Version UID */
static final long serialVersionUID = -5644391883356409841L;
+
+ private StatusDisplayer d = StatusDisplayer.getDefault();
/** Creates a new StatusLine with specified workspace switcher. */
public StatusLine () {
- super (NbTopManager.get ().getStatusText());
-
- // attach to top manager
- NbTopManager.get ().addPropertyChangeListener (
- WeakListener.propertyChange (this, NbTopManager.get ())
- );
+ run();
+ d.addChangeListener(WeakListener.change(this, d));
// this is here to not squeeze menus when placed to MenuBar, see #19910
setPreferredSize(new Dimension(0, getPreferredSize().height));
}
- /** Listens to changes.
- */
- public void propertyChange (PropertyChangeEvent ev) {
- if (ev.getPropertyName() == NbTopManager.PROP_STATUS_TEXT) {
- SwingUtilities.invokeLater (this);
- }
+ public void stateChanged(ChangeEvent e) {
+ SwingUtilities.invokeLater (this);
}
-
+
/** Called in event queue, should update the status text.
*/
public void run () {
- setText (NbTopManager.get ().getStatusText ());
+ setText (d.getStatusText ());
}
public static JComponent createLabel () {
Index: core/src/org/netbeans/core/windows/WindowManagerImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/WindowManagerImpl.java,v
--- core/src/org/netbeans/core/windows/WindowManagerImpl.java 11 Sep 2002 10:01:36 -0000 1.149
+++ core/src/org/netbeans/core/windows/WindowManagerImpl.java 16 Oct 2002 04:50:05 -0000
@@ -46,7 +46,6 @@
import javax.swing.RepaintManager;
import javax.swing.UIManager;
-import org.openide.TopManager;
import org.openide.windows.*;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
Index: core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java,v
--- core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java 7 Aug 2002 08:40:02 -0000 1.4
+++ core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java 16 Oct 2002 04:50:05 -0000
@@ -23,7 +23,6 @@
import javax.swing.JButton;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.netbeans.core.windows.WorkspaceExplorerPanel.NodeInfo;
import org.openide.windows.WindowManager;
import org.openide.util.NbBundle;
@@ -177,7 +176,7 @@
null);
dd.setClosingOptions (getButtons());
- dialogWE = TopManager.getDefault().createDialog(dd);
+ dialogWE = org.openide.DialogDisplayer.getDefault().createDialog(dd);
dialogWE.show ();
if (dd.getValue() != null)
Index: core/src/org/netbeans/core/windows/WorkspaceSwitcher.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/WorkspaceSwitcher.java,v
--- core/src/org/netbeans/core/windows/WorkspaceSwitcher.java 6 Aug 2002 14:41:34 -0000 1.22
+++ core/src/org/netbeans/core/windows/WorkspaceSwitcher.java 16 Oct 2002 04:50:06 -0000
@@ -26,18 +26,19 @@
import javax.swing.JMenuItem;
import org.openide.NotifyDescriptor;
-import org.openide.TopManager;
import org.openide.awt.MouseUtils;
import org.openide.awt.JPopupMenuPlus;
import org.openide.awt.Actions;
+import org.openide.nodes.NodeOperation;
import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.windows.Workspace;
import org.openide.windows.WindowManager;
import org.netbeans.core.awt.TabControl;
import org.netbeans.core.Main;
-import org.netbeans.core.NbTopManager;
+import org.netbeans.core.NbPlaces;
/** Visual class for switching workspaces.
*
@@ -181,14 +182,15 @@
);
if(NotifyDescriptor.YES_OPTION
- .equals(TopManager.getDefault().notify(desc))) {
+ .equals(org.openide.DialogDisplayer.getDefault().notify(desc))) {
// delete the index
workspace.remove();
}
break;
case CUSTOMIZE_WORKSPACE:
- TopManager top = NbTopManager.getDefault();
- top.getNodeOperation().explore(top.getPlaces().nodes().workspaces());
+ NodeOperation no = (NodeOperation)Lookup.getDefault()
+ .lookup (NodeOperation.class);
+ no.explore(NbPlaces.getDefault().workspaces());
}
}
Index: core/src/org/netbeans/core/windows/WorkspaceVisibilityManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/WorkspaceVisibilityManager.java,v
--- core/src/org/netbeans/core/windows/WorkspaceVisibilityManager.java 1 Aug 2002 08:31:16 -0000 1.19
+++ core/src/org/netbeans/core/windows/WorkspaceVisibilityManager.java 16 Oct 2002 04:50:06 -0000
@@ -32,7 +32,6 @@
import org.netbeans.core.windows.util.WindowUtils;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
Index: core/src/org/netbeans/core/windows/frames/DefaultContainerImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/DefaultContainerImpl.java,v
--- core/src/org/netbeans/core/windows/frames/DefaultContainerImpl.java 31 Jul 2002 13:28:32 -0000 1.63
+++ core/src/org/netbeans/core/windows/frames/DefaultContainerImpl.java 16 Oct 2002 04:50:06 -0000
@@ -60,7 +60,6 @@
import javax.swing.SwingUtilities;
import org.openide.ErrorManager;
-import org.openide.TopManager;
import org.openide.windows.*;
import org.openide.actions.*;
import org.openide.nodes.Node;
Index: core/src/org/netbeans/core/windows/frames/MultiTabbedContainerImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/MultiTabbedContainerImpl.java,v
--- core/src/org/netbeans/core/windows/frames/MultiTabbedContainerImpl.java 30 Sep 2002 12:05:52 -0000 1.48
+++ core/src/org/netbeans/core/windows/frames/MultiTabbedContainerImpl.java 16 Oct 2002 04:50:06 -0000
@@ -39,7 +39,6 @@
import org.openide.loaders.DataObject;
import org.openide.awt.UndoRedo;
import org.openide.awt.MouseUtils;
-import org.openide.TopManager;
import org.openide.actions.*;
import org.openide.windows.*;
import org.openide.util.NbBundle;
Index: core/src/org/netbeans/core/windows/frames/NbFocusManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/NbFocusManager.java,v
--- core/src/org/netbeans/core/windows/frames/NbFocusManager.java 26 Jun 2002 09:40:13 -0000 1.27
+++ core/src/org/netbeans/core/windows/frames/NbFocusManager.java 16 Oct 2002 04:50:06 -0000
@@ -24,9 +24,10 @@
import java.util.*;
-import org.openide.TopManager;
+import org.openide.actions.ActionManager;
import org.openide.modules.Dependency;
import org.openide.modules.SpecificationVersion;
+import org.openide.util.Lookup;
import org.openide.util.Utilities;
import org.netbeans.core.windows.WindowManagerImpl;
@@ -211,10 +212,11 @@
* @return true if the key has been processed and false otherwise
*/
static boolean processKeyStroke(KeyStroke key, ActionEvent ev) {
- Keymap root = TopManager.getDefault().getGlobalKeymap ();
+ Keymap root = (Keymap)Lookup.getDefault().lookup(Keymap.class);
Action a = root.getAction (key);
if (a != null && a.isEnabled()) {
- TopManager.getDefault().getActionManager().invokeAction(a, ev);
+ ActionManager am = (ActionManager)Lookup.getDefault ().lookup (ActionManager.class);
+ am.invokeAction(a, ev);
return true;
} else {
return false;
@@ -235,7 +237,7 @@
*/
private static boolean isTransmodalAction(KeyStroke key) {
- Keymap root = TopManager.getDefault().getGlobalKeymap ();
+ Keymap root = (Keymap)Lookup.getDefault().lookup(Keymap.class);
Action a = root.getAction (key);
if (a == null) return false;
Object val = a.getValue ("OpenIDE-Transmodal-Action"); // NOI18N
Index: core/src/org/netbeans/core/windows/frames/ShortcutAndMenuKeyEventProcessor.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/ShortcutAndMenuKeyEventProcessor.java,v
--- core/src/org/netbeans/core/windows/frames/ShortcutAndMenuKeyEventProcessor.java 15 Sep 2002 20:22:44 -0000 1.13
+++ core/src/org/netbeans/core/windows/frames/ShortcutAndMenuKeyEventProcessor.java 16 Oct 2002 04:50:06 -0000
@@ -21,9 +21,10 @@
import javax.swing.text.Keymap;
import java.util.HashMap;
import java.lang.reflect.*;
-import org.openide.TopManager;
-import org.openide.util.Utilities;
+import org.openide.actions.ActionManager;
+import org.openide.util.Lookup;
+import org.openide.util.Utilities;
import org.netbeans.core.windows.WindowManagerImpl;
import org.openide.ErrorManager;
@@ -227,10 +228,11 @@
ActionEvent aev = new ActionEvent(
ev.getSource(), ActionEvent.ACTION_PERFORMED, Utilities.keyToString(ks));
- Keymap root = TopManager.getDefault ().getGlobalKeymap ();
+ Keymap root = (Keymap)Lookup.getDefault().lookup(Keymap.class);
Action a = root.getAction (ks);
if (a != null && a.isEnabled()) {
- TopManager.getDefault().getActionManager().invokeAction(a, aev);
+ ActionManager am = (ActionManager)Lookup.getDefault().lookup(ActionManager.class);
+ am.invokeAction(a, aev);
ev.consume();
return true;
}
@@ -269,7 +271,7 @@
* action, or the key is not bound to anything in the global keymap
*/
private static boolean isTransmodalAction (KeyStroke key) {
- Keymap root = TopManager.getDefault ().getGlobalKeymap ();
+ Keymap root = (Keymap)Lookup.getDefault().lookup(Keymap.class);
Action a = root.getAction (key);
if (a == null) return false;
Object val = a.getValue ("OpenIDE-Transmodal-Action"); // NOI18N
Index: core/src/org/netbeans/core/windows/frames/TopComponentContainer.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/TopComponentContainer.java,v
--- core/src/org/netbeans/core/windows/frames/TopComponentContainer.java 31 Jul 2002 13:28:44 -0000 1.14
+++ core/src/org/netbeans/core/windows/frames/TopComponentContainer.java 16 Oct 2002 04:50:06 -0000
@@ -25,7 +25,6 @@
import javax.swing.event.ChangeListener;
import javax.swing.JPanel;
-import org.openide.TopManager;
import org.openide.windows.*;
import org.netbeans.core.windows.WindowManagerImpl;
Index: core/src/org/netbeans/core/windows/frames/WindowTypesManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/WindowTypesManager.java,v
--- core/src/org/netbeans/core/windows/frames/WindowTypesManager.java 6 Aug 2002 14:42:36 -0000 1.8
+++ core/src/org/netbeans/core/windows/frames/WindowTypesManager.java 16 Oct 2002 04:50:06 -0000
@@ -19,7 +19,6 @@
import org.openide.windows.TopComponent;
import org.openide.util.NbBundle;
-import org.openide.TopManager;
import org.openide.ErrorManager;
/** Utility class, with class-only content. Its responsibility is to act as
Index: core/src/org/netbeans/core/windows/layers/ModeData.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/layers/ModeData.java,v
--- core/src/org/netbeans/core/windows/layers/ModeData.java 14 Oct 2002 15:53:00 -0000 1.96
+++ core/src/org/netbeans/core/windows/layers/ModeData.java 16 Oct 2002 04:50:06 -0000
@@ -62,7 +62,6 @@
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.cookies.InstanceCookie;
import org.openide.cookies.SaveCookie;
-import org.openide.TopManager;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.HelpCtx;
Index: core/src/org/netbeans/core/windows/layers/TCRefImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/layers/TCRefImpl.java,v
--- core/src/org/netbeans/core/windows/layers/TCRefImpl.java 14 Oct 2002 15:53:00 -0000 1.44
+++ core/src/org/netbeans/core/windows/layers/TCRefImpl.java 16 Oct 2002 04:50:07 -0000
@@ -33,7 +33,6 @@
import org.xml.sax.XMLReader;
import org.xml.sax.SAXParseException;
-import org.openide.TopManager;
import org.openide.windows.TopComponent;
import org.openide.filesystems.FileChangeListener;
import org.openide.filesystems.FileEvent;
Index: core/src/org/netbeans/core/windows/layers/WSLoader.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/layers/WSLoader.java,v
--- core/src/org/netbeans/core/windows/layers/WSLoader.java 6 Aug 2002 14:42:26 -0000 1.9
+++ core/src/org/netbeans/core/windows/layers/WSLoader.java 16 Oct 2002 04:50:07 -0000
@@ -25,7 +25,6 @@
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.DataObjectExistsException;
import org.openide.util.NbBundle;
-import org.openide.TopManager;
import org.openide.util.actions.SystemAction;
/** Window System loader which recognizes several data objects - data objects
Index: core/src/org/netbeans/core/windows/layers/WindowManagerData.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/layers/WindowManagerData.java,v
--- core/src/org/netbeans/core/windows/layers/WindowManagerData.java 14 Oct 2002 15:53:01 -0000 1.45
+++ core/src/org/netbeans/core/windows/layers/WindowManagerData.java 16 Oct 2002 04:50:07 -0000
@@ -56,7 +56,7 @@
import org.openide.filesystems.FileObject;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
-import org.openide.TopManager;
+
import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
Index: core/src/org/netbeans/core/windows/layers/WorkspaceData.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/layers/WorkspaceData.java,v
--- core/src/org/netbeans/core/windows/layers/WorkspaceData.java 14 Oct 2002 15:53:02 -0000 1.55
+++ core/src/org/netbeans/core/windows/layers/WorkspaceData.java 16 Oct 2002 04:50:07 -0000
@@ -61,7 +61,6 @@
import org.openide.modules.ModuleInfo;
import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
Index: core/src/org/netbeans/core/windows/nodes/ModeContext.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/nodes/ModeContext.java,v
--- core/src/org/netbeans/core/windows/nodes/ModeContext.java 15 Sep 2002 20:22:44 -0000 1.20
+++ core/src/org/netbeans/core/windows/nodes/ModeContext.java 16 Oct 2002 04:50:07 -0000
@@ -26,7 +26,6 @@
import java.lang.reflect.InvocationTargetException;
import java.util.*;
-import org.openide.TopManager;
import org.openide.actions.*;
import org.openide.cookies.InstanceCookie;
import org.openide.windows.Workspace;
Index: core/src/org/netbeans/core/windows/nodes/WorkspaceNewType.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/nodes/WorkspaceNewType.java,v
--- core/src/org/netbeans/core/windows/nodes/WorkspaceNewType.java 6 Aug 2002 14:42:11 -0000 1.11
+++ core/src/org/netbeans/core/windows/nodes/WorkspaceNewType.java 16 Oct 2002 04:50:07 -0000
@@ -13,7 +13,6 @@
package org.netbeans.core.windows.nodes;
-import org.openide.TopManager;
import org.openide.NotifyDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
@@ -61,13 +60,13 @@
nd.setInputText(NbBundle.getMessage(WorkspaceNewType.class,
"New_Workspace"));
- Object ok = TopManager.getDefault ().notify (nd);
+ Object ok = org.openide.DialogDisplayer.getDefault ().notify (nd);
if (ok == NotifyDescriptor.OK_OPTION) {
String s = nd.getInputText();
if ((s == null) || s.trim().equals("")) { // NOI18N
// can't create workspace with empty name
- TopManager.getDefault().notify(new NotifyDescriptor.Message(
+ org.openide.DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
NbBundle.getMessage(WorkspaceNewType.class, "MSG_WorkspaceNameEmpty"),
NotifyDescriptor.INFORMATION_MESSAGE
));
@@ -75,7 +74,7 @@
}
if (nameExists(s)) {
// can't create workspace with already existing name
- TopManager.getDefault().notify(new NotifyDescriptor.Message(
+ org.openide.DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
NbBundle.getMessage(WorkspaceNewType.class, "FMT_WorkspaceExists", s),
NotifyDescriptor.INFORMATION_MESSAGE
));
Index: core/src/org/netbeans/core/windows/toolbars/ToolbarConfiguration.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/toolbars/ToolbarConfiguration.java,v
--- core/src/org/netbeans/core/windows/toolbars/ToolbarConfiguration.java 26 Sep 2002 14:33:45 -0000 1.60
+++ core/src/org/netbeans/core/windows/toolbars/ToolbarConfiguration.java 16 Oct 2002 04:50:07 -0000
@@ -23,11 +23,11 @@
import java.awt.Dimension;
import java.awt.event.*;
import javax.swing.*;
+import org.netbeans.core.NbPlaces;
import org.openide.util.NbBundle;
import org.openide.NotifyDescriptor;
import org.openide.DialogDescriptor;
-import org.openide.TopManager;
import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileSystem;
@@ -37,6 +37,7 @@
import org.openide.awt.Toolbar;
import org.openide.awt.ToolbarPool;
import org.openide.loaders.XMLDataObject;
+import org.openide.util.Lookup;
import org.openide.util.SharedClassObject;
import org.openide.util.Utilities;
@@ -714,7 +715,7 @@
getBundleString("PROP_saveDialog")); // NOI18N
il.setInputText (getBundleString("PROP_saveName")); // NOI18N
- Object ok = TopManager.getDefault ().notify (il);
+ Object ok = org.openide.DialogDisplayer.getDefault ().notify (il);
if (ok == NotifyDescriptor.OK_OPTION) {
String s = il.getInputText();
if (s.length() != 0) {
@@ -792,7 +793,7 @@
* @return false if don't want replace
*/
boolean tryWriteDocument (String cn) throws IOException {
- final FileObject tbFO = TopManager.getDefault().getPlaces().folders().toolbars().getPrimaryFile();
+ final FileObject tbFO = NbPlaces.getDefault().toolbars().getPrimaryFile();
FileObject newFO = tbFO.getFileObject(cn, EXT_XML);
// Bugfix #10779 04 Sep 2001 by Jiri Rechtacek
@@ -816,7 +817,7 @@
(MessageFormat.format (getBundleString("MSG_replaceConfiguration"), // NOI18N
new String [] { cn }),
NotifyDescriptor.OK_CANCEL_OPTION, NotifyDescriptor.WARNING_MESSAGE);
- TopManager.getDefault().notify (replaceD);
+ org.openide.DialogDisplayer.getDefault().notify (replaceD);
if (replaceD.getValue() != DialogDescriptor.OK_OPTION) {
return false;
}
@@ -840,7 +841,7 @@
sb.append ("\n\n").append (wtc.toString()); // NOI18N
- final FileObject tbFO = TopManager.getDefault().getPlaces().folders().toolbars().getPrimaryFile();
+ final FileObject tbFO = NbPlaces.getDefault().toolbars().getPrimaryFile();
final FileSystem tbFS = tbFO.getFileSystem();
tbFS.runAtomicAction (new FileSystem.AtomicAction () {
Index: core/src/org/netbeans/core/xml/FileEntityResolver.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/xml/FileEntityResolver.java,v
--- core/src/org/netbeans/core/xml/FileEntityResolver.java 22 Jul 2002 08:13:49 -0000 1.18
+++ core/src/org/netbeans/core/xml/FileEntityResolver.java 16 Oct 2002 04:50:07 -0000
@@ -25,7 +25,6 @@
import org.w3c.dom.DocumentType;
-import org.openide.TopManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.Repository;
import org.openide.loaders.*;
Index: core/src/org/netbeans/core/xml/NbSAXParserFactoryImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/xml/NbSAXParserFactoryImpl.java,v
--- core/src/org/netbeans/core/xml/NbSAXParserFactoryImpl.java 17 Jan 2002 15:46:11 -0000 1.4
+++ core/src/org/netbeans/core/xml/NbSAXParserFactoryImpl.java 16 Oct 2002 04:50:07 -0000
@@ -15,7 +15,6 @@
import org.xml.sax.*;
import javax.xml.parsers.*;
-import org.openide.TopManager;
import org.openide.ErrorManager;
/**
Index: core/test/perf/src/org/netbeans/core/lookup/FolderLookupBenchmark.java
===================================================================
RCS file: /cvs/core/test/perf/src/org/netbeans/core/lookup/FolderLookupBenchmark.java,v
--- core/test/perf/src/org/netbeans/core/lookup/FolderLookupBenchmark.java 14 Aug 2001 07:38:00 -0000 1.1
+++ core/test/perf/src/org/netbeans/core/lookup/FolderLookupBenchmark.java 16 Oct 2002 04:50:07 -0000
@@ -21,7 +21,7 @@
import java.util.Collection;
import java.util.List;
-import org.openide.debugger.Debugger;
+//import org.openide.debugger.Debugger;
import org.openide.execution.Executor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileSystem;
@@ -32,10 +32,10 @@
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.loaders.FolderLookup;
import org.openide.ServiceType;
-import org.openide.TopManager;
import org.openide.util.Lookup;
import org.openide.util.lookup.AbstractLookup;
+import org.netbeans.core.NbTopManager;
import org.netbeans.core.xml.FileEntityResolver;
import org.netbeans.performance.Benchmark;
@@ -98,7 +98,7 @@
public FolderLookupBenchmark(java.lang.String testName) {
super(testName);
- System.err.println("TopManager="+TopManager.getDefault()); // TEMP
+ System.err.println("TopManager="+NbTopManager.get()); // TEMP
System.err.println("Lookup="+Lookup.getDefault()); // TEMP
}
@@ -118,7 +118,10 @@
List systems = new ArrayList(layerResources.length);
for(int i = 0; i < layerResources.length; i++) {
- URL url = TopManager.getDefault().currentClassLoader().getResource(layerResources[i]);
+ // XXX
+// URL url = TopManager.getDefault().currentClassLoader().getResource(layerResources[i]);
+ ClassLoader cl = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+ URL url = cl.getResource(layerResources[i]);
systems.add(new XMLFileSystem(url));
}
Index: core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java
===================================================================
RCS file: /cvs/core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java,v
--- core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java 12 Sep 2002 22:26:16 -0000 1.7
+++ core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java 16 Oct 2002 04:50:07 -0000
@@ -28,8 +28,8 @@
import org.w3c.dom.*;
import org.apache.xml.serialize.*;
+import org.netbeans.core.NbTopManager;
import org.netbeans.performance.Benchmark;
-import org.openide.TopManager;
import org.openide.xml.XMLUtil;
// initial run (04-sep-02) with empty dummy modules under JDK 1.4.1rc:
@@ -552,7 +552,7 @@
public static final class Main {
public static void main(String[] x) {
- TopManager.getDefault();
+ NbTopManager.get();
if (Boolean.getBoolean("log")) {
Runtime r = Runtime.getRuntime();
r.gc();
Index: core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
===================================================================
RCS file: /cvs/core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java,v
--- core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java 13 Sep 2002 01:26:13 -0000 1.1
+++ core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java 16 Oct 2002 04:50:08 -0000
@@ -18,9 +18,9 @@
import org.netbeans.performance.Benchmark;
-import org.openide.TopManager;
import org.openide.loaders.*;
+import org.netbeans.core.NbTopManager;
import org.netbeans.core.projects.FixedFileSystem;
import org.openide.cookies.InstanceCookie;
import org.openide.filesystems.Repository;
@@ -98,7 +98,7 @@
private DataFolder[] folders;
protected void setUp() throws Exception {
System.setProperty("netbeans.suppress.sysprop.warning", "true");
- TopManager.getDefault();
+ NbTopManager.get();
int count = getIterationCount();
int[] x = (int[])getArgument();
int unmodified = x[0];
Index: core/test/qa-functional/src/gui/propertyeditors/data/PropertiesTest.java
===================================================================
RCS file: /cvs/core/test/qa-functional/src/gui/propertyeditors/data/PropertiesTest.java,v
--- core/test/qa-functional/src/gui/propertyeditors/data/PropertiesTest.java 15 Sep 2002 20:22:46 -0000 1.2
+++ core/test/qa-functional/src/gui/propertyeditors/data/PropertiesTest.java 16 Oct 2002 04:50:08 -0000
@@ -1,10 +1,10 @@
package gui.propertyeditors.data;
import java.lang.reflect.InvocationTargetException;
-import org.openide.TopManager;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
+import org.openide.nodes.NodeOperation;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
@@ -18,10 +18,10 @@
tn = new TNode();
// Display Node
- //TopManager.getDefault().getNodeOperation().explore(tn);
+ //NodeOperation.getDefault().getNodeOperation().explore(tn);
// Display Properties of a Node
- TopManager.getDefault().getNodeOperation().showProperties(tn);
+ NodeOperation.getDefault().showProperties(tn);
try {
Thread.currentThread().sleep(3000);
@@ -72,11 +72,11 @@
props.put(new TestProperty("Compiler Type", org.openide.compiler.CompilerType.class));
props.put(new TestProperty("Data Folder", org.openide.loaders.DataFolder.class));
props.put(new TestProperty("Data Object", org.openide.loaders.DataObject.class));
- props.put(new TestProperty("Debugger Type", org.openide.debugger.DebuggerType.class));
+// props.put(new TestProperty("Debugger Type", org.openide.debugger.DebuggerType.class));
props.put(new TestProperty("Dimension", java.awt.Dimension.class));
props.put(new TestProperty("Double", java.lang.Double.class));
props.put(new TestProperty("double", double.class));
- props.put(new TestProperty("Element Format", org.openide.src.ElementFormat.class));
+// props.put(new TestProperty("Element Format", org.openide.src.ElementFormat.class));
props.put(new TestProperty("Executor", org.openide.execution.Executor.class));
props.put(new TestProperty("Extension List", org.openide.loaders.ExtensionList.class));
props.put(new TestProperty("External Compiler", org.openide.compiler.ExternalCompiler.ErrorExpression.class));
@@ -87,14 +87,14 @@
props.put(new TestProperty("Font", java.awt.Font.class));
props.put(new TestProperty("Html Browser", org.openide.awt.HtmlBrowser.Factory.class));
props.put(new TestProperty("Icon", javax.swing.Icon.class));
- props.put(new TestProperty("Identifier []", org.openide.src.Identifier[].class));
+// props.put(new TestProperty("Identifier []", org.openide.src.Identifier[].class));
props.put(new TestProperty("Indent Engine", org.openide.text.IndentEngine.class));
props.put(new TestProperty("Insets", java.awt.Insets.class));
props.put(new TestProperty("Integer", java.lang.Integer.class));
props.put(new TestProperty("int", int.class));
props.put(new TestProperty("Long", java.lang.Long.class));
props.put(new TestProperty("long", long.class));
- props.put(new TestProperty("Method Parameter []", org.openide.src.MethodParameter[].class));
+// props.put(new TestProperty("Method Parameter []", org.openide.src.MethodParameter[].class));
props.put(new TestProperty("Modifier", java.lang.reflect.Modifier.class));
props.put(new TestProperty("NbClassPath", org.openide.execution.NbClassPath.class));
props.put(new TestProperty("NbProcessDescriptor", org.openide.execution.NbProcessDescriptor.class));
@@ -109,7 +109,7 @@
props.put(new TestProperty("String", java.lang.String.class));
props.put(new TestProperty("String []", java.lang.String[].class));
props.put(new TestProperty("Table Model", javax.swing.table.TableModel.class));
- props.put(new TestProperty("property Type", org.openide.src.Type.class));
+// props.put(new TestProperty("property Type", org.openide.src.Type.class));
props.put(new TestProperty("URL", java.net.URL.class));
return sheet;
Index: core/test/qa-functional/src/gui/propertyeditors/data/PropertyEditorsTestBean.java
===================================================================
RCS file: /cvs/core/test/qa-functional/src/gui/propertyeditors/data/PropertyEditorsTestBean.java,v
--- core/test/qa-functional/src/gui/propertyeditors/data/PropertyEditorsTestBean.java 15 Sep 2002 20:22:46 -0000 1.2
+++ core/test/qa-functional/src/gui/propertyeditors/data/PropertyEditorsTestBean.java 16 Oct 2002 04:50:08 -0000
@@ -136,7 +136,7 @@
private org.openide.compiler.CompilerType p_compilerType;
/** Holds value of property p_debuggerType. */
- private org.openide.debugger.DebuggerType p_debuggerType;
+// private org.openide.debugger.DebuggerType p_debuggerType;
/** Holds value of property p_NbClassPath. */
// hack for forte 4.0 , because if is null, exception arise
@@ -164,17 +164,17 @@
/** Holds value of property p_elementFormat. */
// hack for forte 4.0 , because if is null, exception arise
- private org.openide.src.ElementFormat p_elementFormat = new org.openide.src.ElementFormat("ee");
+// private org.openide.src.ElementFormat p_elementFormat = new org.openide.src.ElementFormat("ee");
/** Holds value of property p_externalCOmpiler. */
private org.openide.compiler.ExternalCompiler.ErrorExpression p_externalCompiler = new org.openide.compiler.ExternalCompiler.ErrorExpression("x1","x2",0,0,0,0);
/** Holds value of property p_methodParameterArray. */
- private org.openide.src.MethodParameter[] p_methodParameterArray;
+// private org.openide.src.MethodParameter[] p_methodParameterArray;
/** Holds value of property p_identifierArray. */
// hack for forte 4.0 , because if is null, exception arise
- private org.openide.src.Identifier[] p_identifierArray = {org.openide.src.Identifier.create("identifier")};
+// private org.openide.src.Identifier[] p_identifierArray = {org.openide.src.Identifier.create("identifier")};
/** Holds value of property p_modifier. */
private java.lang.reflect.Modifier p_modifier;
@@ -190,7 +190,7 @@
/** Holds value of property p_type. */
// hack for forte 4.0 , because if is null, exception arise
- private org.openide.src.Type p_type = org.openide.src.Type.BOOLEAN;
+// private org.openide.src.Type p_type = org.openide.src.Type.BOOLEAN;
/** Holds value of property p_dataFolder. */
private org.openide.loaders.DataFolder p_dataFolder;
@@ -577,16 +577,16 @@
/** Getter for property p_debuggerType.
* @return Value of property p_debuggerType.
*/
- public org.openide.debugger.DebuggerType getP_debuggerType() {
- return this.p_debuggerType;
- }
+// public org.openide.debugger.DebuggerType getP_debuggerType() {
+// return this.p_debuggerType;
+// }
/** Setter for property p_debuggerType.
* @param p_debuggerType New value of property p_debuggerType.
*/
- public void setP_debuggerType(org.openide.debugger.DebuggerType p_debuggerType) {
- this.p_debuggerType = p_debuggerType;
- }
+// public void setP_debuggerType(org.openide.debugger.DebuggerType p_debuggerType) {
+// this.p_debuggerType = p_debuggerType;
+// }
/** Getter for property p_executor.
* @return Value of property p_executor.
@@ -787,16 +787,16 @@
/** Getter for property p_elementFormat.
* @return Value of property p_elementFormat.
*/
- public org.openide.src.ElementFormat getP_elementFormat() {
- return this.p_elementFormat;
- }
+// public org.openide.src.ElementFormat getP_elementFormat() {
+// return this.p_elementFormat;
+// }
/** Setter for property p_elementFormat.
* @param p_elementFormat New value of property p_elementFormat.
*/
- public void setP_elementFormat(org.openide.src.ElementFormat p_elementFormat) {
- this.p_elementFormat = p_elementFormat;
- }
+// public void setP_elementFormat(org.openide.src.ElementFormat p_elementFormat) {
+// this.p_elementFormat = p_elementFormat;
+// }
/** Getter for property p_component.
* @return Value of property p_component.
@@ -844,61 +844,61 @@
* @param index Index of the property.
* @return Value of the property at index.
*/
- public org.openide.src.MethodParameter getP_methodParameterArray(int index) {
- return this.p_methodParameterArray[index];
- }
+// public org.openide.src.MethodParameter getP_methodParameterArray(int index) {
+// return this.p_methodParameterArray[index];
+// }
/** Getter for property p_methodParameterArray.
* @return Value of property p_methodParameterArray.
*/
- public org.openide.src.MethodParameter[] getP_methodParameterArray() {
- return this.p_methodParameterArray;
- }
+// public org.openide.src.MethodParameter[] getP_methodParameterArray() {
+// return this.p_methodParameterArray;
+// }
/** Indexed setter for property p_methodParameterArray.
* @param index Index of the property.
* @param p_methodParameterArray New value of the property at index.
*/
- public void setP_methodParameterArray(int index, org.openide.src.MethodParameter p_methodParameterArray) {
- this.p_methodParameterArray[index] = p_methodParameterArray;
- }
+// public void setP_methodParameterArray(int index, org.openide.src.MethodParameter p_methodParameterArray) {
+// this.p_methodParameterArray[index] = p_methodParameterArray;
+// }
/** Setter for property p_methodParameterArray.
* @param p_methodParameterArray New value of property p_methodParameterArray.
*/
- public void setP_methodParameterArray(org.openide.src.MethodParameter[] p_methodParameterArray) {
- this.p_methodParameterArray = p_methodParameterArray;
- }
+// public void setP_methodParameterArray(org.openide.src.MethodParameter[] p_methodParameterArray) {
+// this.p_methodParameterArray = p_methodParameterArray;
+// }
/** Indexed getter for property p_identifierArray.
* @param index Index of the property.
* @return Value of the property at index.
*/
- public org.openide.src.Identifier getP_identifierArray(int index) {
- return this.p_identifierArray[index];
- }
+// public org.openide.src.Identifier getP_identifierArray(int index) {
+// return this.p_identifierArray[index];
+// }
/** Getter for property p_identifierArray.
* @return Value of property p_identifierArray.
*/
- public org.openide.src.Identifier[] getP_identifierArray() {
- return this.p_identifierArray;
- }
+// public org.openide.src.Identifier[] getP_identifierArray() {
+// return this.p_identifierArray;
+// }
/** Indexed setter for property p_identifierArray.
* @param index Index of the property.
* @param p_identifierArray New value of the property at index.
*/
- public void setP_identifierArray(int index, org.openide.src.Identifier p_identifierArray) {
- this.p_identifierArray[index] = p_identifierArray;
- }
+// public void setP_identifierArray(int index, org.openide.src.Identifier p_identifierArray) {
+// this.p_identifierArray[index] = p_identifierArray;
+// }
/** Setter for property p_identifierArray.
* @param p_identifierArray New value of property p_identifierArray.
*/
- public void setP_identifierArray(org.openide.src.Identifier[] p_identifierArray) {
- this.p_identifierArray = p_identifierArray;
- }
+// public void setP_identifierArray(org.openide.src.Identifier[] p_identifierArray) {
+// this.p_identifierArray = p_identifierArray;
+// }
/** Getter for property p_modifier.
* @return Value of property p_modifier.
@@ -991,16 +991,16 @@
/** Getter for property p_type.
* @return Value of property p_type.
*/
- public org.openide.src.Type getP_type() {
- return this.p_type;
- }
+// public org.openide.src.Type getP_type() {
+// return this.p_type;
+// }
/** Setter for property p_type.
* @param p_type New value of property p_type.
*/
- public void setP_type(org.openide.src.Type p_type) {
- this.p_type = p_type;
- }
+// public void setP_type(org.openide.src.Type p_type) {
+// this.p_type = p_type;
+// }
/** Getter for property p_dataFolder.
* @return Value of property p_dataFolder.
Index: core/test/qa-functional/src/gui/propertyeditors/utilities/CoreSupport.java
===================================================================
RCS file: /cvs/core/test/qa-functional/src/gui/propertyeditors/utilities/CoreSupport.java,v
--- core/test/qa-functional/src/gui/propertyeditors/utilities/CoreSupport.java 5 Aug 2002 16:47:21 -0000 1.3
+++ core/test/qa-functional/src/gui/propertyeditors/utilities/CoreSupport.java 16 Oct 2002 04:50:08 -0000
@@ -32,7 +32,7 @@
// ide imports
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
-import org.openide.TopManager;
+import org.openide.filesystems.Repository;
/** Utilities for core tests. From this class extends supports for each testsuite.
*
@@ -53,7 +53,7 @@
* @return finded file object or null
*/
public static FileObject findFileObject(String _package, String _name, String _extension) {
- FileObject f = TopManager.getDefault().getRepository().find(_package, _name, _extension);
+ FileObject f = Repository.getDefault().find(_package, _name, _extension);
return f;
}
Index: core/test/qa-functional/src/gui/windowsystem/utilities/WindowSystemSupport.java
===================================================================
RCS file: /cvs/core/test/qa-functional/src/gui/windowsystem/utilities/WindowSystemSupport.java,v
--- core/test/qa-functional/src/gui/windowsystem/utilities/WindowSystemSupport.java 8 Aug 2002 20:14:44 -0000 1.3
+++ core/test/qa-functional/src/gui/windowsystem/utilities/WindowSystemSupport.java 16 Oct 2002 04:50:08 -0000
@@ -31,7 +31,7 @@
// ide imports
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
-import org.openide.TopManager;
+import org.openide.filesystems.Repository;
/** Utilities for Window System tests. From this class extends supports for each testsuite.
*
@@ -52,7 +52,7 @@
* @return finded file object or null
*/
public static FileObject findFileObject(String _package, String _name, String _extension) {
- FileObject f = TopManager.getDefault().getRepository().find(_package, _name, _extension);
+ FileObject f = Repository.getDefault().find(_package, _name, _extension);
return f;
}
Index: core/test/qa-functional/src/gui/windowsystem/ws_lib/WSManager.java
===================================================================
RCS file: /cvs/core/test/qa-functional/src/gui/windowsystem/ws_lib/WSManager.java,v
--- core/test/qa-functional/src/gui/windowsystem/ws_lib/WSManager.java 8 Aug 2002 20:14:48 -0000 1.6
+++ core/test/qa-functional/src/gui/windowsystem/ws_lib/WSManager.java 16 Oct 2002 04:50:08 -0000
@@ -51,6 +51,8 @@
import org.netbeans.jemmy.operators.JFrameOperator;
import org.netbeans.jemmy.operators.JTabbedPaneOperator;
+import org.openide.windows.WindowManager;
+
/**
*
@@ -468,7 +470,7 @@
if(frame.getSource() instanceof JInternalFrame){
JInternalFrameOperator internalOp = getJInternalFrameOperator(windowTitle);
- WorkspaceImpl workspace =(WorkspaceImpl)((WindowManagerImpl)org.netbeans.core.NbTopManager.get().getWindowManager()).getCurrentWorkspace();
+ WorkspaceImpl workspace =(WorkspaceImpl)WindowManager.getDefault().getCurrentWorkspace();
String dominant = ((org.netbeans.core.windows.frames.PerimeterLayout) workspace.desktopPane().getLayout()).getDominant();
if("SOUTH".equals(dominant)) dominant = "Bottom";
if("NORTH".equals(dominant)) dominant = "Top";
@@ -502,7 +504,7 @@
public String whereIsAtached(JInternalFrameOperator internalOp) {
if(internalOp != null) {
- Set modes = ((WorkspaceImpl)((WindowManagerImpl)org.netbeans.core.NbTopManager.get().getWindowManager()).getCurrentWorkspace()).getModes();
+ Set modes = ((WorkspaceImpl)WindowManager.getDefault().getCurrentWorkspace()).getModes();
Iterator it = modes.iterator();
while(it.hasNext()) {
Index: core/test/unit/src/org/netbeans/core/AutomountSupportTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/AutomountSupportTest.java,v
--- core/test/unit/src/org/netbeans/core/AutomountSupportTest.java 7 Mar 2002 12:28:56 -0000 1.3
+++ core/test/unit/src/org/netbeans/core/AutomountSupportTest.java 16 Oct 2002 04:50:08 -0000
@@ -15,7 +15,6 @@
import junit.framework.*;
import junit.textui.TestRunner;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.nodes.Node;
import org.openide.loaders.DataObject;
@@ -25,6 +24,8 @@
import org.openide.filesystems.Repository;
import org.openide.cookies.InstanceCookie;
import org.openide.loaders.InstanceDataObject;
+import org.openide.modules.ModuleInfo;
+import org.openide.util.Lookup;
import org.openide.util.Task;
/** Test Plain top manager. Must be run externally.
@@ -49,7 +50,9 @@
/**/
protected void setUp() throws Exception {
- FileObject fo = TopManager.getDefault ().getRepository ().findResource ("Mount"); // NOI18N
+ Lookup.getDefault().lookup(ModuleInfo.class);
+
+ FileObject fo = Repository.getDefault().findResource ("Mount"); // NOI18N
mount = DataFolder.findFolder (fo);
DataObject[] arr = mount.getChildren ();
Index: core/test/unit/src/org/netbeans/core/PlainTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/PlainTest.java,v
--- core/test/unit/src/org/netbeans/core/PlainTest.java 25 Sep 2002 11:43:33 -0000 1.9
+++ core/test/unit/src/org/netbeans/core/PlainTest.java 16 Oct 2002 04:50:08 -0000
@@ -16,8 +16,8 @@
import junit.framework.AssertionFailedError;
import junit.textui.TestRunner;
import org.netbeans.junit.*;
-import org.openide.TopManager;
import org.openide.filesystems.FileSystem;
+import org.openide.filesystems.Repository;
import org.openide.nodes.Node;
import org.openide.loaders.DataObject;
import java.util.Enumeration;
@@ -30,6 +30,7 @@
import java.awt.Frame;
import java.awt.Dialog;
import javax.swing.SwingUtilities;
+import org.netbeans.core.NbTopManager;
/** Test Plain top manager. Must be run externally.
* @author Jesse Glick
@@ -47,7 +48,7 @@
}
public void testStartPlain() throws Exception {
- assertTrue("Default TopManager is Plain", TopManager.getDefault() instanceof Plain);
+ assertTrue("Default TopManager is Plain", NbTopManager.get() instanceof Plain);
// That's all folks!
}
@@ -59,9 +60,9 @@
public void testPlainShowsNoGUI() throws Exception {
EnsureNoWindowsOpened l = new EnsureNoWindowsOpened();
l.test("Initially");
- TopManager tm = TopManager.getDefault();
+ NbTopManager tm = NbTopManager.get();
l.test("After getting TopManager");
- FileSystem sfs = tm.getRepository().getDefaultFileSystem();
+ FileSystem sfs = Repository.getDefault().getDefaultFileSystem();
DataFolder top = DataFolder.findFolder(sfs.getRoot());
Enumeration e = top.children(true);
while (e.hasMoreElements()) {
Index: core/test/unit/src/org/netbeans/core/lookup/LookupClassLoaderTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/LookupClassLoaderTest.java,v
--- core/test/unit/src/org/netbeans/core/lookup/LookupClassLoaderTest.java 14 Aug 2002 18:38:11 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/lookup/LookupClassLoaderTest.java 16 Oct 2002 04:50:08 -0000
@@ -23,7 +23,7 @@
import org.netbeans.core.modules.Module;
import org.netbeans.core.modules.ModuleHistory;
import org.netbeans.core.modules.ModuleManager;
-import org.openide.TopManager;
+import org.openide.ServiceType;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
@@ -50,7 +50,6 @@
private Module m;
protected void setUp() throws Exception {
clearWorkDir();
- TopManager.getDefault();
mgr = NbTopManager.get().getModuleSystem().getManager();
try {
mgr.mutex().writeAccess(new Mutex.ExceptionAction() {
@@ -108,19 +107,22 @@
* than once (XTest bug I suppose).
*/
public void testClassLoaderLookup() throws Exception {
+ ClassLoader systemClassLoader = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+ assertNotNull(systemClassLoader);
try {
- TopManager.getDefault().systemClassLoader().loadClass("ims.Foo");
+ systemClassLoader.loadClass("ims.Foo");
fail("Should not have been able to load ims.Foo");
} catch (ClassNotFoundException cnfe) {
// Good.
}
- assertNotNull(Lookup.getDefault().lookup(ClassLoader.class));
- assertEquals(TopManager.getDefault().systemClassLoader(), Lookup.getDefault().lookup(ClassLoader.class));
twiddle(m, TWIDDLE_ENABLE);
- assertEquals(TopManager.getDefault().systemClassLoader(), Lookup.getDefault().lookup(ClassLoader.class));
- Class clazz = TopManager.getDefault().systemClassLoader().loadClass("ims.Foo");
- System.err.println("Service types: " + TopManager.getDefault().getServices().getServiceTypes());//XXX
- assertNotNull("Services registry has foo", TopManager.getDefault().getServices().find("foo"));
+ systemClassLoader = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+ Class clazz = systemClassLoader.loadClass("ims.Foo");
+
+ ServiceType.Registry sReg = (ServiceType.Registry)Lookup.getDefault().lookup(ServiceType.Registry.class);
+ System.err.println("Service types: " + sReg.getServiceTypes());//XXX
+ assertNotNull("Services registry has foo", sReg.find("foo"));
+
Object service = Lookup.getDefault().lookup(clazz);
// does not help: Thread.sleep(5000);
assertNotNull("Installed service section for ims.Foo", service);
@@ -140,10 +142,11 @@
twiddle(m, TWIDDLE_DISABLE);
assertTrue(l.gotSomething());
Thread.sleep(1000); // XXX module sys fires changes asynch!
- assertEquals("Lookup gives correct degraded classloader after disable module (NOTE: might fail on a loaded/slow CPU)", TopManager.getDefault().systemClassLoader(), Lookup.getDefault().lookup(ClassLoader.class));
- assertEquals(TopManager.getDefault().systemClassLoader(), r.allInstances().iterator().next());
+
+ systemClassLoader = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+ assertEquals(systemClassLoader, r.allInstances().iterator().next());
try {
- TopManager.getDefault().systemClassLoader().loadClass("ims.Foo");
+ systemClassLoader.loadClass("ims.Foo");
fail("Should no longer have been able to load ims.Foo");
} catch (ClassNotFoundException cnfe) {
// Good.
Index: core/test/unit/src/org/netbeans/core/lookup/MetaInfServicesTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/MetaInfServicesTest.java,v
--- core/test/unit/src/org/netbeans/core/lookup/MetaInfServicesTest.java 23 Aug 2002 01:41:57 -0000 1.4
+++ core/test/unit/src/org/netbeans/core/lookup/MetaInfServicesTest.java 16 Oct 2002 04:50:08 -0000
@@ -17,7 +17,6 @@
import junit.textui.TestRunner;
import org.netbeans.core.NbTopManager;
import org.netbeans.core.modules.*;
-import org.openide.TopManager;
import org.openide.util.*;
import java.io.File;
import java.util.*;
@@ -54,7 +53,6 @@
//Thread.dumpStack();
clearWorkDir();
// Load Plain.
- TopManager.getDefault();
// Make a couple of modules.
mgr = NbTopManager.get().getModuleSystem().getManager();
try {
@@ -119,7 +117,8 @@
*/
public void testEverything() throws Exception {
twiddle(m1, TWIDDLE_ENABLE);
- Class xface = TopManager.getDefault().systemClassLoader().loadClass("org.foo.Interface");
+ ClassLoader systemClassLoader = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+ Class xface = systemClassLoader.loadClass("org.foo.Interface");
Lookup.Result r = Lookup.getDefault().lookup(new Lookup.Template(xface));
List instances = new ArrayList(r.allInstances());
// Expect to get Impl1 from first JAR.
@@ -155,7 +154,8 @@
// not really important: assertTrue(!l.gotSomething());
instances = new ArrayList(r.allInstances());
assertEquals(0, instances.size());
- Class xface2 = TopManager.getDefault().systemClassLoader().loadClass("org.foo.Interface");
+ systemClassLoader = (ClassLoader)Lookup.getDefault().lookup(ClassLoader.class);
+ Class xface2 = systemClassLoader.loadClass("org.foo.Interface");
assertTrue(xface != xface2);
Lookup.Result r2 = Lookup.getDefault().lookup(new Lookup.Template(xface2));
instances = new ArrayList(r2.allInstances());
Index: core/test/unit/src/org/netbeans/core/lookup/data/install-manifest-service.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/data/install-manifest-service.mf,v
--- core/test/unit/src/org/netbeans/core/lookup/data/install-manifest-service.mf 14 Aug 2002 18:38:12 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/lookup/data/install-manifest-service.mf 16 Oct 2002 04:50:08 -0000
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: ims
OpenIDE-Module-Name: Install Manifest Service Section
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Name: ims/Foo.class
OpenIDE-Module-Class: Service
Index: core/test/unit/src/org/netbeans/core/lookup/data/services-jar-1.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/data/services-jar-1.mf,v
--- core/test/unit/src/org/netbeans/core/lookup/data/services-jar-1.mf 5 Feb 2002 12:34:30 -0000 1.2
+++ core/test/unit/src/org/netbeans/core/lookup/data/services-jar-1.mf 16 Oct 2002 04:50:08 -0000
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.foo
OpenIDE-Module-Name: Interface & Impl #1
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/lookup/data/services-jar-2.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/data/services-jar-2.mf,v
--- core/test/unit/src/org/netbeans/core/lookup/data/services-jar-2.mf 5 Feb 2002 12:34:30 -0000 1.2
+++ core/test/unit/src/org/netbeans/core/lookup/data/services-jar-2.mf 16 Oct 2002 04:50:08 -0000
@@ -2,5 +2,5 @@
OpenIDE-Module: org.bar
OpenIDE-Module-Name: Impl #2
OpenIDE-Module-Module-Dependencies: org.foo
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/lookup/data/test1.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/data/test1.mf,v
--- core/test/unit/src/org/netbeans/core/lookup/data/test1.mf 23 Jan 2002 19:51:47 -0000 1.2
+++ core/test/unit/src/org/netbeans/core/lookup/data/test1.mf 16 Oct 2002 04:50:08 -0000
@@ -2,5 +2,5 @@
OpenIDE-Module: test1
OpenIDE-Module-Layer: test1/layer-with-ido.xml
OpenIDE-Module-Name: IDOM test1
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/lookup/data/test2.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/lookup/data/test2.mf,v
--- core/test/unit/src/org/netbeans/core/lookup/data/test2.mf 23 Jan 2002 19:51:47 -0000 1.2
+++ core/test/unit/src/org/netbeans/core/lookup/data/test2.mf 16 Oct 2002 04:50:08 -0000
@@ -2,5 +2,5 @@
OpenIDE-Module: test2
OpenIDE-Module-Layer: test2/layer-with-settings.xml
OpenIDE-Module-Name: IDOM test2
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/modules/ModuleManagerTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/ModuleManagerTest.java,v
--- core/test/unit/src/org/netbeans/core/modules/ModuleManagerTest.java 8 Oct 2002 20:18:40 -0000 1.22
+++ core/test/unit/src/org/netbeans/core/modules/ModuleManagerTest.java 16 Oct 2002 04:50:08 -0000
@@ -62,7 +62,7 @@
protected void setUp() throws Exception {
super.setUp();
System.setProperty("org.openide.major.version", "IDE/1");
- System.setProperty("org.openide.specification.version", "3.12");
+ System.setProperty("org.openide.specification.version", "3.14");
}
/** Load simple-module and depends-on-simple-module.
Index: core/test/unit/src/org/netbeans/core/modules/NbInstallerTest2.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/NbInstallerTest2.java,v
--- core/test/unit/src/org/netbeans/core/modules/NbInstallerTest2.java 20 Aug 2002 19:51:05 -0000 1.2
+++ core/test/unit/src/org/netbeans/core/modules/NbInstallerTest2.java 16 Oct 2002 04:50:08 -0000
@@ -18,8 +18,8 @@
import java.util.Locale;
import org.netbeans.junit.*;
import junit.textui.TestRunner;
-import org.openide.TopManager;
import org.openide.filesystems.Repository;
+import org.netbeans.core.NbTopManager;
/** Test the NetBeans module installer implementation.
* Broken into pieces to ensure each runs in its own VM.
@@ -35,9 +35,15 @@
TestRunner.run(new NbTestSuite(NbInstallerTest2.class));
}
+ protected void setUp() throws Exception {
+ super.setUp();
+ System.setProperty("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_DEPS_JH", "true");
+ System.setProperty("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_DEPS_DEPRECATED", "true");
+ }
+
/** Test #21173/#23595: overriding layers by localization. */
public void testLocLayerOverrides() throws Exception {
- TopManager.getDefault(); // init module system
+ NbTopManager.get(); // init module system
final FakeEvents ev = new FakeEvents();
ModuleInstaller installer = new NbInstaller(ev);
ModuleManager mgr = new ModuleManager(installer, ev);
Index: core/test/unit/src/org/netbeans/core/modules/NbInstallerTest3.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/NbInstallerTest3.java,v
--- core/test/unit/src/org/netbeans/core/modules/NbInstallerTest3.java 20 Aug 2002 19:51:05 -0000 1.2
+++ core/test/unit/src/org/netbeans/core/modules/NbInstallerTest3.java 16 Oct 2002 04:50:08 -0000
@@ -17,8 +17,8 @@
import java.util.Collections;
import org.netbeans.junit.*;
import junit.textui.TestRunner;
-import org.openide.TopManager;
import org.openide.util.NbBundle;
+import org.netbeans.core.NbTopManager;
/** Test the NetBeans module installer implementation.
* Broken into pieces to ensure each runs in its own VM.
@@ -36,7 +36,7 @@
/** Test #21173/#23595: overriding layers by branding. */
public void testBrandingLayerOverrides() throws Exception {
- TopManager.getDefault(); // init module system
+ NbTopManager.get(); // init module system
final FakeEvents ev = new FakeEvents();
ModuleInstaller installer = new NbInstaller(ev);
ModuleManager mgr = new ModuleManager(installer, ev);
Index: core/test/unit/src/org/netbeans/core/modules/NbInstallerTest4.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/NbInstallerTest4.java,v
--- core/test/unit/src/org/netbeans/core/modules/NbInstallerTest4.java 8 Oct 2002 20:18:41 -0000 1.4
+++ core/test/unit/src/org/netbeans/core/modules/NbInstallerTest4.java 16 Oct 2002 04:50:08 -0000
@@ -17,7 +17,7 @@
import java.util.*;
import org.netbeans.junit.*;
import junit.textui.TestRunner;
-import org.openide.TopManager;
+import org.netbeans.core.NbTopManager;
import org.openide.filesystems.Repository;
/** Test the NetBeans module installer implementation.
@@ -52,7 +52,7 @@
* Version 1: all modules loaded together.
*/
public void testDependencyLayerOverrides1() throws Exception {
- TopManager.getDefault(); // init module system
+ NbTopManager.get(); // init module system
final FakeEvents ev = new FakeEvents();
NbInstaller installer = new NbInstaller(ev);
ModuleManager mgr = new ModuleManager(installer, ev);
Index: core/test/unit/src/org/netbeans/core/modules/NbInstallerTest5.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/NbInstallerTest5.java,v
--- core/test/unit/src/org/netbeans/core/modules/NbInstallerTest5.java 8 Oct 2002 20:18:41 -0000 1.3
+++ core/test/unit/src/org/netbeans/core/modules/NbInstallerTest5.java 16 Oct 2002 04:50:08 -0000
@@ -17,8 +17,8 @@
import java.util.Collections;
import org.netbeans.junit.*;
import junit.textui.TestRunner;
-import org.openide.TopManager;
import org.openide.filesystems.Repository;
+import org.netbeans.core.NbTopManager;
/** Test the NetBeans module installer implementation.
* Broken into pieces to ensure each runs in its own VM.
@@ -40,7 +40,9 @@
* Exercises different logic in XMLFileSystem as well as ModuleLayeredFileSystem.
*/
public void testDependencyLayerOverrides2() throws Exception {
- TopManager.getDefault(); // init module system
+ NbTopManager.get(); // init module system
+ System.err.println("Module Info->"+org.openide.util.Lookup.getDefault()
+ .lookup(org.openide.modules.ModuleInfo.class)); // TEMP
final FakeEvents ev = new FakeEvents();
NbInstaller installer = new NbInstaller(ev);
ModuleManager mgr = new ModuleManager(installer, ev);
@@ -49,6 +51,7 @@
try {
Module m1 = mgr.create(new File(jars, "base-layer-mod.jar"), null, false, false, false);
Module m2 = mgr.create(new File(jars, "override-layer-mod.jar"), null, false, false, false);
+
assertEquals(Collections.EMPTY_SET, m2.getProblems());
assertEquals(null, slurp("foo/file1.txt"));
assertEquals(null, slurp("foo/file3.txt"));
Index: core/test/unit/src/org/netbeans/core/modules/NbInstallerTest6.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/NbInstallerTest6.java,v
--- core/test/unit/src/org/netbeans/core/modules/NbInstallerTest6.java 29 May 2002 19:31:45 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/modules/NbInstallerTest6.java 16 Oct 2002 04:50:08 -0000
@@ -20,8 +20,8 @@
import org.netbeans.core.NbTopManager;
import org.netbeans.core.Plain;
import org.netbeans.core.projects.SessionManager;
-import org.openide.TopManager;
import org.openide.filesystems.FileSystem;
+import org.openide.filesystems.Repository;
/** Test the NetBeans module installer implementation.
* Broken into pieces to ensure each runs in its own VM.
@@ -77,7 +77,6 @@
public void testInstallMaskUser() throws Exception {
try {
// Ought to load these modules:
- TopManager.getDefault();
ModuleManager mgr = NbTopManager.get().getModuleSystem().getManager();
mgr.mutexPrivileged().enterReadAccess();
try {
@@ -138,7 +137,7 @@
}
protected ModuleSystem createModuleSystem() throws IOException {
String userDir = System.getProperty("modules.dir"); // NOI18N
- FileSystem fs = getRepository().getDefaultFileSystem();
+ FileSystem fs = Repository.getDefault().getDefaultFileSystem();
return new ModuleSystem(fs, new File(home, "modules"), new File(user, "modules"));
}
}
Index: core/test/unit/src/org/netbeans/core/modules/NbInstallerTest7.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/NbInstallerTest7.java,v
--- core/test/unit/src/org/netbeans/core/modules/NbInstallerTest7.java 8 Oct 2002 20:18:42 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/modules/NbInstallerTest7.java 16 Oct 2002 04:50:08 -0000
@@ -20,7 +20,6 @@
import org.netbeans.core.NbTopManager;
import org.netbeans.core.Plain;
import org.netbeans.core.projects.SessionManager;
-import org.openide.TopManager;
import org.openide.filesystems.FileSystem;
/** Test the NetBeans module installer implementation.
@@ -48,6 +47,9 @@
protected void setUp() throws Exception {
super.setUp();
System.setProperty("netbeans.suppress.sysprop.warning", "true");
+ System.setProperty("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_DEPS_JH", "true");
+ System.setProperty("org.netbeans.core.modules.NbInstaller.NO_COMPAT_AUTO_DEPS_DEPRECATED", "true");
+ // leave NO_COMPAT_AUTO_TRANSITIVE_DEPS=false
clearWorkDir();
File workdir = getWorkDir();
File modules = new File(workdir, "modules");
@@ -71,7 +73,6 @@
*/
public void testInstallMaskUser() throws Exception {
// Ought to load these modules:
- TopManager.getDefault();
ModuleManager mgr = NbTopManager.get().getModuleSystem().getManager();
mgr.mutexPrivileged().enterReadAccess();
try {
@@ -81,15 +82,19 @@
assertNotNull(usesandexportsapi);
Module usesapidirectly = mgr.get("usesapidirectly");
assertNotNull(usesapidirectly);
+ assertEquals("uses-api-directly.jar can be enabled", Collections.EMPTY_SET, usesapidirectly.getProblems());
assertTrue(usesapidirectly.isEnabled());
Module usesapitransitively = mgr.get("usesapitrans");
assertNotNull(usesapitransitively);
+ assertEquals("uses-api-transitively.jar can be enabled", Collections.EMPTY_SET, usesapitransitively.getProblems());
assertTrue(usesapitransitively.isEnabled());
Module usesapidirectlyold = mgr.get("usesapidirectlyold");
assertNotNull(usesapidirectlyold);
+ assertEquals("uses-api-directly-old.jar can be enabled", Collections.EMPTY_SET, usesapidirectlyold.getProblems());
assertTrue(usesapidirectlyold.isEnabled());
Module usesapitransitivelyold = mgr.get("usesapitransold");
assertNotNull(usesapitransitivelyold);
+ assertEquals("uses-api-transitively-old.jar can be enabled", Collections.EMPTY_SET, usesapitransitivelyold.getProblems());
assertTrue(usesapitransitivelyold.isEnabled());
usesapidirectly.getClassLoader().loadClass("usesapitrans.UsesDirectAPI").newInstance();
usesapidirectly.getClassLoader().loadClass("usesapitrans.UsesIndirectAPI").newInstance();
Index: core/test/unit/src/org/netbeans/core/modules/SetupHid.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/SetupHid.java,v
--- core/test/unit/src/org/netbeans/core/modules/SetupHid.java 15 Sep 2002 16:45:33 -0000 1.7
+++ core/test/unit/src/org/netbeans/core/modules/SetupHid.java 16 Oct 2002 04:50:08 -0000
@@ -18,9 +18,9 @@
import java.io.*;
import java.util.*;
import java.beans.*;
-import org.openide.TopManager;
import org.openide.filesystems.*;
import org.openide.filesystems.FileSystem; // override java.io.FileSystem
+import org.netbeans.core.NbTopManager;
/** Some infrastructure for module system tests.
* @author Jesse Glick
@@ -85,7 +85,7 @@
}
protected static String slurp(String path) throws IOException {
- TopManager.getDefault(); // #26451
+ NbTopManager.get(); // #26451
FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource(path);
if (fo == null) return null;
InputStream is = fo.getInputStream();
Index: core/test/unit/src/org/netbeans/core/modules/jars/base-layer-mod.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/jars/base-layer-mod.mf,v
--- core/test/unit/src/org/netbeans/core/modules/jars/base-layer-mod.mf 24 May 2002 18:26:34 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/modules/jars/base-layer-mod.mf 16 Oct 2002 04:50:08 -0000
@@ -2,5 +2,5 @@
OpenIDE-Module: base.layer
OpenIDE-Module-Layer: baselayer/layer.xml
OpenIDE-Module-Name: Base Layer Module
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.19
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/modules/jars/override-layer-mod.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/jars/override-layer-mod.mf,v
--- core/test/unit/src/org/netbeans/core/modules/jars/override-layer-mod.mf 24 May 2002 18:26:34 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/modules/jars/override-layer-mod.mf 16 Oct 2002 04:50:08 -0000
@@ -3,5 +3,5 @@
OpenIDE-Module-Layer: overridelayer/layer.xml
OpenIDE-Module-Name: Override Layer Module
OpenIDE-Module-Module-Dependencies: base.layer
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.19
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/modules/jars/uses-and-exports-api.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/modules/jars/uses-and-exports-api.mf,v
--- core/test/unit/src/org/netbeans/core/modules/jars/uses-and-exports-api.mf 8 Oct 2002 20:18:45 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/modules/jars/uses-and-exports-api.mf 16 Oct 2002 04:50:08 -0000
@@ -2,5 +2,5 @@
OpenIDE-Module: usesandexportsapi
OpenIDE-Module-Module-Dependencies: org.netbeans.modules.foo > 1.0
OpenIDE-Module-Public-Packages: usesapi.*
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.12
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/projects/data/sfs-attr-test.mf
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/projects/data/sfs-attr-test.mf,v
--- core/test/unit/src/org/netbeans/core/projects/data/sfs-attr-test.mf 28 Feb 2002 12:40:58 -0000 1.1
+++ core/test/unit/src/org/netbeans/core/projects/data/sfs-attr-test.mf 16 Oct 2002 04:50:09 -0000
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: sfs_attr_test
OpenIDE-Module-Layer: sfs_attr_test/layer.xml
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.4
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
Index: core/test/unit/src/org/netbeans/core/windows/BugFixTests.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/windows/BugFixTests.java,v
--- core/test/unit/src/org/netbeans/core/windows/BugFixTests.java 22 Mar 2002 18:59:43 -0000 1.9
+++ core/test/unit/src/org/netbeans/core/windows/BugFixTests.java 16 Oct 2002 04:50:09 -0000
@@ -17,7 +17,6 @@
import org.netbeans.junit.*;
import org.openide.windows.*;
-import org.openide.TopManager;
import javax.swing.SwingUtilities;
import org.netbeans.core.windows.frames.WindowTypesManager;
@@ -80,7 +79,7 @@
EventQueue.invokeLater(new Runnable () {
public void run () {
try {
- WindowManager wm = TopManager.getDefault().getWindowManager();
+ WindowManager wm = WindowManager.getDefault();
Workspace editing = wm.findWorkspace("Editing");
Workspace running = wm.findWorkspace("Visual");
editing.activate();
@@ -92,7 +91,7 @@
System.out.println("Test 15299 passed.");
} catch (Exception exc) {
System.out.println("Test 15299 failed.");
- TopManager.getDefault().getErrorManager().notify(
+ ErrorManager.getDefault().notify(
ErrorManager.INFORMATIONAL, exc
);
fail(exc.toString());
@@ -126,7 +125,7 @@
CountNotifyComp innerPane = new CountNotifyComp();
DialogDescriptor dd = new DialogDescriptor(innerPane, "Test");
dd.setModal(false);
- Dialog dialog = TopManager.getDefault().createDialog(dd);
+ Dialog dialog = org.openide.DialogDisplayer.getDefault().createDialog(dd);
dialog.show();
// set some properties, shouldn't result in remove/addNotify
dd.setMessage(innerPane);
@@ -151,7 +150,7 @@
SwingUtilities.invokeLater(new Runnable() {
public void run () {
try {
- WindowManager wm = TopManager.getDefault().getWindowManager();
+ WindowManager wm = WindowManager.getDefault();
Workspace editing = wm.findWorkspace("Editing");
Workspace running = wm.createWorkspace("testworkspace");
running.activate();
@@ -195,7 +194,7 @@
public void testBugfix_14585() {
System.out.println("Bugfix test 14585 started.");
- Workspace workspace = TopManager.getDefault().getWindowManager().getCurrentWorkspace();
+ Workspace workspace = WindowManager.getDefault().getCurrentWorkspace();
//opens the global property window
TopComponent c = org.netbeans.core.NbNodeOperation.Sheet.getDefault ();
@@ -265,7 +264,7 @@
/** Issue 20318 - checks if multiple setRelativeBounds calls on different
* frame types doesn't corrupt bounds */
public void testBugfix_20318 () throws Exception {
- WindowManager wm = TopManager.getDefault().getWindowManager();
+ WindowManager wm = WindowManager.getDefault();
Workspace editing = wm.findWorkspace("Editing");
ModeImpl mode = (ModeImpl)editing.createMode("TestMode20318", "Test Mode 20318", null);
mode.setFrameType(WindowTypesManager.TOP_FRAME);
Index: core/test/unit/src/org/netbeans/core/windows/layers/ModeDataTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/core/windows/layers/ModeDataTest.java,v
--- core/test/unit/src/org/netbeans/core/windows/layers/ModeDataTest.java 3 Jul 2002 15:46:05 -0000 1.8
+++ core/test/unit/src/org/netbeans/core/windows/layers/ModeDataTest.java 16 Oct 2002 04:50:09 -0000
@@ -194,7 +194,7 @@
public void testExplorerWrite () throws Exception {
log("Simple write test, writes content of explorer mode.");
- Workspace w = TopManager.getDefault().getWindowManager().findWorkspace("Editing");
+ Workspace w = WindowManager.getDefault().findWorkspace("Editing");
ModeImpl mi = (ModeImpl) w.findMode("properties");
if (mi == null) {
fail ("Mode properties doesn't exist.");
Index: core/ui/manifest.mf
===================================================================
RCS file: /cvs/core/ui/manifest.mf,v
--- core/ui/manifest.mf 2 Aug 2002 18:50:54 -0000 1.4
+++ core/ui/manifest.mf 16 Oct 2002 04:50:09 -0000
@@ -2,7 +2,7 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/ui/resources/Bundle.properties
OpenIDE-Module-Specification-Version: 1.1
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
OpenIDE-Module-Module-Dependencies: org.netbeans.core.windows/1 > 1.0
OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
Index: core/ui/src/org/netbeans/core/ui/resources/layer.xml
===================================================================
RCS file: /cvs/core/ui/src/org/netbeans/core/ui/resources/layer.xml,v
--- core/ui/src/org/netbeans/core/ui/resources/layer.xml 29 Sep 2002 14:47:35 -0000 1.24
+++ core/ui/src/org/netbeans/core/ui/resources/layer.xml 16 Oct 2002 04:50:09 -0000
@@ -514,10 +514,6 @@
-
+
+ The deprecated classes continue to be available in the module
+ org.openide.deprecated which you may depend on it you
+ cannot remove uses of the deprecated APIs. In order for
+ TopManager.getDefault() to work, you must also require the
+ token org.openide.TopManager, which is provided by an
+ unspecified module. The deprecated API module and its implementation
+ module are autoloads, meaning they will not be loaded unless some
+ module still requires them.
+
+ Similarly, the Java Hierarchy API was moved to the module
+ org.openide.src which you should depend on in order to use
+ this API.
+
+ For compatibility, the above three dependencies are added to your module + automatically in case it either requests no specific API + version at all, or requests an API version prior to 3.14. Modules + requesting APIs 3.14 or higher must declare these dependencies + explicitly if they in fact need them. +
++ Many classes were moved to a separate module, + openide-deprecated.jar, not available to modules by + default. Uses of these classes in modules should be cleaned up whenever + possible. +
+
+ Additionally, the entire contents of org.openide.src.* and
+ org.openide.src.nodes.*, as well as
+ org.openide.cookies.SourceCookie and some associated
+ property editors, were moved to a separate module.
+
+ The most common apparent symptom for module authors will be the absence
+ of TopManager. Most methods in this class have been
+ replaced by newer utility classes in a straightforward manner. See the
+ Upgrade Guide.
+
org.openide.explorer.propertysheet.editors package is deprecated
The entire
org.openide.explorer.propertysheet.editors
package is
generally deprecated
and no longer included in Javadoc.
+
+ As of 3.14, this package is again included in the Javadoc, though only + only a few interfaces remain, and of these several are in fact + deprecated, and the rest will probably be deprecated at some point. +
+ In some cases, old modules (as determined by their declared dependency on + the Open APIs specification version, if any) are also given automatic + dependencies on newly split-off API modules. When building from source, + you will need to change your classpath, but precompiled JARs should run + as before.