Automated merge with main-silver
authorffjre@netbeans.org
Wed, 15 Jul 2009 02:58:08 +0400
changeset 9268981ec62a25d
parent 925 a290747c7208
parent 800 1c1a1047857a
child 927 3b3062799853
Automated merge with main-silver
     1.1 --- a/openide.util/apichanges.xml	Sat Jul 11 02:56:07 2009 +0400
     1.2 +++ b/openide.util/apichanges.xml	Wed Jul 15 02:58:08 2009 +0400
     1.3 @@ -49,6 +49,23 @@
     1.4      <apidef name="actions">Actions API</apidef>
     1.5  </apidefs>
     1.6  <changes>
     1.7 +    <change id="LifecycleManager.markForRestart">
     1.8 +        <api name="util"/>
     1.9 +        <summary>Added way to request that the platform restart.</summary>
    1.10 +        <version major="7" minor="25"/>
    1.11 +        <date day="14" month="7" year="2009"/>
    1.12 +        <author login="jglick"/>
    1.13 +        <compatibility addition="yes"/>
    1.14 +        <description>
    1.15 +            <p>
    1.16 +                 Can now use <code>LifecycleManager.markForRestart</code> to cause
    1.17 +                 the application to restart after exiting. Formerly needed to
    1.18 +                 create special files in the userdir or use similar tricks.
    1.19 +            </p>
    1.20 +        </description>
    1.21 +        <class package="org.openide" name="LifecycleManager"/>
    1.22 +        <issue number="168257"/>
    1.23 +    </change>
    1.24      <change id="org.openide.util.Lookup.paths">
    1.25          <api name="lookup"/>
    1.26          <summary>Added
     2.1 --- a/openide.util/nbproject/project.properties	Sat Jul 11 02:56:07 2009 +0400
     2.2 +++ b/openide.util/nbproject/project.properties	Wed Jul 15 02:58:08 2009 +0400
     2.3 @@ -42,7 +42,7 @@
     2.4  module.jar.dir=lib
     2.5  cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar
     2.6  
     2.7 -spec.version.base=7.24.0
     2.8 +spec.version.base=7.25.0
     2.9  
    2.10  # For XMLSerializer, needed for XMLUtil.write to work w/ namespaces under JDK 1.4:
    2.11  
     3.1 --- a/openide.util/src/org/openide/LifecycleManager.java	Sat Jul 11 02:56:07 2009 +0400
     3.2 +++ b/openide.util/src/org/openide/LifecycleManager.java	Wed Jul 15 02:58:08 2009 +0400
     3.3 @@ -83,6 +83,16 @@
     3.4       */
     3.5      public abstract void exit();
     3.6  
     3.7 +    /**
     3.8 +     * Request that the application restart immediately after next being shut down.
     3.9 +     * You may want to then call {@link #exit} to go ahead and restart now.
    3.10 +     * @throws UnsupportedOperationException if this request cannot be honored
    3.11 +     * @since org.openide.util 7.25
    3.12 +     */
    3.13 +    public void markForRestart() throws UnsupportedOperationException {
    3.14 +        throw new UnsupportedOperationException();
    3.15 +    }
    3.16 +
    3.17      /** Fallback instance. */
    3.18      private static final class Trivial extends LifecycleManager {
    3.19          public Trivial() {