1.1 --- a/jasm/Manifest.mf	Wed Apr 23 12:10:36 2003 +0000
     1.2 +++ b/jasm/Manifest.mf	Wed Apr 23 14:50:27 2003 +0000
     1.3 @@ -1,13 +1,14 @@
     1.4 +Manifest-Version: 1.0
     1.5  OpenIDE-Module: org.netbeans.modules.jasm/1
     1.6  OpenIDE-Module-Name: JASM
     1.7  OpenIDE-Module-Long-Description: Java assembler/disassembler module.
     1.8  OpenIDE-Module-Layer: org/netbeans/modules/jasm/resources/mf-layer.xml
     1.9  OpenIDE-Module-Display-Category: Java
    1.10 -OpenIDE-Module-Module-Dependencies: org.netbeans.modules.editor/1 > 1.4, org.netbeans.modules.java/1, org.openide.src > 1.0
    1.11 +OpenIDE-Module-Module-Dependencies: org.netbeans.modules.editor/1 > 1.4, org.openide.src > 1.0
    1.12  OpenIDE-Module-Install: org/netbeans/modules/jasm/JASMModule.class
    1.13 -OpenIDE-Module-Specification-Version: 0.1
    1.14 +OpenIDE-Module-Specification-Version: 0.2
    1.15  OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
    1.16 -OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.14
    1.17 +OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
    1.18  
    1.19  Name: org/netbeans/modules/jasm/JRAWDataLoader.class
    1.20  OpenIDE-Module-Class: Loader
    1.21 @@ -17,3 +18,4 @@
    1.22  
    1.23  Name: org/netbeans/modules/jasm/GenerateFromClassAction.class
    1.24  OpenIDE-Module-Class: Action
    1.25 +

     2.1 --- a/jasm/build.xml	Wed Apr 23 12:10:36 2003 +0000
     2.2 +++ b/jasm/build.xml	Wed Apr 23 14:50:27 2003 +0000
     2.3 @@ -8,7 +8,7 @@
     2.4  http://www.sun.com/
     2.5  
     2.6  The Original Code is NetBeans. The Initial Developer of the Original
     2.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
     2.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     2.9  Microsystems, Inc. All Rights Reserved.
    2.10  -->
    2.11  
    2.12 @@ -25,14 +25,11 @@
    2.13      <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
    2.14        <classpath>
    2.15  	<pathelement location="../openide/openide-13javac-workaround.jar"/>
    2.16 -        <fileset dir="../openide/netbeans/lib">
    2.17 -          <include name="openide*.jar" />
    2.18 -        </fileset>
    2.19 -        <pathelement location="../java/netbeans/modules/java.jar"/>
    2.20 +	<pathelement location="../openide/netbeans/lib/openide.jar"/>
    2.21 +	<pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
    2.22          <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
    2.23          <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
    2.24          <pathelement location="../editor/netbeans/modules/editor.jar"/>
    2.25 -        <pathelement location="../clazz/netbeans/modules/clazz.jar"/>
    2.26        </classpath>
    2.27      </javac>
    2.28    </target>
    2.29 @@ -59,12 +56,19 @@
    2.30               topdir="."
    2.31               module="netbeans/modules/jasm.jar"
    2.32  	     homepage="http://jasm.netbeans.org/"
    2.33 +             needsrestart="false"
    2.34  	     distribution="http://${dist.base}/jasm.nbm">
    2.35        <license file="${license.file}"/>
    2.36        <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
    2.37      </makenbm>
    2.38    </target>
    2.39  
    2.40 +  <target name="reload" depends="jars">
    2.41 +    <mkdir dir="reload"/>
    2.42 +    <copy file="netbeans/modules/jasm.jar" tofile="reload/jasm.jar"/>
    2.43 +    <nbinstaller module="reload/jasm.jar" action="reinstall"/>
    2.44 +  </target>
    2.45 +
    2.46    <target name="clean">
    2.47      <delete>
    2.48        <fileset dir="src">
    2.49 @@ -78,5 +82,3 @@
    2.50    </target>
    2.51  
    2.52  </project>
    2.53 -
    2.54 -

     3.1 --- a/jasm/src/org/netbeans/modules/jasm/JRAWDataLoader.java	Wed Apr 23 12:10:36 2003 +0000
     3.2 +++ b/jasm/src/org/netbeans/modules/jasm/JRAWDataLoader.java	Wed Apr 23 14:50:27 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  
    3.12 @@ -35,7 +35,7 @@
    3.13      static final String EXT_CLASS = "class"; // NOI18N
    3.14      
    3.15      public JRAWDataLoader() {
    3.16 -        super(JRAWDataObject.class);
    3.17 +        super("org.netbeans.modules.jasm.JRAWDataObject"); // NOI18N
    3.18      }
    3.19  
    3.20      protected void initialize () {

     4.1 --- a/jasm/src/org/netbeans/modules/jasm/settings/JASMSettings.java	Wed Apr 23 12:10:36 2003 +0000
     4.2 +++ b/jasm/src/org/netbeans/modules/jasm/settings/JASMSettings.java	Wed Apr 23 14:50:27 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  
    4.12 @@ -42,14 +42,11 @@
    4.13      transient public static final String DISP_CHILDREN = "Children";
    4.14      transient public static final String HINT_CHILDREN = "Available children";
    4.15      
    4.16 -    private static JASMSettings defaultSetting = null;
    4.17      private static DisassemblerSettings[] childrenArray = null;
    4.18      private static String disassembler = null;
    4.19      
    4.20      public static JASMSettings getDefault () {
    4.21 -        if (defaultSetting == null)
    4.22 -            defaultSetting = (JASMSettings) SystemOption.findObject (JASMSettings.class);
    4.23 -        return defaultSetting;
    4.24 +        return (JASMSettings) SystemOption.findObject (JASMSettings.class, true);
    4.25      }
    4.26      
    4.27      public JASMSettings () {