1.1 --- a/i18n.form/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
     1.2 +++ b/i18n.form/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
     1.3 @@ -1,5 +1,4 @@
     1.4  Manifest-Version: 1.0
     1.5  OpenIDE-Module: org.netbeans.modules.i18n.form/2
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/i18n/form/Bundle.properties
     1.7 -OpenIDE-Module-Install: org/netbeans/modules/i18n/form/I18nFormCrossModule.class
     1.8  

     2.1 --- a/i18n.form/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
     2.2 +++ b/i18n.form/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
     2.3 @@ -171,7 +171,7 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>6.2</specification-version>
     2.8 +                        <specification-version>7.29</specification-version>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11                  <dependency>

     3.1 --- a/i18n.form/src/org/netbeans/modules/i18n/form/I18nFormCrossModule.java	Wed Mar 28 09:42:03 2012 -0400
     3.2 +++ b/i18n.form/src/org/netbeans/modules/i18n/form/I18nFormCrossModule.java	Sat Mar 31 18:07:56 2012 +0200
     3.3 @@ -45,8 +45,7 @@
     3.4  package org.netbeans.modules.i18n.form;
     3.5  
     3.6  import org.netbeans.modules.form.FormPropertyEditorManager;
     3.7 -import org.netbeans.modules.i18n.I18nSupport;
     3.8 -import org.openide.modules.ModuleInstall;
     3.9 +import org.openide.modules.OnStart;
    3.10  
    3.11  /**
    3.12   * Installation class for i18n to form cross dependency module.
    3.13 @@ -54,15 +53,11 @@
    3.14   *
    3.15   * @author Peter Zavadsky
    3.16   */
    3.17 -public class I18nFormCrossModule extends ModuleInstall {
    3.18 -
    3.19 +@OnStart
    3.20 +public class I18nFormCrossModule implements Runnable {
    3.21      /** Registers property editor in form module and factory in i18n module. */
    3.22 -    public void restored() {
    3.23 -        registerFormPropertyEditor();
    3.24 -    }
    3.25 -    
    3.26 -    /** Registers <code>FormI18nStringEditor</code> form property editor to form module. */
    3.27 -    private void registerFormPropertyEditor() {
    3.28 +    @Override
    3.29 +    public void run() {
    3.30          Class newEditorClass = FormI18nStringEditor.class;
    3.31          Class newEditorClassInteger = FormI18nIntegerEditor.class;
    3.32          Class newEditorClassMnemonic = FormI18nMnemonicEditor.class;

     4.1 --- a/masterfs/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
     4.2 +++ b/masterfs/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
     4.3 @@ -1,6 +1,5 @@
     4.4  Manifest-Version: 1.0
     4.5  OpenIDE-Module: org.netbeans.modules.masterfs/2
     4.6 -OpenIDE-Module-Install: org/netbeans/modules/masterfs/Installer.class
     4.7  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/resources/Bundle.properties
     4.8  OpenIDE-Module-Specification-Version: 2.37
     4.9  OpenIDE-Module-Recommends: org.netbeans.modules.masterfs.providers.Notifier

     5.1 --- a/masterfs/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
     5.2 +++ b/masterfs/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
     5.3 @@ -71,7 +71,7 @@
     5.4                      <build-prerequisite/>
     5.5                      <compile-dependency/>
     5.6                      <run-dependency>
     5.7 -                        <specification-version>7.26</specification-version>
     5.8 +                        <specification-version>7.29</specification-version>
     5.9                      </run-dependency>
    5.10                  </dependency>
    5.11                  <dependency>

     6.1 --- a/masterfs/src/org/netbeans/modules/masterfs/Installer.java	Wed Mar 28 09:42:03 2012 -0400
     6.2 +++ b/masterfs/src/org/netbeans/modules/masterfs/Installer.java	Sat Mar 31 18:07:56 2012 +0200
     6.3 @@ -42,23 +42,23 @@
     6.4  package org.netbeans.modules.masterfs;
     6.5  
     6.6  import org.netbeans.modules.masterfs.watcher.Watcher;
     6.7 -import org.openide.modules.ModuleInstall;
     6.8 +import org.openide.modules.OnStart;
     6.9 +import org.openide.modules.OnStop;
    6.10  
    6.11  /** Shutdown the watcher system.
    6.12   */
    6.13 -public final class Installer extends ModuleInstall {
    6.14 +@OnStart
    6.15 +public final class Installer implements Runnable {
    6.16      @Override
    6.17 -    public void restored() {
    6.18 +    public void run() {
    6.19          Watcher.isEnabled();
    6.20      }
    6.21      
    6.22 -    @Override
    6.23 -    public void uninstalled() {
    6.24 -        close();
    6.25 -    }
    6.26 -
    6.27 -    @Override
    6.28 -    public void close() {
    6.29 -        Watcher.shutdown();
    6.30 +    @OnStop
    6.31 +    public static final class Down implements Runnable {
    6.32 +        @Override
    6.33 +        public void run() {
    6.34 +            Watcher.shutdown();
    6.35 +        }
    6.36      }
    6.37  }

     7.1 --- a/openide.text/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
     7.2 +++ b/openide.text/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
     7.3 @@ -1,7 +1,6 @@
     7.4  Manifest-Version: 1.0
     7.5  OpenIDE-Module: org.openide.text
     7.6  OpenIDE-Module-Implementation-Version: 1
     7.7 -OpenIDE-Module-Install: org/netbeans/modules/openide/text/Installer.class
     7.8  OpenIDE-Module-Localizing-Bundle: org/openide/text/Bundle.properties
     7.9  AutoUpdate-Essential-Module: true
    7.10  

     8.1 --- a/openide.text/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
     8.2 +++ b/openide.text/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
     8.3 @@ -79,7 +79,7 @@
     8.4                      <build-prerequisite/>
     8.5                      <compile-dependency/>
     8.6                      <run-dependency>
     8.7 -                        <specification-version>7.11</specification-version>
     8.8 +                        <specification-version>7.29</specification-version>
     8.9                      </run-dependency>
    8.10                  </dependency>
    8.11                  <dependency>

     9.1 --- a/openide.text/src/org/netbeans/modules/openide/text/Installer.java	Wed Mar 28 09:42:03 2012 -0400
     9.2 +++ b/openide.text/src/org/netbeans/modules/openide/text/Installer.java	Sat Mar 31 18:07:56 2012 +0200
     9.3 @@ -47,7 +47,7 @@
     9.4  import java.util.logging.Level;
     9.5  import java.util.logging.LogRecord;
     9.6  import java.util.logging.Logger;
     9.7 -import org.openide.modules.ModuleInstall;
     9.8 +import org.openide.modules.OnStop;
     9.9  
    9.10  /**
    9.11   * Log number of editors opened during IDE session by mime type.
    9.12 @@ -55,7 +55,8 @@
    9.13   *
    9.14   * @author Marek Slama
    9.15   */
    9.16 -public class Installer extends ModuleInstall {
    9.17 +@OnStop
    9.18 +public class Installer implements Runnable {
    9.19      
    9.20      private static Map<String,Integer> mimeTypes = new HashMap<String,Integer>();
    9.21  
    9.22 @@ -71,7 +72,7 @@
    9.23      }
    9.24      
    9.25      @Override
    9.26 -    public void close() {
    9.27 +    public void run() {
    9.28          for (String s : mimeTypes.keySet()) {
    9.29              Logger logger = Logger.getLogger("org.netbeans.ui.metrics.editor"); //NOI18N
    9.30              LogRecord rec = new LogRecord(Level.INFO, "USG_EDITOR_MIME_TYPE"); //NOI18N

    10.1 --- a/profiler.drilldown/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
    10.2 +++ b/profiler.drilldown/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
    10.3 @@ -1,7 +1,6 @@
    10.4  Manifest-Version: 1.0
    10.5  AutoUpdate-Show-In-Client: false
    10.6  OpenIDE-Module: org.netbeans.modules.profiler.drilldown/1
    10.7 -OpenIDE-Module-Install: org/netbeans/modules/profiler/drilldown/Installer.class
    10.8  OpenIDE-Module-Layer: org/netbeans/modules/profiler/drilldown/layer.xml
    10.9  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/drilldown/Bundle.properties
   10.10  OpenIDE-Module-Specification-Version: 1.2

    11.1 --- a/profiler.drilldown/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
    11.2 +++ b/profiler.drilldown/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
    11.3 @@ -108,7 +108,7 @@
    11.4                      <build-prerequisite/>
    11.5                      <compile-dependency/>
    11.6                      <run-dependency>
    11.7 -                        <specification-version>7.2</specification-version>
    11.8 +                        <specification-version>7.29</specification-version>
    11.9                      </run-dependency>
   11.10                  </dependency>
   11.11                  <dependency>

    12.1 --- a/profiler.drilldown/src/org/netbeans/modules/profiler/drilldown/Installer.java	Wed Mar 28 09:42:03 2012 -0400
    12.2 +++ b/profiler.drilldown/src/org/netbeans/modules/profiler/drilldown/Installer.java	Sat Mar 31 18:07:56 2012 +0200
    12.3 @@ -41,16 +41,16 @@
    12.4   */
    12.5  package org.netbeans.modules.profiler.drilldown;
    12.6  
    12.7 -import org.openide.modules.ModuleInstall;
    12.8 +import org.openide.modules.OnStop;
    12.9  
   12.10  /**
   12.11   * Manages a module's lifecycle. Remember that an installer is optional and
   12.12   * often not needed at all.
   12.13   */
   12.14 -public class Installer extends ModuleInstall {
   12.15 -
   12.16 +@OnStop
   12.17 +public class Installer implements Runnable {
   12.18      @Override
   12.19 -    public void uninstalled() {
   12.20 +    public void run() {
   12.21          DrillDownWindow.closeIfOpened();
   12.22      }
   12.23  }

    13.1 --- a/profiler.ppoints/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
    13.2 +++ b/profiler.ppoints/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
    13.3 @@ -1,6 +1,5 @@
    13.4  Manifest-Version: 1.0
    13.5  OpenIDE-Module: org.netbeans.modules.profiler.ppoints
    13.6 -OpenIDE-Module-Install: org/netbeans/modules/profiler/ppoints/Installer.class
    13.7  OpenIDE-Module-Layer: org/netbeans/modules/profiler/ppoints/layer.xml
    13.8  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/ppoints/Bundle.properties
    13.9  OpenIDE-Module-Specification-Version: 1.2

    14.1 --- a/profiler.ppoints/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
    14.2 +++ b/profiler.ppoints/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
    14.3 @@ -96,7 +96,7 @@
    14.4                      <build-prerequisite/>
    14.5                      <compile-dependency/>
    14.6                      <run-dependency>
    14.7 -                        <specification-version>7.24</specification-version>
    14.8 +                        <specification-version>7.29</specification-version>
    14.9                      </run-dependency>
   14.10                  </dependency>
   14.11                  <dependency>

    15.1 --- a/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Installer.java	Wed Mar 28 09:42:03 2012 -0400
    15.2 +++ b/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/Installer.java	Sat Mar 31 18:07:56 2012 +0200
    15.3 @@ -41,19 +41,16 @@
    15.4   */
    15.5  package org.netbeans.modules.profiler.ppoints;
    15.6  
    15.7 -import org.openide.modules.ModuleInstall;
    15.8 +import org.openide.modules.OnStop;
    15.9  
   15.10  /**
   15.11   * Manages a module's lifecycle. Remember that an installer is optional and
   15.12   * often not needed at all.
   15.13   */
   15.14 -public class Installer extends ModuleInstall {
   15.15 -
   15.16 +@OnStop
   15.17 +public class Installer implements Runnable {
   15.18      @Override
   15.19 -    public boolean closing() {
   15.20 +    public void run() {
   15.21          ProfilingPointsManager.getDefault().ideClosing(); // TODO: dirty profiling points should be persisted on document save!
   15.22 -        return true;
   15.23      }
   15.24 -    
   15.25 -    
   15.26  }

    16.1 --- a/project.libraries/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
    16.2 +++ b/project.libraries/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
    16.3 @@ -1,6 +1,5 @@
    16.4  Manifest-Version: 1.0
    16.5  OpenIDE-Module: org.netbeans.modules.project.libraries/1
    16.6 -OpenIDE-Module-Install: org/netbeans/modules/project/libraries/LibrariesModule.class
    16.7  OpenIDE-Module-Layer: org/netbeans/modules/project/libraries/resources/mf-layer.xml
    16.8  OpenIDE-Module-Specification-Version: 1.35
    16.9  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/libraries/resources/Bundle.properties

    17.1 --- a/project.libraries/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
    17.2 +++ b/project.libraries/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
    17.3 @@ -119,7 +119,7 @@
    17.4                      <build-prerequisite/>
    17.5                      <compile-dependency/>
    17.6                      <run-dependency>
    17.7 -                        <specification-version>6.2</specification-version>
    17.8 +                        <specification-version>7.29</specification-version>
    17.9                      </run-dependency>
   17.10                  </dependency>
   17.11                  <dependency>

    18.1 --- a/project.libraries/src/org/netbeans/modules/project/libraries/LibrariesModule.java	Wed Mar 28 09:42:03 2012 -0400
    18.2 +++ b/project.libraries/src/org/netbeans/modules/project/libraries/LibrariesModule.java	Sat Mar 31 18:07:56 2012 +0200
    18.3 @@ -43,9 +43,9 @@
    18.4   */
    18.5  package org.netbeans.modules.project.libraries;
    18.6  
    18.7 -import org.openide.modules.ModuleInstall;
    18.8  import org.openide.util.Lookup;
    18.9  import org.netbeans.spi.project.libraries.LibraryProvider;
   18.10 +import org.openide.modules.OnStart;
   18.11  
   18.12  /**
   18.13   * Ensures that all {@link LibraryProvider}s are actually loaded.
   18.14 @@ -54,14 +54,9 @@
   18.15   * This needs to happen before any Ant build is run.
   18.16   * @author Tomas Zezula
   18.17   */
   18.18 -public class LibrariesModule extends ModuleInstall {
   18.19 -
   18.20 -    @Override public void restored() {
   18.21 -        super.restored();
   18.22 -        this.initProviders();
   18.23 -    }
   18.24 -    
   18.25 -    private void initProviders () {
   18.26 +@OnStart
   18.27 +public class LibrariesModule implements Runnable {
   18.28 +    @Override public void run() {
   18.29          for (LibraryProvider lp : Lookup.getDefault().lookupAll(LibraryProvider.class)) {            
   18.30              lp.getLibraries();
   18.31          }

    19.1 --- a/projectapi/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
    19.2 +++ b/projectapi/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
    19.3 @@ -1,6 +1,5 @@
    19.4  Manifest-Version: 1.0
    19.5  OpenIDE-Module: org.netbeans.modules.projectapi/1
    19.6 -OpenIDE-Module-Install: org/netbeans/modules/projectapi/Installer.class
    19.7  OpenIDE-Module-Specification-Version: 1.43
    19.8  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/projectapi/Bundle.properties
    19.9  OpenIDE-Module-Layer: org/netbeans/modules/projectapi/layer.xml

    20.1 --- a/projectapi/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
    20.2 +++ b/projectapi/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
    20.3 @@ -88,7 +88,7 @@
    20.4                      <build-prerequisite/>
    20.5                      <compile-dependency/>
    20.6                      <run-dependency>
    20.7 -                        <specification-version>7.19</specification-version>
    20.8 +                        <specification-version>7.29</specification-version>
    20.9                      </run-dependency>
   20.10                  </dependency>
   20.11                  <dependency>

    21.1 --- a/projectapi/src/org/netbeans/modules/projectapi/Installer.java	Wed Mar 28 09:42:03 2012 -0400
    21.2 +++ b/projectapi/src/org/netbeans/modules/projectapi/Installer.java	Sat Mar 31 18:07:56 2012 +0200
    21.3 @@ -44,23 +44,27 @@
    21.4  
    21.5  package org.netbeans.modules.projectapi;
    21.6  
    21.7 -import org.openide.modules.ModuleInstall;
    21.8 +import org.openide.modules.OnStart;
    21.9 +import org.openide.modules.OnStop;
   21.10  
   21.11  /**
   21.12   * Manages a module's lifecycle. Remember that an installer is optional and
   21.13   * often not needed at all.
   21.14   */
   21.15 -public class Installer extends ModuleInstall {
   21.16 -
   21.17 +@OnStart
   21.18 +public class Installer implements Runnable {
   21.19      @Override
   21.20 -    public void restored() {
   21.21 +    public void run() {
   21.22          //#125582
   21.23          SimpleFileOwnerQueryImplementation.deserialize();
   21.24      }
   21.25  
   21.26 -    @Override
   21.27 -    public void close() {
   21.28 -        //#125582
   21.29 -        SimpleFileOwnerQueryImplementation.serialize();
   21.30 +    @OnStop
   21.31 +    public static final class Down implements Runnable {
   21.32 +        @Override
   21.33 +        public void run() {
   21.34 +            //#125582
   21.35 +            SimpleFileOwnerQueryImplementation.serialize();
   21.36 +        }
   21.37      }
   21.38  }

    22.1 --- a/spi.palette/manifest.mf	Wed Mar 28 09:42:03 2012 -0400
    22.2 +++ b/spi.palette/manifest.mf	Sat Mar 31 18:07:56 2012 +0200
    22.3 @@ -3,4 +3,3 @@
    22.4  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/palette/resources/Bundle.properties
    22.5  OpenIDE-Module-Specification-Version: 1.30
    22.6  OpenIDE-Module-Layer: org/netbeans/modules/palette/resources/layer.xml
    22.7 -OpenIDE-Module-Install: org/netbeans/spi/palette/PaletteModule.class

    23.1 --- a/spi.palette/nbproject/project.xml	Wed Mar 28 09:42:03 2012 -0400
    23.2 +++ b/spi.palette/nbproject/project.xml	Sat Mar 31 18:07:56 2012 +0200
    23.3 @@ -141,7 +141,7 @@
    23.4                      <build-prerequisite/>
    23.5                      <compile-dependency/>
    23.6                      <run-dependency>
    23.7 -                        <specification-version>6.2</specification-version>
    23.8 +                        <specification-version>6.54</specification-version>
    23.9                      </run-dependency>
   23.10                  </dependency>
   23.11              </module-dependencies>

    24.1 --- a/spi.palette/src/org/netbeans/spi/palette/PaletteModule.java	Wed Mar 28 09:42:03 2012 -0400
    24.2 +++ b/spi.palette/src/org/netbeans/spi/palette/PaletteModule.java	Sat Mar 31 18:07:56 2012 +0200
    24.3 @@ -44,29 +44,19 @@
    24.4  
    24.5  package org.netbeans.spi.palette;
    24.6  
    24.7 -import org.openide.modules.ModuleInstall;
    24.8 -import org.openide.windows.WindowManager;
    24.9 +import org.openide.windows.OnShowing;
   24.10  
   24.11  /**
   24.12   *
   24.13   * @author S. Aubrecht
   24.14   * @since 1.10
   24.15   */
   24.16 -public class PaletteModule extends ModuleInstall {
   24.17 -    
   24.18 -    /** Creates a new instance of ModuleInstall */
   24.19 -    public PaletteModule() {
   24.20 -    }
   24.21 -    
   24.22 +@OnShowing
   24.23 +public class PaletteModule implements Runnable {
   24.24      @Override
   24.25 -    public void restored() {
   24.26 -        super.restored();
   24.27 -        WindowManager.getDefault().invokeWhenUIReady( new Runnable() {
   24.28 -            public void run() {
   24.29 -                //start listening to activated TopComponents and Nodes 
   24.30 -                //to see if palette window should be displayed
   24.31 -                PaletteSwitch.getDefault().startListening();
   24.32 -            }
   24.33 -        });
   24.34 +    public void run() {
   24.35 +        //start listening to activated TopComponents and Nodes 
   24.36 +        //to see if palette window should be displayed
   24.37 +        PaletteSwitch.getDefault().startListening();
   24.38      }
   24.39  }