1.1 --- a/vcs.advanced/build.xml Thu Feb 20 15:57:01 2003 +0000
1.2 +++ b/vcs.advanced/build.xml Thu Feb 20 16:29:19 2003 +0000
1.3 @@ -42,7 +42,6 @@
1.4 <classpath>
1.5 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
1.6 <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
1.7 - <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
1.8 <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
1.9 <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
1.10 <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
2.1 --- a/vcs.advanced/manifest.mf Thu Feb 20 15:57:01 2003 +0000
2.2 +++ b/vcs.advanced/manifest.mf Thu Feb 20 16:29:19 2003 +0000
2.3 @@ -3,8 +3,7 @@
2.4 OpenIDE-Module-Specification-Version: 1.8
2.5 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
2.6 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
2.7 -OpenIDE-Module-Module-Dependencies: org.netbeans.modules.vcscore/1 > 1.8,org.netbeans.modules.diff/1 > 1.4, org.openide.deprecated > 1.0
2.8 -OpenIDE-Module-Requires: org.openide.TopManager
2.9 +OpenIDE-Module-Module-Dependencies: org.netbeans.modules.vcscore/1 > 1.8,org.netbeans.modules.diff/1 > 1.4
2.10 OpenIDE-Module-Layer: org/netbeans/modules/vcs/advanced/config/mf-layer.xml
2.11 OpenIDE-Module-Package-Dependencies: org.apache.regexp[RE]
2.12
3.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystem.java Thu Feb 20 15:57:01 2003 +0000
3.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystem.java Thu Feb 20 16:29:19 2003 +0000
3.3 @@ -58,6 +58,7 @@
3.4 import org.netbeans.modules.vcs.advanced.variables.VariableIO;
3.5 import org.netbeans.modules.vcs.advanced.variables.VariableIOCompat;
3.6 import org.netbeans.modules.vcs.advanced.projectsettings.CommandLineVcsFileSystemInstance;
3.7 +import org.openide.DialogDisplayer;
3.8
3.9 /** Generic command line VCS filesystem.
3.10 *
3.11 @@ -359,12 +360,12 @@
3.12 }
3.13
3.14 private void setConfigFO() {
3.15 - FileSystem dfs = TopManager.getDefault ().getRepository ().getDefaultFileSystem ();
3.16 + FileSystem dfs = org.openide.filesystems.Repository.getDefault().getDefaultFileSystem ();
3.17 FileObject fo = dfs.findResource(CONFIG_ROOT);
3.18 if (fo == null) {
3.19 javax.swing.SwingUtilities.invokeLater(new Runnable () {
3.20 public void run () {
3.21 - TopManager.getDefault ().notify (new NotifyDescriptor.Message (CommandLineVcsFileSystem.this.clg("DLG_ConfigurationPathNotFound", CONFIG_ROOT)));
3.22 + DialogDisplayer.getDefault ().notify (new NotifyDescriptor.Message (CommandLineVcsFileSystem.this.clg("DLG_ConfigurationPathNotFound", CONFIG_ROOT)));
3.23 }
3.24 });
3.25 }
3.26 @@ -443,7 +444,7 @@
3.27 do {
3.28 cacheId = 10000 * (1 + Math.round (Math.random () * 8)) + Math.round (Math.random () * 1000);
3.29 } while (new File(cacheRoot+File.separator+cacheId).isDirectory ());
3.30 - FileSystem dfs = TopManager.getDefault ().getRepository ().getDefaultFileSystem ();
3.31 + FileSystem dfs = org.openide.filesystems.Repository.getDefault().getDefaultFileSystem ();
3.32 FileObject vcs = dfs.findResource("vcs");
3.33 try {
3.34 if (vcs == null) {
3.35 @@ -603,7 +604,7 @@
3.36 line--;
3.37 }
3.38 } catch (javax.swing.text.BadLocationException exc) {
3.39 - org.openide.TopManager.getDefault().notifyException(exc);
3.40 + org.openide.ErrorManager.getDefault().notify(exc);
3.41 }
3.42 }
3.43 }
3.44 @@ -715,14 +716,14 @@
3.45 if (iconResources[i].length() == 0) continue;
3.46 FileObject resourceFile = defaultFS.findResource(iconResources[i]);
3.47 if (resourceFile == null) {
3.48 - TopManager.getDefault().notify(new NotifyDescriptor.Message(
3.49 + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
3.50 NbBundle.getMessage(CommandLineVcsFileSystem.class, "MSG_CanNotFindIconResource", iconResources[i])));
3.51 continue;
3.52 }
3.53 try {
3.54 statusInfos[i].setIcon(new javax.swing.ImageIcon(resourceFile.getURL()).getImage());
3.55 } catch (FileStateInvalidException exc) {
3.56 - TopManager.getDefault().notify(new NotifyDescriptor.Message(
3.57 + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
3.58 NbBundle.getMessage(CommandLineVcsFileSystem.class, "MSG_InvalidFileIconResource", iconResources[i])));
3.59 continue;
3.60 }
3.61 @@ -893,7 +894,7 @@
3.62 order = Integer.parseInt(removeWhat[1]);
3.63 order--;
3.64 } catch (NumberFormatException exc) {
3.65 - org.openide.TopManager.getDefault().notifyException(exc);
3.66 + org.openide.ErrorManager.getDefault().notify(exc);
3.67 continue;
3.68 }
3.69 CommandLineVcsFileSystem.DocCleanupRemoveItem item = new CommandLineVcsFileSystem.DocCleanupRemoveItem(removeWhat[0], order, removeWhat[2]);
3.70 @@ -1050,7 +1051,7 @@
3.71 try {
3.72 commands = (CommandsTree) CommandLineVcsAdvancedCustomizer.readConfig (doc, this);
3.73 } catch (org.w3c.dom.DOMException exc) {
3.74 - org.openide.TopManager.getDefault().notifyException(exc);
3.75 + org.openide.ErrorManager.getDefault().notify(exc);
3.76 }
3.77 if (commands == null) {
3.78 commands = tryToFindDefaultCommands();
3.79 @@ -1067,7 +1068,7 @@
3.80 try {
3.81 file = CONFIG_ROOT_FO.createData(TEMPORARY_CONFIG_FILE_NAME + cacheId, VariableIO.CONFIG_FILE_EXT);
3.82 } catch (IOException ioexc) {
3.83 - TopManager.getDefault().notifyException(ioexc);
3.84 + ErrorManager.getDefault().notify(ioexc);
3.85 return ;
3.86 }
3.87 }
3.88 @@ -1099,7 +1100,7 @@
3.89 //} catch (org.w3c.dom.DOMException exc) {
3.90 // org.openide.TopManager.getDefault().notifyException(exc);
3.91 } catch (java.io.IOException ioexc) {
3.92 - org.openide.TopManager.getDefault().notifyException(ioexc);
3.93 + org.openide.ErrorManager.getDefault().notify(ioexc);
3.94 } finally {
3.95 if (lock != null) lock.releaseLock();
3.96 }
4.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystemBeanInfo.java Thu Feb 20 15:57:01 2003 +0000
4.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystemBeanInfo.java Thu Feb 20 16:29:19 2003 +0000
4.3 @@ -179,7 +179,7 @@
4.4 refreshTime.setShortDescription (bundle.getString("HINT_refreshTime"));
4.5
4.6 } catch (IntrospectionException ex) {
4.7 - org.openide.TopManager.getDefault().notifyException(ex);
4.8 + org.openide.ErrorManager.getDefault().notify(ex);
4.9 desc = null;
4.10 }
4.11 return desc;
5.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/ConfigSaveAsDialog.java Thu Feb 20 15:57:01 2003 +0000
5.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/ConfigSaveAsDialog.java Thu Feb 20 16:29:19 2003 +0000
5.3 @@ -17,7 +17,6 @@
5.4 import java.util.Arrays;
5.5 import java.util.HashMap;
5.6
5.7 -import org.openide.TopManager;
5.8 import org.openide.filesystems.*;
5.9 import java.awt.event.*;
5.10 import javax.swing.event.*;
6.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/VcsCustomizer.java Thu Feb 20 15:57:01 2003 +0000
6.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/VcsCustomizer.java Thu Feb 20 16:29:19 2003 +0000
6.3 @@ -45,6 +45,9 @@
6.4 import org.netbeans.modules.vcs.advanced.commands.UserCommandIO;
6.5 import org.netbeans.modules.vcs.advanced.variables.VariableIO;
6.6 import org.netbeans.modules.vcs.advanced.variables.VariableIOCompat;
6.7 +import org.openide.DialogDisplayer;
6.8 +import org.openide.ErrorManager;
6.9 +import org.openide.awt.HtmlBrowser;
6.10
6.11 /** Customizer
6.12 *
6.13 @@ -899,7 +902,7 @@
6.14 // Add your handling code here:
6.15 if (!updateConfigurations() && allProfilesCheckBox.isSelected()) {
6.16 NotifyDescriptor.Confirmation nd = new NotifyDescriptor.Confirmation(g("DLG_DiscardAndShowCurrentOS"), NotifyDescriptor.Confirmation.OK_CANCEL_OPTION);
6.17 - if (NotifyDescriptor.Confirmation.OK_OPTION.equals(TopManager.getDefault().notify(nd))) {
6.18 + if (NotifyDescriptor.Confirmation.OK_OPTION.equals(DialogDisplayer.getDefault().notify(nd))) {
6.19 fileSystem.setConfig(null);
6.20 promptForConfigComboChange = false;
6.21 updateConfigurations();
6.22 @@ -962,7 +965,7 @@
6.23 if (row < 0) return ;
6.24 String name = (String) envTableModel.getValueAt(row, 0);
6.25 NotifyDescriptor nd = new NotifyDescriptor.Confirmation(NbBundle.getMessage(VcsCustomizer.class, "DLG_EnvVarDeleteConfirm", name));
6.26 - if (NotifyDescriptor.OK_OPTION.equals(TopManager.getDefault().notify(nd))) {
6.27 + if (NotifyDescriptor.OK_OPTION.equals(DialogDisplayer.getDefault().notify(nd))) {
6.28 row = envTableModel.getModelRow(row);
6.29 ((javax.swing.table.DefaultTableModel) envTableModel.getModel()).removeRow(row);
6.30 Vector vars = fileSystem.getVariables();
6.31 @@ -975,7 +978,7 @@
6.32 private void insertEnvButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_insertEnvButtonActionPerformed
6.33 // Add your handling code here:
6.34 NotifyDescriptor.InputLine nd = new NotifyDescriptor.InputLine(NbBundle.getMessage(VcsCustomizer.class, "DLG_EnvVarName"), g ("DLG_EnvVarTitle"));
6.35 - if (NotifyDescriptor.OK_OPTION.equals(TopManager.getDefault().notify(nd))) {
6.36 + if (NotifyDescriptor.OK_OPTION.equals(DialogDisplayer.getDefault().notify(nd))) {
6.37 String name = (String) nd.getInputText();
6.38 if (envVariables.containsKey(name)) {
6.39 selectEnvVar(name);
6.40 @@ -1010,9 +1013,9 @@
6.41 private void linkLabelMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_linkLabelMouseReleased
6.42 // Add your handling code here:
6.43 try {
6.44 - TopManager.getDefault().showUrl(new java.net.URL(linkLabel.getText()));
6.45 + HtmlBrowser.URLDisplayer.getDefault().showURL(new java.net.URL(linkLabel.getText()));
6.46 } catch (java.net.MalformedURLException exc) {
6.47 - TopManager.getDefault().notifyException(exc);
6.48 + ErrorManager.getDefault().notify(exc);
6.49 }
6.50 }//GEN-LAST:event_linkLabelMouseReleased
6.51
6.52 @@ -1023,7 +1026,7 @@
6.53 UserCommandsPanel advancedPanel = new UserCommandsPanel(commandsEditor);
6.54 DialogDescriptor dd = new DialogDescriptor (advancedPanel, org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("TIT_CommandsEditor"));//, "Advanced Properties Editor");
6.55 dd.setHelpCtx (new HelpCtx ("VCS_CommandEditor"));
6.56 - TopManager.getDefault ().createDialog (dd).setVisible(true);
6.57 + DialogDisplayer.getDefault ().createDialog (dd).setVisible(true);
6.58 commandsEditor.setValue(advancedPanel.getPropertyValue());
6.59 if(dd.getValue ().equals (DialogDescriptor.OK_OPTION)) {
6.60 fileSystem.setCommands ((CommandsTree) commandsEditor.getValue ());
6.61 @@ -1038,7 +1041,7 @@
6.62
6.63 DialogDescriptor dd = new DialogDescriptor (variablePanel, org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("TIT_VariablesEditor"));//, "Advanced Properties Editor");
6.64 dd.setHelpCtx (new HelpCtx ("VCS_VariableEditor"));
6.65 - TopManager.getDefault ().createDialog (dd).setVisible(true);
6.66 + DialogDisplayer.getDefault ().createDialog (dd).setVisible(true);
6.67 if(dd.getValue ().equals (DialogDescriptor.OK_OPTION)) {
6.68 fileSystem.setVariables ((Vector) variablePanel.getPropertyValue());
6.69 }
6.70 @@ -1106,7 +1109,7 @@
6.71 String dir = work + File.separator + relMountTextField.getText();
6.72 RelativeMountDialog mountDlg = new RelativeMountDialog();
6.73 mountDlg.setDir(work, relMountTextField.getText());
6.74 - java.awt.Dialog dlg = TopManager.getDefault().createDialog(mountDlg);
6.75 + java.awt.Dialog dlg = DialogDisplayer.getDefault().createDialog(mountDlg);
6.76 //VcsUtilities.centerWindow (mountDlg);
6.77 //HelpCtx.setHelpIDString (dlg.getRootPane (), CvsCustomizer.class.getName ());
6.78 dlg.setVisible(true);
6.79 @@ -1196,7 +1199,7 @@
6.80 // Add your handling code here:
6.81 String label = (String) configCombo.getSelectedItem ();
6.82 NotifyDescriptor.Confirmation nd = new NotifyDescriptor.Confirmation (g("DLG_DeleteConfig", label), NotifyDescriptor.Confirmation.OK_CANCEL_OPTION);
6.83 - if (!NotifyDescriptor.Confirmation.OK_OPTION.equals (TopManager.getDefault ().notify (nd))) return;
6.84 + if (!NotifyDescriptor.Confirmation.OK_OPTION.equals (DialogDisplayer.getDefault ().notify (nd))) return;
6.85 FileObject file = fileSystem.getConfigRootFO();
6.86 if (file != null) file = file.getFileObject(cache.getProfileName(label));//(String) configNamesByLabel.get (label));
6.87 if (file != null) {
6.88 @@ -1245,13 +1248,13 @@
6.89 try {
6.90 file = dir.createData(selected, VariableIO.CONFIG_FILE_EXT);
6.91 } catch(IOException e) {
6.92 - TopManager.getDefault().notify(new NotifyDescriptor.Message(g("MSG_CanNotCreateFile", selected+"."+VariableIO.CONFIG_FILE_EXT)));
6.93 + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(g("MSG_CanNotCreateFile", selected+"."+VariableIO.CONFIG_FILE_EXT)));
6.94 //E.err("Can not create file '"+selected+"'");
6.95 return;
6.96 }
6.97 } else {
6.98 if (NotifyDescriptor.Confirmation.NO_OPTION.equals (
6.99 - TopManager.getDefault ().notify (new NotifyDescriptor.Confirmation (g("DLG_OverwriteSettings", file.getName()),
6.100 + DialogDisplayer.getDefault ().notify (new NotifyDescriptor.Confirmation (g("DLG_OverwriteSettings", file.getName()),
6.101 NotifyDescriptor.Confirmation.YES_NO_OPTION)))
6.102 ) {
6.103 return;
6.104 @@ -1316,7 +1319,7 @@
6.105 if (promptForConfigComboChange) {
6.106 String msg=g("MSG_Do_you_really_want_to_discard_current_commands",selectedLabel); // NOI18N
6.107 NotifyDescriptor nd = new NotifyDescriptor.Confirmation (msg, NotifyDescriptor.YES_NO_OPTION );
6.108 - if (TopManager.getDefault().notify( nd ).equals( NotifyDescriptor.YES_OPTION ) ) {
6.109 + if (DialogDisplayer.getDefault().notify( nd ).equals( NotifyDescriptor.YES_OPTION ) ) {
6.110 change = true;
6.111 } else {
6.112 change = false;
6.113 @@ -1533,7 +1536,7 @@
6.114 public void run() {
6.115 if (isRootNotSetDlg) {
6.116 isRootNotSetDlg = false;
6.117 - TopManager.getDefault().notify(new NotifyDescriptor.Message(org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("VcsCustomizer.canNotChangeWD")));
6.118 + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("VcsCustomizer.canNotChangeWD")));
6.119 isRootNotSetDlg = true;
6.120 }
6.121 }
6.122 @@ -1680,7 +1683,7 @@
6.123 try {
6.124 configInputDescriptor = VariableInputDescriptor.parseItems(configInputDescriptorStr);
6.125 } catch (VariableInputFormatException vifex) {
6.126 - TopManager.getDefault().getErrorManager().notify(vifex);//TopManager.getDefault().getErrorManager().annotate(vifex, "
6.127 + ErrorManager.getDefault().notify(vifex);//TopManager.getDefault().getErrorManager().annotate(vifex, "
6.128 }
6.129 }
6.130 if (configInputDescriptor != null) {
6.131 @@ -2260,7 +2263,7 @@
6.132 public void run() {
6.133 if (isRootNotSetDlg) {
6.134 isRootNotSetDlg = false;
6.135 - TopManager.getDefault().notify(new NotifyDescriptor.Message(org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("VcsCustomizer.canNotChangeWD")));
6.136 + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("VcsCustomizer.canNotChangeWD")));
6.137 isRootNotSetDlg = true;
6.138 }
6.139 }
6.140 @@ -2276,7 +2279,7 @@
6.141 public void run() {
6.142 if (isRootNotSetDlg) {
6.143 isRootNotSetDlg = false;
6.144 - TopManager.getDefault().notify(new NotifyDescriptor.Message(MessageFormat.format(org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("VcsCustomizer.cannotSetDirectory"), new Object[] { badDir } )));
6.145 + DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(MessageFormat.format(org.openide.util.NbBundle.getBundle(VcsCustomizer.class).getString("VcsCustomizer.cannotSetDirectory"), new Object[] { badDir } )));
6.146 isRootNotSetDlg = true;
6.147 }
6.148 }
6.149 @@ -2347,7 +2350,7 @@
6.150 Command command;
6.151 if (supp == null || !((command = supp.createCommand()) instanceof VcsDescribedCommand)) {
6.152 NotifyDescriptor.Message nd = new NotifyDescriptor.Message (g("DLG_SelectorNotExist", selector.getCustomSelector()), NotifyDescriptor.WARNING_MESSAGE);
6.153 - TopManager.getDefault ().notify (nd);
6.154 + DialogDisplayer.getDefault ().notify (nd);
6.155 return ;
6.156 }
6.157 if (!VcsManager.getDefault().showCustomizer(command)) return ;
7.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/commands/CommandNode.java Thu Feb 20 15:57:01 2003 +0000
7.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/commands/CommandNode.java Thu Feb 20 16:29:19 2003 +0000
7.3 @@ -39,6 +39,7 @@
7.4 import org.netbeans.modules.vcscore.commands.CommandExecutorSupport;
7.5 import org.netbeans.modules.vcscore.cmdline.UserCommand;
7.6 import org.netbeans.modules.vcscore.util.Table;
7.7 +import org.openide.DialogDisplayer;
7.8
7.9 /**
7.10 * The Node representation of a VCS command.
7.11 @@ -741,7 +742,7 @@
7.12 //bundle.getString("CTL_NewCategoryTitle")
7.13 );
7.14 //input.setInputText(org.openide.util.NbBundle.getBundle(CommandNode.class).getString("CTL_NewCommandLabel"));
7.15 - if (TopManager.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
7.16 + if (DialogDisplayer.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
7.17 return;
7.18
7.19 String labelName = input.getInputText();
7.20 @@ -750,7 +751,7 @@
7.21 NotifyDescriptor.Message message = new NotifyDescriptor.Message(
7.22 org.openide.util.NbBundle.getBundle(CommandNode.class).getString("CTL_CommandNameAlreadyExists")
7.23 );
7.24 - TopManager.getDefault().notify(message);
7.25 + DialogDisplayer.getDefault().notify(message);
7.26 return ;
7.27 }
7.28 VcsCommand cmd = new UserCommand();
7.29 @@ -820,7 +821,7 @@
7.30 //bundle.getString("CTL_NewCategoryTitle")
7.31 );
7.32 //input.setInputText(org.openide.util.NbBundle.getBundle(CommandNode.class).getString("CTL_NewCommandLabel"));
7.33 - if (TopManager.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
7.34 + if (DialogDisplayer.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
7.35 return;
7.36
7.37 String labelName = input.getInputText();
7.38 @@ -829,7 +830,7 @@
7.39 NotifyDescriptor.Message message = new NotifyDescriptor.Message(
7.40 org.openide.util.NbBundle.getBundle(CommandNode.class).getString("CTL_CommandNameAlreadyExists")
7.41 );
7.42 - TopManager.getDefault().notify(message);
7.43 + DialogDisplayer.getDefault().notify(message);
7.44 return ;
7.45 }
7.46 VcsCommand cmd = new UserCommand();
8.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/commands/UserCommandIOCompat.java Thu Feb 20 15:57:01 2003 +0000
8.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/commands/UserCommandIOCompat.java Thu Feb 20 16:29:19 2003 +0000
8.3 @@ -15,15 +15,13 @@
8.4
8.5 import java.util.*;
8.6
8.7 -import org.openide.TopManager;
8.8 -//import org.openide.nodes.*;
8.9 -
8.10 import org.netbeans.modules.vcscore.VcsConfigVariable;
8.11 import org.netbeans.modules.vcscore.VcsFileSystem;
8.12 import org.netbeans.modules.vcscore.cmdline.UserCommand;
8.13 import org.netbeans.modules.vcscore.cmdline.UserCommandSupport;
8.14 import org.netbeans.modules.vcscore.commands.*;
8.15 import org.netbeans.modules.vcscore.util.VcsUtilities;
8.16 +import org.openide.ErrorManager;
8.17
8.18 /**
8.19 * This class provides input of commands from property file for compatibility
8.20 @@ -172,7 +170,7 @@
8.21 int intValue = Integer.parseInt(attrValue);
8.22 value = new Integer(intValue);
8.23 } catch (NumberFormatException exc) {
8.24 - TopManager.getDefault().notifyException(exc);
8.25 + ErrorManager.getDefault().notify(exc);
8.26 value = null;
8.27 }
8.28 } else {
9.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/projectsettings/CommandLineVcsFileSystemInstance.java Thu Feb 20 15:57:01 2003 +0000
9.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/projectsettings/CommandLineVcsFileSystemInstance.java Thu Feb 20 16:29:19 2003 +0000
9.3 @@ -37,7 +37,6 @@
9.4 import org.w3c.dom.Text;
9.5 import org.w3c.dom.DOMException;
9.6
9.7 -import org.openide.TopManager;
9.8 import org.openide.cookies.InstanceCookie;
9.9 import org.openide.filesystems.FileObject;
9.10 import org.openide.filesystems.FileLock;
9.11 @@ -60,6 +59,7 @@
9.12 import org.netbeans.modules.vcs.advanced.CommandLineVcsFileSystem;
9.13 import org.netbeans.modules.vcs.advanced.commands.UserCommandIO;
9.14 import org.netbeans.modules.vcs.advanced.variables.VariableIO;
9.15 +import org.openide.ErrorManager;
9.16
9.17 /**
9.18 *
9.19 @@ -150,7 +150,7 @@
9.20
9.21 };
9.22 } catch (java.beans.IntrospectionException iexc) {
9.23 - TopManager.getDefault().notifyException(iexc);
9.24 + ErrorManager.getDefault().notify(iexc);
9.25 if (fsProperties == null) {
9.26 fsProperties = new PropertyDescriptor[0];
9.27 }
9.28 @@ -203,16 +203,16 @@
9.29 try {
9.30 doc = dobj.getDocument();
9.31 } catch (org.xml.sax.SAXException sexc) {
9.32 - throw (java.io.IOException) TopManager.getDefault().getErrorManager().annotate(new java.io.IOException(), sexc);
9.33 + throw (java.io.IOException) ErrorManager.getDefault().annotate(new java.io.IOException(), sexc);
9.34 }
9.35 } catch (org.openide.loaders.DataObjectNotFoundException donfexc) {
9.36 - throw (java.io.IOException) TopManager.getDefault().getErrorManager().annotate(new java.io.IOException(), donfexc);
9.37 + throw (java.io.IOException) ErrorManager.getDefault().annotate(new java.io.IOException(), donfexc);
9.38 }
9.39 if (doc == null) return null;
9.40 }
9.41 readFSProperties(fs, doc);
9.42 } catch (DOMException dexc) {
9.43 - TopManager.getDefault().notifyException(dexc);
9.44 + ErrorManager.getDefault().notify(dexc);
9.45 }
9.46 fsPropertyChangeListener = new FSPropertyChangeListener(fo);
9.47 fs.addPropertyChangeListener(fsPropertyChangeListener); //WeakListener.propertyChange(fsPropertyChangeListener, fs));
9.48 @@ -266,7 +266,7 @@
9.49 try {
9.50 writeFSProperties(fs, doc);
9.51 } catch (org.w3c.dom.DOMException dExc) {
9.52 - TopManager.getDefault().notifyException(dExc);
9.53 + ErrorManager.getDefault().notify(dExc);
9.54 }
9.55 FileLock lock = fo.lock();
9.56 OutputStream out = fo.getOutputStream(lock);
9.57 @@ -527,11 +527,11 @@
9.58 //System.out.println("realValue = "+realValue+", class = "+realValue.getClass());
9.59 write.invoke(fs, new Object[] { realValue });
9.60 } catch (IllegalAccessException iaexc) {
9.61 - TopManager.getDefault().notifyException(iaexc);
9.62 + ErrorManager.getDefault().notify(iaexc);
9.63 } catch (IllegalArgumentException iarexc) {
9.64 - TopManager.getDefault().notifyException(iarexc);
9.65 + ErrorManager.getDefault().notify(iarexc);
9.66 } catch (InvocationTargetException itexc) {
9.67 - TopManager.getDefault().notifyException(itexc);
9.68 + ErrorManager.getDefault().notify(itexc);
9.69 }
9.70 }
9.71 }
9.72 @@ -550,11 +550,11 @@
9.73 try {
9.74 value = read.invoke(fs, new Object[0]);
9.75 } catch (IllegalAccessException iaexc) {
9.76 - TopManager.getDefault().notifyException(iaexc);
9.77 + ErrorManager.getDefault().notify(iaexc);
9.78 } catch (IllegalArgumentException iarexc) {
9.79 - TopManager.getDefault().notifyException(iarexc);
9.80 + ErrorManager.getDefault().notify(iarexc);
9.81 } catch (InvocationTargetException itexc) {
9.82 - TopManager.getDefault().notifyException(itexc);
9.83 + ErrorManager.getDefault().notify(itexc);
9.84 }
9.85 if (value != null) {
9.86 String valueStr = getFSPropertyValueStr(value);
9.87 @@ -730,7 +730,7 @@
9.88 try {
9.89 lock = fo.lock();
9.90 } catch (IOException ioex) {
9.91 - TopManager.getDefault().getErrorManager().notify(ioex);
9.92 + ErrorManager.getDefault().notify(ioex);
9.93 }
9.94 }
9.95 if (writeTask == null) {
9.96 @@ -779,7 +779,7 @@
9.97 });
9.98 */
9.99 } catch (java.io.IOException ioExc) {
9.100 - TopManager.getDefault().getErrorManager().notify(ioExc);
9.101 + ErrorManager.getDefault().notify(ioExc);
9.102 }
9.103 }
9.104 }, TASK_SCHEDULE_DELAY);
10.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/projectsettings/VcsEnvironmentProvider.java Thu Feb 20 15:57:01 2003 +0000
10.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/projectsettings/VcsEnvironmentProvider.java Thu Feb 20 16:29:19 2003 +0000
10.3 @@ -15,11 +15,11 @@
10.4
10.5 import java.util.Map;
10.6 import java.util.HashMap;
10.7 +import org.openide.ErrorManager;
10.8
10.9 import org.xml.sax.SAXException;
10.10 import org.w3c.dom.Document;
10.11
10.12 -import org.openide.TopManager;
10.13 import org.openide.cookies.InstanceCookie;
10.14 import org.openide.filesystems.FileObject;
10.15 import org.openide.loaders.DataObject;
10.16 @@ -85,15 +85,15 @@
10.17 try {
10.18 ic = createInstanceContent(obj);
10.19 } catch (IllegalArgumentException iaExc) {
10.20 - TopManager.getDefault().getErrorManager().notify(iaExc);
10.21 + ErrorManager.getDefault().notify(iaExc);
10.22 } catch (java.io.IOException ioExc) {
10.23 - TopManager.getDefault().getErrorManager().notify(ioExc);
10.24 + ErrorManager.getDefault().notify(ioExc);
10.25 } catch (SAXException sExc) {
10.26 - TopManager.getDefault().getErrorManager().notify(sExc);
10.27 + ErrorManager.getDefault().notify(sExc);
10.28 }
10.29 Lookup lookup = new AbstractLookup(ic);
10.30 if (lookup.lookup(InstanceCookie.class) == null) {
10.31 - TopManager.getDefault().getErrorManager().notify(new IllegalStateException()); // instance cookie required
10.32 + ErrorManager.getDefault().notify(new IllegalStateException()); // instance cookie required
10.33 }
10.34 return lookup;
10.35 }
11.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/recognizer/CommandLineFSRecognizer.java Thu Feb 20 15:57:01 2003 +0000
11.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/recognizer/CommandLineFSRecognizer.java Thu Feb 20 16:29:19 2003 +0000
11.3 @@ -74,15 +74,9 @@
11.4 try {
11.5 execClass = Class.forName(className, true, VcsUtilities.getSFSClassLoader());
11.6 //org.openide.TopManager.getDefault().currentClassLoader());
11.7 - } catch (ClassNotFoundException e) {}
11.8 - if (execClass == null) {
11.9 - try {
11.10 - execClass = Class.forName(className, true,
11.11 - org.openide.TopManager.getDefault().currentClassLoader());
11.12 - } catch (ClassNotFoundException e) {
11.13 - ErrorManager.getDefault().notify(e);
11.14 - }
11.15 - }
11.16 + } catch (ClassNotFoundException e) {
11.17 + ErrorManager.getDefault().notify(e);
11.18 + }
11.19 if (execClass != null) commandsToFillByProfileNames.put(profileName, execClass);
11.20 }
11.21
12.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/AccessoryVariableNode.java Thu Feb 20 15:57:01 2003 +0000
12.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/AccessoryVariableNode.java Thu Feb 20 16:29:19 2003 +0000
12.3 @@ -35,6 +35,7 @@
12.4
12.5 import org.netbeans.modules.vcs.advanced.VcsCustomizer;
12.6 import org.netbeans.modules.vcs.advanced.UserVariablesPanel;
12.7 +import org.openide.DialogDisplayer;
12.8
12.9 /**
12.10 *
12.11 @@ -290,7 +291,7 @@
12.12 org.openide.util.NbBundle.getBundle(AccessoryVariableNode.class).getString("CTL_NewVariableTitle")
12.13 );
12.14 //input.setInputText(org.openide.util.NbBundle.getBundle(CommandNode.class).getString("CTL_NewCommandLabel"));
12.15 - if (TopManager.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
12.16 + if (DialogDisplayer.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
12.17 return;
12.18
12.19 String labelName = input.getInputText();
13.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/BasicVariableNode.java Thu Feb 20 15:57:01 2003 +0000
13.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/BasicVariableNode.java Thu Feb 20 16:29:19 2003 +0000
13.3 @@ -28,6 +28,7 @@
13.4 import org.openide.util.datatransfer.NewType;
13.5
13.6 import org.netbeans.modules.vcscore.VcsConfigVariable;
13.7 +import org.openide.DialogDisplayer;
13.8
13.9 /**
13.10 *
13.11 @@ -436,7 +437,7 @@
13.12 org.openide.util.NbBundle.getBundle(BasicVariableNode.class).getString("CTL_NewVariableTitle")
13.13 );
13.14 //input.setInputText(org.openide.util.NbBundle.getBundle(CommandNode.class).getString("CTL_NewCommandLabel"));
13.15 - if (TopManager.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
13.16 + if (DialogDisplayer.getDefault().notify(input) != NotifyDescriptor.OK_OPTION)
13.17 return;
13.18
13.19 String labelName = input.getInputText();
14.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/VariableIO.java Thu Feb 20 15:57:01 2003 +0000
14.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/VariableIO.java Thu Feb 20 16:29:19 2003 +0000
14.3 @@ -189,7 +189,7 @@
14.4 Document doc = null;
14.5 FileObject config = configRoot.getFileObject(name);
14.6 if (config == null) {
14.7 - org.openide.TopManager.getDefault().notifyException(new FileNotFoundException("Problems while reading predefined properties.") {
14.8 + org.openide.ErrorManager.getDefault().notify(new FileNotFoundException("Problems while reading predefined properties.") {
14.9 public String getLocalizedMessage() {
14.10 return g("EXC_Problems_while_reading_predefined_properties", name);
14.11 }
14.12 @@ -206,19 +206,19 @@
14.13 //props.load(in);
14.14 //in.close();
14.15 } catch(DataObjectNotFoundException e) {
14.16 - org.openide.TopManager.getDefault().notifyException(new DataObjectNotFoundException(config) {
14.17 + org.openide.ErrorManager.getDefault().notify(new DataObjectNotFoundException(config) {
14.18 public String getLocalizedMessage() {
14.19 return g("EXC_Problems_while_reading_predefined_properties", name);
14.20 }
14.21 });
14.22 } catch(IOException e){
14.23 - org.openide.TopManager.getDefault().notifyException(new IOException("Problems while reading predefined properties.") {
14.24 + org.openide.ErrorManager.getDefault().notify(new IOException("Problems while reading predefined properties.") {
14.25 public String getLocalizedMessage() {
14.26 return g("EXC_Problems_while_reading_predefined_properties", name);
14.27 }
14.28 });
14.29 } catch (org.xml.sax.SAXException sexc) {
14.30 - org.openide.TopManager.getDefault().notifyException(new org.xml.sax.SAXException("Problems while reading predefined properties.", sexc) {
14.31 + org.openide.ErrorManager.getDefault().notify(new org.xml.sax.SAXException("Problems while reading predefined properties.", sexc) {
14.32 public String getLocalizedMessage() {
14.33 return g("EXC_Problems_while_reading_predefined_properties", name);
14.34 }
14.35 @@ -249,7 +249,7 @@
14.36 if (config == null) {
14.37 org.openide.util.RequestProcessor.postRequest(new Runnable() {
14.38 public void run() {
14.39 - org.openide.TopManager.getDefault().notifyException(new FileNotFoundException("Problems while reading predefined properties.") {
14.40 + org.openide.ErrorManager.getDefault().notify(new FileNotFoundException("Problems while reading predefined properties.") {
14.41 public String getLocalizedMessage() {
14.42 return g("EXC_Problems_while_reading_predefined_properties", name);
14.43 }
14.44 @@ -274,8 +274,8 @@
14.45 } catch (SAXException exc) {
14.46 //System.out.println(" parsing done. ("+exc.getMessage()+")");
14.47 if (!"End of label.".equals(exc.getMessage())) {
14.48 - org.openide.TopManager.getDefault().notifyException(
14.49 - org.openide.TopManager.getDefault().getErrorManager().annotate(
14.50 + org.openide.ErrorManager.getDefault().notify(
14.51 + org.openide.ErrorManager.getDefault().annotate(
14.52 exc, g("EXC_Problems_while_reading_predefined_properties", name)));
14.53 }
14.54 } catch (java.io.FileNotFoundException fnfExc) {
15.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/VariableIOCompat.java Thu Feb 20 15:57:01 2003 +0000
15.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/variables/VariableIOCompat.java Thu Feb 20 16:29:19 2003 +0000
15.3 @@ -103,7 +103,7 @@
15.4 Properties props=new Properties();
15.5 FileObject config = configRoot.getFileObject(name);
15.6 if (config == null) {
15.7 - org.openide.TopManager.getDefault().notifyException(new FileNotFoundException("Problems while reading predefined properties.") {
15.8 + org.openide.ErrorManager.getDefault().notify(new FileNotFoundException("Problems while reading predefined properties.") {
15.9 public String getLocalizedMessage() {
15.10 return g("EXC_Problems_while_reading_predefined_properties", name);
15.11 }
15.12 @@ -117,14 +117,14 @@
15.13 in.close();
15.14 }
15.15 catch(FileNotFoundException e) {
15.16 - org.openide.TopManager.getDefault().notifyException(new FileNotFoundException("Problems while reading predefined properties.") {
15.17 + org.openide.ErrorManager.getDefault().notify(new FileNotFoundException("Problems while reading predefined properties.") {
15.18 public String getLocalizedMessage() {
15.19 return g("EXC_Problems_while_reading_predefined_properties", name);
15.20 }
15.21 });
15.22 }
15.23 catch(IOException e){
15.24 - org.openide.TopManager.getDefault().notifyException(new IOException("Problems while reading predefined properties.") {
15.25 + org.openide.ErrorManager.getDefault().notify(new IOException("Problems while reading predefined properties.") {
15.26 public String getLocalizedMessage() {
15.27 return g("EXC_Problems_while_reading_predefined_properties", name);
15.28 }
16.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/profiles/commands/AbstractDiffCommand.java Thu Feb 20 15:57:01 2003 +0000
16.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/profiles/commands/AbstractDiffCommand.java Thu Feb 20 16:29:19 2003 +0000
16.3 @@ -20,7 +20,6 @@
16.4 import java.util.Hashtable;
16.5 import java.util.List;
16.6
16.7 -import org.openide.TopManager;
16.8 import org.openide.NotifyDescriptor;
16.9 import org.openide.util.Lookup;
16.10 import org.openide.util.NbBundle;
16.11 @@ -38,6 +37,7 @@
16.12 import org.netbeans.modules.vcscore.commands.VcsCommandExecutor;
16.13 import org.netbeans.modules.vcscore.util.VariableValueAdjustment;
16.14 import org.netbeans.modules.vcscore.util.VcsUtilities;
16.15 +import org.openide.DialogDisplayer;
16.16
16.17 /**
16.18 * The abstract diff command, that use a VCS diff command to get the differences.
16.19 @@ -215,7 +215,7 @@
16.20 }
16.21 if (differences.size() == 0) {
16.22 if (diffStatus == true) {
16.23 - TopManager.getDefault ().notify (new NotifyDescriptor.Message(
16.24 + DialogDisplayer.getDefault ().notify (new NotifyDescriptor.Message(
16.25 NbBundle.getMessage(AbstractDiffCommand.class, "NoDifferenceInFile", file)));
16.26 return true;
16.27 } else {
17.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/profiles/commands/SetPasswordCommand.java Thu Feb 20 15:57:01 2003 +0000
17.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/profiles/commands/SetPasswordCommand.java Thu Feb 20 16:29:19 2003 +0000
17.3 @@ -15,7 +15,6 @@
17.4
17.5 import java.util.Hashtable;
17.6
17.7 -import org.openide.TopManager;
17.8 import org.openide.NotifyDescriptor;
17.9 import org.openide.util.NbBundle;
17.10
17.11 @@ -24,6 +23,7 @@
17.12 import org.netbeans.modules.vcscore.commands.CommandOutputListener;
17.13 import org.netbeans.modules.vcscore.commands.CommandDataOutputListener;
17.14 import org.netbeans.modules.vcscore.util.NotifyDescriptorInputPassword;
17.15 +import org.openide.DialogDisplayer;
17.16
17.17 /**
17.18 * This command sets a new password to the FS password property
17.19 @@ -63,7 +63,7 @@
17.20
17.21 String passwdMsg = NbBundle.getMessage(SetPasswordCommand.class, "MSG_Password"); // NOI18N
17.22 NotifyDescriptorInputPassword nd = new NotifyDescriptorInputPassword (passwdMsg, passwdMsg);
17.23 - if (NotifyDescriptor.OK_OPTION.equals(TopManager.getDefault().notify(nd))) {
17.24 + if (NotifyDescriptor.OK_OPTION.equals(DialogDisplayer.getDefault().notify(nd))) {
17.25 fileSystem.setPassword(nd.getInputText());
17.26 }
17.27 return true;
18.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/profiles/commands/VerifyUtil.java Thu Feb 20 15:57:01 2003 +0000
18.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/profiles/commands/VerifyUtil.java Thu Feb 20 16:29:19 2003 +0000
18.3 @@ -28,7 +28,6 @@
18.4 import javax.swing.SwingUtilities;
18.5
18.6 import org.openide.DialogDescriptor;
18.7 -import org.openide.TopManager;
18.8 import org.openide.filesystems.FileObject;
18.9 import org.openide.loaders.DataObject;
18.10 import org.openide.loaders.DataObjectNotFoundException;
19.1 --- a/vcs.profiles.pvcs/build.xml Thu Feb 20 15:57:01 2003 +0000
19.2 +++ b/vcs.profiles.pvcs/build.xml Thu Feb 20 16:29:19 2003 +0000
19.3 @@ -36,7 +36,6 @@
19.4 <classpath>
19.5 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
19.6 <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
19.7 - <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
19.8 <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
19.9 <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
19.10 <pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
20.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsGetWithQuestions.java Thu Feb 20 15:57:01 2003 +0000
20.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsGetWithQuestions.java Thu Feb 20 16:29:19 2003 +0000
20.3 @@ -16,7 +16,6 @@
20.4 import java.io.File;
20.5 import java.util.Hashtable;
20.6
20.7 -import org.openide.TopManager;
20.8 import org.openide.NotifyDescriptor;
20.9
20.10 import org.netbeans.modules.vcscore.VcsFileSystem;
20.11 @@ -24,6 +23,7 @@
20.12 import org.netbeans.modules.vcscore.commands.*;
20.13 import org.netbeans.modules.vcscore.cmdline.VcsAdditionalCommand;
20.14 import org.netbeans.modules.vcscore.caching.FileStatusProvider;
20.15 +import org.openide.DialogDisplayer;
20.16
20.17 /**
20.18 * Find whether a writable copy exists before get command
20.19 @@ -88,7 +88,7 @@
20.20 File filePath = new File(dir);
20.21 if (filePath.canWrite()) {
20.22 System.out.println("");
20.23 - Object confirmation = TopManager.getDefault().notify(
20.24 + Object confirmation = DialogDisplayer.getDefault().notify(
20.25 new NotifyDescriptor.Confirmation(org.openide.util.NbBundle.getMessage(
20.26 PvcsGetWithQuestions.class, "Get_Writable_Confirmation", file)));
20.27 if (!NotifyDescriptor.OK_OPTION.equals(confirmation)) {
20.28 @@ -106,7 +106,7 @@
20.29 if (statusProvider != null) {
20.30 String locker = statusProvider.getFileLocker(path);
20.31 if (locker != null && locker.length() > 0) {
20.32 - Object confirmation = TopManager.getDefault().notify(
20.33 + Object confirmation = DialogDisplayer.getDefault().notify(
20.34 new NotifyDescriptor.Confirmation(org.openide.util.NbBundle.getMessage(
20.35 PvcsGetWithQuestions.class, "Get_Lock_Confirmation", file, locker)));
20.36 if (!NotifyDescriptor.OK_OPTION.equals(confirmation)) {
21.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsProjectDatabaseSelector.java Thu Feb 20 15:57:01 2003 +0000
21.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsProjectDatabaseSelector.java Thu Feb 20 16:29:19 2003 +0000
21.3 @@ -17,12 +17,12 @@
21.4
21.5 import org.openide.DialogDescriptor;
21.6 import org.openide.NotifyDescriptor;
21.7 -import org.openide.TopManager;
21.8 import org.openide.util.HelpCtx;
21.9
21.10 import org.netbeans.modules.vcscore.VcsFileSystem;
21.11 import org.netbeans.modules.vcscore.commands.*;
21.12 import org.netbeans.modules.vcscore.cmdline.VcsAdditionalCommand;
21.13 +import org.openide.DialogDisplayer;
21.14
21.15 /**
21.16 * A selector of a PVCS project database.
21.17 @@ -60,7 +60,7 @@
21.18 CommandDataOutputListener stdoutListener, String dataRegex,
21.19 CommandDataOutputListener stderrListener, String errorRegex) {
21.20 PvcsDatabaseSelectorPanel panel = new PvcsDatabaseSelectorPanel(fileSystem, args, (String) vars.get("PROJECT_DB"));
21.21 - if (NotifyDescriptor.OK_OPTION.equals(TopManager.getDefault().notify(
21.22 + if (NotifyDescriptor.OK_OPTION.equals(DialogDisplayer.getDefault().notify(
21.23 new DialogDescriptor(panel, panel.getName(), true,
21.24 DialogDescriptor.OK_CANCEL_OPTION,
21.25 DialogDescriptor.OK_OPTION,
22.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsProjectSelector.java Thu Feb 20 15:57:01 2003 +0000
22.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsProjectSelector.java Thu Feb 20 16:29:19 2003 +0000
22.3 @@ -19,7 +19,6 @@
22.4
22.5 import org.openide.DialogDescriptor;
22.6 import org.openide.NotifyDescriptor;
22.7 -import org.openide.TopManager;
22.8 import org.openide.filesystems.AbstractFileSystem;
22.9 import org.openide.util.NbBundle;
22.10 import org.openide.util.HelpCtx;
22.11 @@ -31,6 +30,7 @@
22.12 import org.netbeans.modules.vcscore.cmdline.RelativeMountPanel;
22.13 import org.netbeans.modules.vcscore.cmdline.VcsAdditionalCommand;
22.14 import org.netbeans.modules.vcscore.util.Table;
22.15 +import org.openide.DialogDisplayer;
22.16
22.17 /**
22.18 * Selector of a PVCS project.
22.19 @@ -95,7 +95,7 @@
22.20 new RelativeMountDialog(panel, NbBundle.getMessage(PvcsProjectSelector.class,
22.21 "ProjectSelectorTitle"),
22.22 new HelpCtx(PvcsProjectSelector.class));
22.23 - if (NotifyDescriptor.OK_OPTION.equals(TopManager.getDefault().notify(dialog))) {
22.24 + if (NotifyDescriptor.OK_OPTION.equals(DialogDisplayer.getDefault().notify(dialog))) {
22.25 stdoutDataListener.outputData(new String[] { panel.getRelMount() });
22.26 }
22.27 return true;
23.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsVerifyAction.java Thu Feb 20 15:57:01 2003 +0000
23.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsVerifyAction.java Thu Feb 20 16:29:19 2003 +0000
23.3 @@ -28,7 +28,6 @@
23.4 import javax.swing.SwingUtilities;
23.5
23.6 import org.openide.DialogDescriptor;
23.7 -import org.openide.TopManager;
23.8 import org.openide.filesystems.FileObject;
23.9 import org.openide.loaders.DataObject;
23.10 import org.openide.loaders.DataObjectNotFoundException;
23.11 @@ -51,6 +50,7 @@
23.12
23.13 import org.netbeans.modules.vcs.profiles.commands.ToLockFilesPanel;
23.14 import org.netbeans.modules.vcs.profiles.commands.VerifyUtil;
23.15 +import org.openide.DialogDisplayer;
23.16
23.17 /**
23.18 * The verification of PVCS files in a group.
23.19 @@ -222,7 +222,7 @@
23.20 }
23.21 });
23.22 }
23.23 - final Dialog dial = TopManager.getDefault().createDialog(dd);
23.24 + final Dialog dial = DialogDisplayer.getDefault().createDialog(dd);
23.25 SwingUtilities.invokeLater(new Runnable() {
23.26 public void run() {
23.27 dial.show();