1.1 --- a/sysprops/build.xml Wed Feb 12 17:21:39 2003 +0000
1.2 +++ b/sysprops/build.xml Wed Feb 12 19:16:34 2003 +0000
1.3 @@ -8,7 +8,7 @@
1.4 http://www.sun.com/
1.5
1.6 The Original Code is NetBeans. The Initial Developer of the Original
1.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
1.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
1.9 Microsystems, Inc. All Rights Reserved.
1.10 -->
1.11
1.12 @@ -26,7 +26,6 @@
1.13 <classpath>
1.14 <pathelement location="../openide/openide-13javac-workaround.jar"/>
1.15 <pathelement location="../openide/netbeans/lib/openide.jar"/>
1.16 - <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
1.17 </classpath>
1.18 </javac>
1.19 </target>
2.1 --- a/sysprops/manifest.mf Wed Feb 12 17:21:39 2003 +0000
2.2 +++ b/sysprops/manifest.mf Wed Feb 12 19:16:34 2003 +0000
2.3 @@ -1,8 +1,8 @@
2.4 Manifest-Version: 1.0
2.5 OpenIDE-Module: org.netbeans.modules.sysprops
2.6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/sysprops/Bundle.properties
2.7 -OpenIDE-Module-Specification-Version: 1.6
2.8 +OpenIDE-Module-Specification-Version: 1.7
2.9 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
2.10 -OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.16
2.11 +OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.29
2.12 OpenIDE-Module-Layer: org/netbeans/modules/sysprops/layer.xml
2.13
3.1 --- a/sysprops/src/org/netbeans/modules/sysprops/PropertyNode.java Wed Feb 12 17:21:39 2003 +0000
3.2 +++ b/sysprops/src/org/netbeans/modules/sysprops/PropertyNode.java Wed Feb 12 19:16:34 2003 +0000
3.3 @@ -7,7 +7,7 @@
3.4 * http://www.sun.com/
3.5 *
3.6 * The Original Code is NetBeans. The Initial Developer of the Original
3.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
3.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
3.9 * Microsystems, Inc. All Rights Reserved.
3.10 *
3.11 * Contributor(s): Jesse Glick, Michael Ruflin
3.12 @@ -17,6 +17,7 @@
3.13 import java.io.IOException;
3.14 import java.text.MessageFormat;
3.15 import java.util.*;
3.16 +import javax.swing.Action;
3.17 import javax.swing.event.ChangeListener;
3.18 import javax.swing.event.ChangeEvent;
3.19
3.20 @@ -26,7 +27,6 @@
3.21 import org.openide.util.actions.SystemAction;
3.22 import org.openide.util.datatransfer.NewType;
3.23 import org.openide.NotifyDescriptor;
3.24 -import org.openide.TopManager;
3.25 import org.openide.util.NbBundle;
3.26 import org.openide.util.WeakListener;
3.27
3.28 @@ -63,9 +63,6 @@
3.29 property = prop;
3.30 this.kids = kids;
3.31
3.32 - // set the default Action
3.33 - setDefaultAction (SystemAction.get (PropertiesAction.class));
3.34 -
3.35 if (property != null) {
3.36 // Set FeatureDescriptor stuff:
3.37 setName (property);
3.38 @@ -164,6 +161,10 @@
3.39 SystemAction.get (PropertiesAction.class),
3.40 };
3.41 }
3.42 +
3.43 + public Action getPreferredAction() {
3.44 + return SystemAction.get(PropertiesAction.class);
3.45 + }
3.46
3.47 /**
3.48 * Clones this Node.
4.1 --- a/sysprops/src/org/netbeans/modules/sysprops/SystemPropertiesNode.java Wed Feb 12 17:21:39 2003 +0000
4.2 +++ b/sysprops/src/org/netbeans/modules/sysprops/SystemPropertiesNode.java Wed Feb 12 19:16:34 2003 +0000
4.3 @@ -7,7 +7,7 @@
4.4 * http://www.sun.com/
4.5 *
4.6 * The Original Code is NetBeans. The Initial Developer of the Original
4.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
4.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
4.9 * Microsystems, Inc. All Rights Reserved.
4.10 *
4.11 * Contributor(s): Jesse Glick, Michael Ruflin
4.12 @@ -24,7 +24,6 @@
4.13 import org.openide.util.actions.SystemAction;
4.14 import org.openide.util.datatransfer.NewType;
4.15 import org.openide.NotifyDescriptor;
4.16 -import org.openide.TopManager;
4.17 import org.openide.util.NbBundle;
4.18
4.19 /** Root Node for all SystemProperties.
5.1 --- a/sysprops/src/org/netbeans/modules/sysprops/SystemPropertyNewType.java Wed Feb 12 17:21:39 2003 +0000
5.2 +++ b/sysprops/src/org/netbeans/modules/sysprops/SystemPropertyNewType.java Wed Feb 12 19:16:34 2003 +0000
5.3 @@ -7,7 +7,7 @@
5.4 * http://www.sun.com/
5.5 *
5.6 * The Original Code is NetBeans. The Initial Developer of the Original
5.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
5.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
5.9 * Microsystems, Inc. All Rights Reserved.
5.10 *
5.11 * Contributor(s): Jesse Glick, Michael Ruflin
5.12 @@ -19,8 +19,8 @@
5.13
5.14 import org.openide.util.HelpCtx;
5.15 import org.openide.util.datatransfer.NewType;
5.16 +import org.openide.DialogDisplayer;
5.17 import org.openide.NotifyDescriptor;
5.18 -import org.openide.TopManager;
5.19 import org.openide.util.NbBundle;
5.20
5.21 /** NewType that can create a new SystemProperty.
5.22 @@ -66,7 +66,7 @@
5.23 desc.setInputText (propertyName + ".");
5.24 }
5.25
5.26 - TopManager.getDefault ().notify (desc);
5.27 + DialogDisplayer.getDefault ().notify (desc);
5.28
5.29 // return if the user has canceled the dialog
5.30 String key = desc.getInputText ();
5.31 @@ -76,7 +76,7 @@
5.32 msg = bundle.getString ("MSG_NewProp_dialog_value");
5.33 desc = new NotifyDescriptor.InputLine (msg, title);
5.34 // [PENDING] return if result is a cancel
5.35 - TopManager.getDefault ().notify (desc);
5.36 + DialogDisplayer.getDefault ().notify (desc);
5.37 String value = desc.getInputText ();
5.38
5.39 // add the Property to the SystemProperties