Attachment #6773 for bug #25186

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 25186
Collapse All | Expand All





<project name="mdr" basedir="." default="netbeans">

  <!-- =========================================================== -->
  <!-- == Properties ============================================= -->
  <!-- =========================================================== -->

  <property name="nbroot" location=".."/>
  <property name="nbext" location="${nbroot}/nbbuild"/>
  <property name="binroot" location="../../nbextra"/>
  <property name="storepass" value="?"/>
  <property name="build.compiler.debug" value="true"/>
  <property name="build.compiler.deprecation" value="true"/>
  <property name="homepage.base" value="netbeans.org"/>
  <property name="dist.base" value="www.netbeans.org/download/nbms/40/MDR"/>

  <!-- all external files and directories -->
  <property name="nbantext.jar" location="${nbext}/nbantext.jar"/>
  <property name="openide-13javac-workaround.jar" location="${nbroot}/openide/openide-13javac-workaround.jar"/>
  <property name="openide.jar.dir" location="${nbroot}/openide/netbeans/lib"/>
  <property name="xml-apis.jar" location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
  <property name="djava.jar" location="${binroot}/scripting/release/modules/ext/djava.jar"/>
  <property name="openidex.jar" location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
  <property name="naming.jar" location="${nbroot}/core/naming/netbeans/modules/autoload/naming.jar"/>
  <property name="looks.jar" location="${nbroot}/openidex/looks/netbeans/modules/autoload/looks.jar"/>
  <property name="standard-jar-excludes.txt" location="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
  <property name="mof.xml" location="jmi/mof.xml"/>
  <property name="standard-nbm-license.txt" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>

  <!-- =========================================================== -->
  <!-- == Taskdefs =============================================== -->
  <!-- =========================================================== -->

  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbantext.jar}"/>
  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbantext.jar}"/>
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar"
  classpath="${nbantext.jar}"/>

  <!-- =========================================================== -->
  <!-- == Initialization ========================================= -->
  <!-- =========================================================== -->

  <target name="init">
    <tstamp>

    <echo message="buildnumber = ${buildnumber}"/>
  </target>

  <!-- =========================================================== -->
  <!-- == Compilation classpath ================================== -->
  <!-- =========================================================== -->

  <path id="compile.class.path">
    <pathelement location="${openide-13javac-workaround.jar}"/>
    <fileset dir="${openide.jar.dir}">
       <include name="openide*.jar"/>
    </fileset>        
    <pathelement location="${xml-apis.jar}"/>
    <pathelement location="${djava.jar}"/>
    <pathelement location="jmi/"/>
    <pathelement location="${openidex.jar}"/>
  </path>

  <!-- =========================================================== -->
  <!-- == Compilation classpath for MDR-Explorer ================= -->
  <!-- =========================================================== -->

  <path id="explorer.compile.class.path">
    <path refid="compile.class.path"/>
    <pathelement location="${naming.jar}"/>
    <pathelement location="${looks.jar}"/>
    </fileset>        
    <pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
    <pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>
    <pathelement location="jmi/"/>
    <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
    <pathelement location="${nbroot}/core/naming/netbeans/modules/autoload/naming.jar"/>
    <pathelement location="${nbroot}/openidex/looks/netbeans/modules/autoload/looks.jar"/>
  </path>

  <!-- =========================================================== -->
  <!-- == Compilation of all parts =============================== -->
  <!-- =========================================================== -->

  <target name="compile" depends="compile-src"/>
  
  <target name="compile-jmi">

    </javac> 
  </target>

  <!-- =========================================================== -->
  <!-- == Creating all mdr jars ================================== -->
  <!-- =========================================================== -->

  <target name="jars" depends="init,jars-all"/>

  <target name="jars-jmi" depends="compile-jmi">

    <mkdir dir="netbeans/modules/autoload"/>
    <mkdir dir="jmi/javax/jmi/model/resources"/>

    <copy file="${mof.xml}" tofile="jmi/javax/jmi/model/resources/mof.xml"/>

    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    <copy file="manifest-mof.mf" filtering="on" tofile="manifest-mof-subst.mf"/>    

            manifest="manifest-mof-subst.mf"
            compress="false">
      <locale name="ja"/>
      <fileset dir="jmi" excludesfile="${standard-jar-excludes.txt}">
        <include name="javax/"/>
	<exclude name="javax/jmi/reflect/"/>
	<exclude name="javax/jmi/xmi/"/>

            manifest="manifest-jmi-subst.mf"
            compress="false">
      <locale name="ja"/>
      <fileset dir="jmi" excludesfile="${standard-jar-excludes.txt}">
	<include name="javax/jmi/reflect/"/>
	<include name="javax/jmi/xmi/"/>
      </fileset>

    <locjar jarfile="netbeans/modules/ext/nbmdr.jar"
            compress="false">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/mdr/"/>
        <include name="javax/"/>
	<exclude name="org/netbeans/mdr/shell/"/>

    <locjar jarfile="apps/mdrshell.jar"
            compress="false">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/mdr/shell/"/>
      </fileset>
    </locjar>

    <locjar jarfile="netbeans/modules/ext/jmiutils.jar"
            compress="false">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/lib/jmi/"/>
      </fileset>
    </locjar>

            compress="false"             
            manifest="manifest-mdr-subst.mf">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/modules/mdr/"/>	
      </fileset>
    </locjar>

            compress="false"             
            manifest="manifest-toolkit-subst.mf">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/modules/mdrtoolkit/"/>	
      </fileset>
    </locjar>

            compress="false"
            manifest="manifest-mdrapi-subst.mf">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/api/"/>
      </fileset>
    </locjar>
  </target>

  <target name="explorer-jar" depends="compile-explorer, init">
  
    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    <copy file="manifest-explorer.mf" filtering="on" tofile="manifest-explorer-subst.mf"/> 

      compress="false"             
      manifest="manifest-explorer-subst.mf">
      <locale name="ja"/>
      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
        <include name="org/netbeans/modules/mdrexplorer/"/>	
      </fileset>
    </locjar>
    
  </target>

  <!-- =========================================================== -->
  <!-- == MDR-Explorer target =================================== -->
  <!-- =========================================================== -->

  <target name="mdrexplorer" depends="explorer-jar">
  </target>


      <!--genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/-->
  </target>

  <!-- =========================================================== -->
  <!-- == Production of NBM ====================================== -->
  <!-- =========================================================== -->

  <target name="nbm" depends="toolkit-nbm,mdr-nbm,jmi-nbm,mof-nbm,mdrapi-nbm"/>
    
  <target name="mdrapi-nbm" depends="netbeans">

             module="netbeans/modules/autoload/mdrapi.jar"
	     homepage="http://mdr.${homepage.base}/"
	     distribution="http://${dist.base}/mdrapi.nbm">
      <license file="${standard-nbm-license.txt}"/>
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
    </makenbm>
  </target>

             module="netbeans/modules/mdrtoolkit.jar"
	     homepage="http://mdr.${homepage.base}/"
	     distribution="http://${dist.base}/mdrtoolkit.nbm">
      <license file="${standard-nbm-license.txt}"/>
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
    </makenbm>
  </target>

             module="netbeans/modules/mdr.jar"
	     homepage="http://mdr.${homepage.base}/"
	     distribution="http://${dist.base}/mdr.nbm">
      <license file="${standard-nbm-license.txt}"/>
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
      <exclude name="netbeans/modules/mdrtoolkit.jar"/>
      <exclude name="netbeans/modules/mdrexplorer.jar"/>

			 module="netbeans/modules/mdrexplorer.jar"
			 homepage="http://mdr.${homepage.base}/"
			 distribution="http://${dist.base}/mdrexplorer.nbm">
		<license file="${standard-nbm-license.txt}"/>
        <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>

	</makenbm>

    <zip zipfile="MdrAPIs.zip" basedir="MdrAPIs"/>
  </target>

  <!-- =========================================================== -->
  <!-- == Cleaning compiled stuff ================================ -->
  <!-- =========================================================== -->

  <target name="clean" description="Removes all build products.">
    <delete>
      <fileset dir="src">




     */
    public String[] getExtentNames();

    /**
     * Returns the object with the given MOF ID.
     *
     * @param mofId the MOF ID of the object to be returned
     * @return the object with the given MOF ID
     * @throws java.util.NoSuchElementException if there is no object with
     *         the given MOF ID
     */
    public RefBaseObject getByMofId(String mofId);
    
    /** Starts a new transaction. This method causes that the repository will be locked
     * for read-only access or exclusive write access (depending on the value passed as
     * a parameter) and starts a new transaction. It is prefered to enclose any batch




    /** Bitmask representing all event types related to classifier attribute changes */
    public static final int EVENTMASK_CLASSATTR = 0x102FFFF;
    
    /** Event type indicating that a value of a single-valued instance attribute is to be/was changed or
     * a value element of a multi-valued instance attribute is to be/was changed.
     */
    public static final int EVENT_ATTRIBUTE_SET = 0x1010001;
    /** Event type indicating that a value element of a multi-valued instance attribute is to be/was added */
    public static final int EVENT_ATTRIBUTE_ADD = 0x1010002;
    /** Event type indicating that a value element of a multi-valued instance attribute is to be/was removed */
    public static final int EVENT_ATTRIBUTE_REMOVE = 0x1010004;

    /** Event type indicating that a value of a single-valued classifier attribute is to be/was changed or




 * This way the event listeners can filter the events using a bitmask.
 *
 * @author Martin Matula
 * @author <a href="mailto:hkrug@rationalizer.com">Holger Krug</code>.
 */
public abstract class MDRChangeEvent extends EventObject {
    /** Bitmask representing all possible repository event types.
     * Can be used for registering listener to receive all kinds of events.
     */
    public static final int EVENTMASK_ALL = 0x0FFFFFFF;
    
    /** Bitmask representing all event types which are initially fired on
     * associations. */
    public static final int EVENTMASK_ON_ASSOCIATION = AssociationEvent.EVENTMASK_ASSOCIATION;
    /** Bitmask representing all event types which are initially fired on
     * instance objects. */
    public static final int EVENTMASK_ON_INSTANCE = InstanceEvent.EVENT_INSTANCE_CREATE | AttributeEvent.EVENTMASK_ATTRIBUTE;
    /** Bitmask representing all event types which are initially fired on
     * class proxies. */
    public static final int EVENTMASK_ON_CLASS = InstanceEvent.EVENT_INSTANCE_DELETE | AttributeEvent.EVENTMASK_CLASSATTR;
    /** Bitmask representing all event types which are initially fired on
     * package proxies.
     *
     * <p><em>Note:</em> This bitmask is empty, because there are not
     * events which originate on packages. Packages receive only events
     * propagated from other objects. As a consequence this bitmask is
     * useless. It is nevertheless part of the API to achieve greater
     * uniformity of the API.</p>
     */
    public static final int EVENTMASK_ON_PACKAGE = 0x0000000;
    /** Bitmask representing all event types which are initially fired on
     * repositories. */
    public static final int EVENTMASK_ON_REPOSITORY = ExtentEvent.EVENTMASK_EXTENT | TransactionEvent.EVENTMASK_TRANSACTION;

    // event type
    private final int eventType;




 * The objects that have to be registered for event
 * notifications need to implement {@link MDRChangeListener}
 * or {@link MDRPreChangeListener} interface.<p>
 *
 * <p>The repository distributes all the events recursively in the following way:
 * <ul>
 * <li>Event fired on an instance are also fired on the corresponding class proxy for this instance.
 * <li>Events fired on a class proxy are propagated to its immediate package proxy.
 * <li>Events fired on an association proxy are fired on all the instances affected by this event 
 * (e.g. instances added/removed from a link) and also it is fired on the immediate package proxy.
 * <li>Event fired on a package proxy are propagated to its immediate package proxy.
 * If the package proxy is outermost, the event is propagated to the MDRepository that contains
 * the proxy.
 * </ul>
 * Figure <b>XXX: MARTIN, PLEASE ADD THE FIGURE, I'VE CREATED</b> shows where the
 * events are initially fired and how they propagate.
 * </p>
 *
 * <p>All the events are propagated recursively till they reach the repository object (e.g. each
 * instance event is as a result of propagation always fired on the instance itself,
 * on its class proxy, on its immediate package proxy, on all other package proxies containing
 * the immediate package proxy to the outermost package proxy and at the end on the repository containing
 * instance).</p>
 *
 * <p>In addition, any event is fired only once for each listener (so no matter how many objects 
 * on the event's propagation path is a listener registered on - e.g. on both
 * class proxy and its instances - it receives each notification only once per event).</p>
 *
 * <p>Listeners may be added specifically for certain events only by calling
 * {@link #addListener(MDRChangeListener, int) addListener(MDRChangeListener, int)}.
 * If instead {@link #addListener(MDRChangeListener) addListener(MDRChangeListener)}
 * is used for listener addition and, hence, no event mask is speficied, the listener
 * receives all events which are propagated to the source it is registered for.
 *
 * @author Martin Matula
 * @author <a href="mailto:hkrug@rationalizer.com">Holger Krug</code>.
 */
public interface MDRChangeSource {
    
    /** Registers a listener for receiving event notifications using the default
     *  event mask. The default event mask depends on the type of the change source
     *  and filters all events which are initially fired on this object.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */    
    public void addListener(MDRChangeListener listener);
    /** Registers a listener for receiving notifications about events the type
     *  of which matches <code>mask</code>.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param eventMask bitmask to be used in a call to {@link MdrChangeEvent#isOfType()}
     *    to filter events based on the mask
     */    
    public void addListener(MDRChangeListener listener, int mask);
    /** Removes listener from the list of objects registered for events notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */    
    public void removeListener(MDRChangeListener listener);
    /** Removes listener only for events of types matching <code>mask</code>.
     * If a listener is additionally registered for events of other types, it
     * proceeds listening on the remaining event types.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask determines the types of events the listener shall stop
     *   to listen on
     */    
    public void removeListener(MDRChangeListener listener, int mask);
}




/*
 *                 Sun Public License Notice
 * 
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 * 
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
 * Microsystems, Inc. All Rights Reserved.
 */
package org.netbeans.api.mdr.events;

import javax.jmi.reflect.RefFeatured;
import org.netbeans.api.mdr.MDRepository;

/** Class representing MDR events related to start, commit and
 * rollback of write transactions.
 *
 * @author <a href="mailto:hkrug@rationalizer.com">Holger Krug</code>.
 */
public class TransactionEvent extends MDRChangeEvent {
    
    /** Bitmask representing all event types related to write transactions */
    public static final int EVENTMASK_TRANSACTION = 0x011FFFF;
    
    /** Event type indicating that a write transaction has been started. */
    public static final int EVENT_TRANSACTION_START = 0x0110001;
    /** Event type indicating that a write transaction has been committed. */
    public static final int EVENT_TRANSACTION_COMMIT = 0x0110002;
    /** Event type indicating that a write transaction has been rolled back. */
    public static final int EVENT_TRANSACTION_ROLLBACK = 0x0110004;

    /** Creates new <code>TransactionEvent</code> instance. 
     * @param source the event source, an instance of <code>MDRepository</code>.
     * @param type the event type.
     */
    public TransactionEvent(MDRepository source, int type) {
        super(source, type);
    }
}




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
 * Microsystems, Inc. All Rights Reserved.

    /* -------------------------------------------------------------------- */
    /* -- Private static constants ---------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    //    private static final Collection instances = new HashSet();
    
    private static final URL MOF_XML_URL = ModelPackage.class.getResource("resources/mof.xml");
    private static final URL BOOTMOF_XML_URL = ModelPackage.class.getResource("resources/mof.xml");

    private static final String INTERCEPTABLE_TAG_ID = "org.netbeans.mdr.interceptable";
    private static final String TRANSIENT_TAG_ID = "org.netbeans.mdr.transient";
    private static final String TAG_VALUE_TRUE = "true";
    
    public static final String BOOT_MOF = "BootMOF";
    public static final String PURE_MOF = "MOF";
    
    /* -------------------------------------------------------------------- */
    /* -- Private attributes ---------------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    private MdrStorage mdrStorage = null;
    
    private Map classProxies = null;
    private Map associationProxies = null;
    private Map classProxiesMofIds = null;

    private final Map parameters;
    
    /* --------------------------------------------------------------------- */
    /* -- Constructors ----------------------------------------------------- */
    /* --------------------------------------------------------------------- */

     *     <td>storage location</td>
     *   </tr>
     * </table>
     *
     */
//     * <p>Additionally the following properties allow to replace parts
//     *  of the MDR implementation by tailor-made classes, namely the base classes
//     *  for generated handler classes. This is an experimental feature, use
//     *  it with care. Currently no documentation is available about the features
//     *  the replacing classes must provide in order to cooperate with the generated code:</p>
//     *
//     * <table border cellspacing="1" cellpadding="2">
//     *   <tr>
//     *     <td><code>org.netbeans.mdr.handlers.PackageProxyHandler</code></td>
//     *     <td>(no default)</td>
//     *     <td>fully qualified name of the class replacing <code>PackageProxyHandler</code>
//     *         as base class for package proxy implementations</td>
//     *   </tr>
//     *   <tr>
//     *     <td><code>org.netbeans.mdr.handlers.ClassProxyHandler</code></td>
//     *     <td>(no default)</td>
//     *     <td>fully qualified name of the class replacing <code>ClassProxyHandler</code>
//     *         as default base class for class proxy implementations</td>
//     *   </tr>
//     *   <tr>
//     *     <td><code>org.netbeans.mdr.handlers.InstanceHandler</code></td>
//     *     <td>(no default)</td>
//     *     <td>fully qualified name of the class replacing <code>InstanceHandler</code>
//     *         as default base class for instance implementations</td>
//     *   </tr>
//     *   <tr>
//     *     <td><code>org.netbeans.mdr.handlers.AssociationHandler</code></td>
//     *     <td>(no default)</td>
//     *     <td>fully qualified name of the class replacing <code>AssociationHandler</code>
//     *         as default base class for association implementations</td>
//     *   </tr>
//     *   <tr>
//     *     <td><code>org.netbeans.mdr.handlers.StructureHandler</code></td>
//     *     <td>(no default)</td>
//     *     <td>fully qualified name of the class replacing <code>StructImpl</code>
//     *         as base class for structure implementations</td>
//     *   </tr>
//     * </table>
//     *
//     */
    public NBMDRepositoryImpl() {
        System.out.println("using default values...");
        
        String storageClass = System.getProperty("org.netbeans.mdr.storagemodel.StorageFactoryClassName", "org.netbeans.mdr.persistence.btreeimpl.btreestorage.BtreeFactory");
        String storageFile = System.getProperty("org.netbeans.mdr.persistence.Dir");
//        String packageProxyHandler = System.getProperty("org.netbeans.mdr.handlers.PackageProxyHandler");
//        String classProxyHandler = System.getProperty("org.netbeans.mdr.handlers.ClassProxyHandler");
//        String instanceHandler = System.getProperty("org.netbeans.mdr.handlers.InstanceHandler");
//        String associationHandler = System.getProperty("org.netbeans.mdr.handlers.AssociationHandler");
//        String structureHandler = System.getProperty("org.netbeans.mdr.handlers.StructureHandler");
        
        parameters = new HashMap();
        parameters.put("storage", storageClass);
        parameters.put(org.netbeans.mdr.persistence.btreeimpl.btreestorage.BtreeFactory.STORAGE_FILE_NAME, storageFile);
//        if ( packageProxyHandler != null ) parameters.put("PackageProxyHandler", packageProxyHandler);
//        if ( classProxyHandler != null ) parameters.put("ClassProxyHandler", classProxyHandler);
//        if ( instanceHandler != null ) parameters.put("InstanceHandler", instanceHandler);
//        if ( associationHandler != null ) parameters.put("AssociationHandler", associationHandler);
//        if ( structureHandler != null ) parameters.put("StructureHandler", structureHandler);
        //        instances.add(this);
    }
    
    /** Creates new {@link org.netbeans.api.mdr.MDRepository} with given parameters.

     *    <li><code>storage</code>: name of a class implementing {@link
     *          org.netbeans.mdr.persistence.StorageFactory}</li>
     *    <li><code>fileName</code>: storage location</li>
     *   </ol></p>
     *
     */
//     * <p>Additionally the following parameters allow to replace parts
//     *  of the MDR implementation by tailor-made classes, namely the base classes
//     *  for generated handler classes. This is an experimental feature, use
//     *  it with care. Currently no documentation is available about the features
//     *  the replacing classes must provide in order to cooperate with the generated code:</p>
//     *
//     *   <p><ol>
//     *    <li><code>PackageProxyHandler</code>: fully qualified name of the super-class
//     *              for package proxy implementations (default:
//     *              <code>org.netbeans.mdr.handler.PackageProxyHandler</code>)</li>
//     *    <li><code>ClassProxyHandler</code>: fully qualified name of the default super-class
//     *              for class proxy implementations (default:
//     *              <code>org.netbeans.mdr.handler.ClassProxyHandler</code>)</li>
//     *    <li><code>InstanceHandler</code>: fully qualified name of the default super-class
//     *              for instance implementations (default:
//     *              <code>org.netbeans.mdr.handler.InstanceHandler</code>)</li>
//     *    <li><code>AssociationHandler</code>: fully qualified name of the default super-class
//     *              for assocation proxy implementations (default:
//     *              <code>org.netbeans.mdr.handler.AssociationHandler</code>)</li>
//     *    <li><code>StructureHandler</code>: fully qualified name of the super-class
//     *              for structure implementations (default:
//     *              <code>org.netbeans.mdr.handler.StructImpl</code>)</li>
//     *  </ol></p>
//     *
//     */
    public NBMDRepositoryImpl(Map parameters) {
        Log.out.println("Creating MDRepository implementation ...");
        this.parameters = parameters;
        //        instances.add(this);
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
    /* -------------------------------------------------------------------- */
    
    /** Registers a listener for receiving event notifications with are
     *  initially fired on this object.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void addListener(MDRChangeListener listener) {
        addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
    }
    
    /** Registers a listener for receiving event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask bitmask to filter types of events the listener listens on
     */
    public void addListener(MDRChangeListener listener, int mask) {
        initCheck();
        mdrStorage.getEventNotifier().REPOSITORY.addListener(listener, mask, mdrStorage);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void removeListener(MDRChangeListener listener) {
        initCheck();
        mdrStorage.getEventNotifier().REPOSITORY.removeListener(listener, mdrStorage);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask determines type of the events the listeners stops to listen on
     */
    public void removeListener(MDRChangeListener listener, int mask) {
        initCheck();
        mdrStorage.getEventNotifier().REPOSITORY.removeListener(listener, mask, mdrStorage);
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Implementation of org.netbeans.api.mdr.MDRepositry -------------- */
    /* -------------------------------------------------------------------- */

        initCheck();
        mdrStorage.getRepositoryMutex().leave(rollback);
    }
    
    /** Instantiates the MOF model package.
     *
     *  @param substName the name of the new model
     */
    public RefPackage createExtent(String substName) throws CreationFailedException {
        return createExtent(substName, null);
    }
    

     *           package.
     *  @param existingInstances
     */
    public RefPackage createExtent(String substName, RefObject metaPackage, RefPackage[] existingInstances) throws CreationFailedException {
        return createExtent(substName, metaPackage, existingInstances, null);
    }
    
    /** Returns reference to an outermost package instance of a given name.
     * @param name name of package instance to be returned

     */
    public RefPackage getExtent(String name) {
        StorablePackage pkg;
        
        initCheck();
        
        try {
            beginTrans(false);
            
            try {
                // retrieve the package
                pkg = (StorablePackage) mdrStorage.getContextOutermostPackage(name);

     */
    public String[] getExtentNames() {
        initCheck();
        
        String result[] = new String[0];
        try {
            beginTrans(false);

            endTrans();
        }
    }

    /**
     * Returns the object with the given <code>mofId</code>.
     */
    public RefBaseObject getByMofId(String mofId) {
        initCheck();
        try {
            beginTrans(false);
            StorableBaseObject storable = mdrStorage.getObject(mofId);
            if ( storable == null ) {
                throw new NoSuchElementException("No object with MOF ID: " + mofId);
            } else {
                return BaseObjectHandler.getHandler(storable);
            }
        } catch (StorageException e) {
            e.printStackTrace();
            throw new DebugException();
        } finally {
            endTrans();
        }
    }
     
    /**
     * Called on repository exit. Should perform all needed finalization actions.
     */

            }
        }
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Extending java.lang.Object -------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    public String toString() {
        StringBuffer sb = new StringBuffer("IDE MOF Repository");
        return sb.toString();
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Create an outermost package instance ---------------------------- */
    /* -------------------------------------------------------------------- */

        initCheck();
        
        RefPackage result;
        
        boolean fail = true;
        if (metaPackage == null) {
            metaPackage = getMOFModelPackage();
        }
        ExtentEvent event = new ExtentEvent(
            this,
            ExtentEvent.EVENT_EXTENT_CREATE,
            substName,
            metaPackage,
            new ImmutableList(existingInstances)
        );
        
        try {
            beginTrans(true);
            mdrStorage.getEventNotifier().REPOSITORY.firePlannedChange(mdrStorage, event);
            Map instancesToCluster = new HashMap();
            
            // Traverse the metamodel containtment
            classProxies = new HashMap();
            associationProxies = new HashMap();
            classProxiesMofIds = new HashMap();
            
            if (existingInstances != null) {
                for (int i = 0; i < existingInstances.length; i++) {
                    collectPackageInstances(existingInstances[i], instancesToCluster);
                }
            }
        } else {
            boolean fail = true;
            if (metaPackage == null) {
                metaPackage = getMOFModelPackage();
            }
            ExtentEvent event = new ExtentEvent(
                this, 
                ExtentEvent.EVENT_EXTENT_CREATE, 
                substName,
                metaPackage, 
                new ImmutableList(existingInstances)
            );

            try {
                instantiatePackage(substName, null, (MofPackage) metaPackage, instancesToCluster, storageId, false);
            } catch (RuntimeException e) {
                e.printStackTrace();
                throw new CreationFailedException("Cannot instantiate package because of unexpected exception: " + e);
            }
            
            classProxies = null;
            associationProxies = null;
            classProxiesMofIds = null;
            
            result = getExtent(substName);
            if (result == null) {
                throw new CreationFailedException("Cannot find created package.");
                }
                try {
                    instantiatePackage(substName, null, (MofPackage) metaPackage, instancesToCluster, storageId, false);
                } catch (RuntimeException e) {
                    e.printStackTrace();
                    throw new CreationFailedException("Cannot instantiate package because of unexpected exception: " + e);
                }

                classProxies = null;
                associationProxies = null;
                classProxiesMofIds = null;

                result = getExtent(substName);
                if (result == null) {
                    throw new CreationFailedException("Cannot find created package.");
                }

                fail = false;
            } finally {
                endTrans(fail);
            }
            
            fail = false;
        } finally {
            endTrans(fail);
        }
        
        return result;
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Storage partitions ---------------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    /**
     *  Mounts new partition into current repository,
     *  The partition is created and initialized, if it does not exist.
     *  @param String storageFactoryClass, name of storage factory class, which will create a new storage.

     *  @return String id.
     *  @exception MountFailedException thrown when mounting fails.
     */
    public String mountStorage(String storageFactoryClass, Map properties) throws MountFailedException {
        boolean failed = true;
        try {
            beginTrans(true);
            // Firing of event is done inside a MdrStorage mountStorage method
            String storageId = this.mdrStorage.mountStorage(storageFactoryClass, properties);
            failed = false;
            return storageId;
        }catch (Exception e) {
            throw new MountFailedException("Partition mount failed.", e);
        }
        finally {
            endTrans(failed);
        }
    }
    
    /**
     *  Umounts partition from current repository.
     *  Umounting partition can affect validity of association links
     *  which cross partitions. Module developer is responsible for
     *  either removing cross partition links or handling exceptions
     *  caused by accessing these links.
     *  @param String storageId, id of storage.
     */
    public void umountStorage(String storageId) {
        boolean failed = true;
        try {
            beginTrans(true);
            Collection c = mdrStorage.getContexts(storageId);
            for (Iterator it = c.iterator(); it.hasNext();) {
                String extentName = (String)it.next();
                RefPackage pkg = this.getExtent(extentName);
                ExtentEvent event = new ExtentEvent(pkg, ExtentEvent.EVENT_EXTENT_DELETE, extentName, pkg.refMetaObject(), null);
                this.mdrStorage.getEventNotifier().PACKAGE.firePlannedChange(pkg, event);
            }
            this.mdrStorage.umountStorage(storageId);
            failed = false;
        }catch (StorageException e) {
            throw new DebugException("Umounting failed: "+e.toString());
        }
        finally {
            endTrans(failed);
        }
    }
    /* -------------------------------------------------------------------- */

    public String getMOFInstanceName() {
        return PURE_MOF;
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Private helper methods ------------------------------------------ */
    /* -------------------------------------------------------------------- */

    private MofPackage getMOFModelPackage() {
        ModelPackage mofPackage = (ModelPackage) getExtent(getMOFInstanceName());
        MofPackage result;
        
        for (Iterator it = mofPackage.getMofPackage().refAllOfClass().iterator(); it.hasNext();) {
            result = (MofPackage) it.next();
            if (result.getName().equals("Model")) {

        return null;
    }
    
    /**
     * Initializes the repository, if not already initialized: creates and
     * initializes the {@link org.netbeans.mdr.storagemodel.MDRStorage}. If
     * necessary the repository is bootstrapped.

    private synchronized void initCheck() {
        if (mdrStorage == null) {
            String storageClass = (String) parameters.get(PARAM_STORAGE_CLASS);
            
            mdrStorage = new MdrStorage(this, storageClass, this.parameters);
            try {
                System.out.println("initializing...");

            }
        }
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Helper methods for extent creation (private) -------------------- */
    /* -------------------------------------------------------------------- */
    
    /**
     *  Helper method needed for the creation of a new outermost package instance.
     *  Puts <code>pkg</code> and, recursively, all its nested packages

     *                   of their meta-objects as key
     *  @exception CreationFailedException if two different packages with the
     *                same keys are added to <code>packages</code>
     *
     */
    private void collectPackageInstances(RefPackage pkg, Map packages) throws CreationFailedException {
        Object result = packages.put(pkg.refMetaObject().refMofId(), pkg);
        if (result != null && !result.equals(pkg)) {
            throw new CreationFailedException("The provided list of existing package instances contains duplicities.");

            collectPackageInstances(nested, packages);
        }
    }
    
    /** Instantiates given package, i.e. packageProxies, classProxies,
     * associationProxies.
     *

     * @param metaPackage outermost M2 package
     * @param clusteredInstances maps MOF IDs of M2 packages to M1 package instances
     * @param storageId ID of the storage partition
     */
    private RefPackage instantiatePackage(String substName, StorablePackage immediatePackage, MofPackage metaPackage, Map clusteredInstances, String storageId, boolean clustered) {
        // Create package proxy
        StorablePackage newPackage = createPackageHandler(metaPackage, immediatePackage, substName, storageId, clustered);
        System.out.println("new package: " + newPackage.getMofId() + ", metapackage: " + metaPackage.refMofId());
        
        Log.out.indent();
        
        Set localAssocProxies = new HashSet();
        Map localClassProxies = new HashMap();
        instantiatePackageContent(metaPackage, newPackage, clusteredInstances, localClassProxies, localAssocProxies);
        resolveSuperclasses(localClassProxies);
        
        // [PENDING] need to fix the mutex ordering and NPE and then uncomment this
        /*

        return (RefPackage) BaseObjectHandler.getHandler(newPackage);
    }
    
    
    /**
     * @param localClassProxies
     */

                }
                sc.addSuperclass(current.getMofId());
                current.addSubclass(sc.getMofId());
            }
            for (Iterator contents = cls.getContents().iterator(); contents.hasNext();) {
                me = (ModelElement) contents.next();
                if (me instanceof Reference) {

            }
            if (indexTags.size() > 0) {
                try {
                    sc.buildAdditionalIndexes(indexTags, associationProxies);
                } catch (StorageException e) {
                    throw new DebugException("Storage exception: " + e);
                }
            }
             */
        } // for
        
    }
    
    /**
     * @param metaPackage
     * @param newPackage

     */
    private void instantiatePackageContent(MofPackage metaPackage, StorablePackage newPackage, Map clusteredInstances, Map localClassProxies, Set localAssocProxies) {
        Iterator superTypes = metaPackage.allSupertypes().iterator();
        boolean thisTypeNotProcessed = true;
        while (thisTypeNotProcessed || superTypes.hasNext()) {
            Iterator it;
            if (thisTypeNotProcessed) {
                it = metaPackage.getContents().iterator();
                thisTypeNotProcessed = false;
            } else
                it = ((MofPackage) superTypes.next()).getContents().iterator();
            
            while (it.hasNext()) {
                Object o = it.next();
                ModelElement element = (ModelElement) o;
                
                if (element instanceof javax.jmi.model.MofClass) {
                    createClassProxyHandler((javax.jmi.model.MofClass) element, newPackage, localClassProxies);
                } else if (element instanceof  javax.jmi.model.Association) {
                    Association assoc = (Association) element;
                    
                    Collection content = assoc.getContents();
                    int i = 0;
                    AssociationEnd ends[] = new AssociationEnd[2];

                    boolean orderA, orderB, uniqueA, uniqueB, aggrA, aggrB, indexedA, indexedB;
                    int minA, maxA, minB, maxB;
                    Class typeA, typeB;
                    
                    minA = ends[0].getMultiplicity().getLower();
                    maxA = ends[0].getMultiplicity().getUpper();
                    minB = ends[1].getMultiplicity().getLower();

                    orderB = (ends[1].getMultiplicity().isOrdered());
                    uniqueA = (ends[0].getMultiplicity().isUnique());
                    uniqueB = (ends[1].getMultiplicity().isUnique());
                    
                    aggrA = ends[0].getAggregation().equals(AggregationKindEnum.COMPOSITE);
                    aggrB = ends[1].getAggregation().equals(AggregationKindEnum.COMPOSITE);
                    
                    indexedA = TagSupport.getTagValue((StorableObject) ((BaseObjectHandler) ends[0])._getDelegate(), TAGID_INDEX) != null;
                    indexedB = TagSupport.getTagValue((StorableObject) ((BaseObjectHandler) ends[1])._getDelegate(), TAGID_INDEX) != null;
                    if (TagProvider.getTagValue(ends[0].getType(), TRANSIENT_TAG_ID, "").equals(TAG_VALUE_TRUE)
                    || TagProvider.getTagValue(ends[1].getType(), TRANSIENT_TAG_ID, "").equals(TAG_VALUE_TRUE)) {
                        createTransientAssociationHandler((javax.jmi.model.Association) element, newPackage, ends[0].getName(), ends[0].refMofId(), ends[1].getName(), ends[1].refMofId(), typeA, typeB, minA, maxA, minB, maxB, orderA, orderB, uniqueA, uniqueB, aggrA, aggrB, localAssocProxies);
                    }
                    else {
                        createAssociationHandler((javax.jmi.model.Association) element, newPackage, ends[0].getName(), ends[0].refMofId(), ends[1].getName(), ends[1].refMofId(), typeA, typeB, minA, maxA, minB, maxB, orderA, orderB, uniqueA, uniqueB, aggrA, aggrB, indexedA, indexedB, localAssocProxies);
                    }
                    
                } else if (element instanceof  MofPackage) {
                    //                System.out.println("found inner package");
                    //                System.out.println("creating: META: " + element.refMofId() + ", IMMEDIATE: " + newPackage.refMofId() + ", CONTEXT: " + context);
                    String storageId = MdrStorage.getStorageIdFromMofId(newPackage.getMofId());
                    StorablePackage pkg = createPackageHandler((MofPackage) element, newPackage, null, storageId, false);
                    instantiatePackageContent((MofPackage) element, pkg, clusteredInstances, localClassProxies, localAssocProxies);
                } else if (element instanceof Import) {
                    Import imp = (Import) element;
                    
                    if (imp.isClustered()) {
                        ModelElement metaElement = imp.getImportedNamespace();
                        if (metaElement instanceof MofPackage) {
                            MofPackage metaPkg = (MofPackage) metaElement;
                            RefPackage pkg = (RefPackage) clusteredInstances.get(metaPkg.refMofId());
                            if (pkg == null) {
                                String storageId = MdrStorage.getStorageIdFromMofId(newPackage.getMofId());
                                pkg = instantiatePackage(null, newPackage, metaPkg, clusteredInstances, storageId, true);
                                clusteredInstances.put(metaPkg.refMofId(), pkg);
                            } else {

                // this package was already collected
                return;
            }
            classProxies.put((MofClass) cls.refMetaObject(), ((BaseObjectHandler) cls)._getDelegate());
        }
        
        for (Iterator it = pkg.refAllPackages().iterator(); it.hasNext();) {
            collectAllProxies((RefPackage) it.next());
        }
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Helper methods for handler creation (private) ------------------- */
    /* -------------------------------------------------------------------- */

                    ModelElement me;
                    List members = new ArrayList();
                    List memberTypes = new ArrayList();
                    
                    for (Iterator it2 = ((StructureType) element).getContents().iterator(); it2.hasNext();) {
                        me = (ModelElement) it2.next();
                        if (me instanceof StructureField) {

                    datatypes.put(element.getName(), new DatatypeDescriptor(mdrStorage, element.getQualifiedName(), members, memberTypes, ifcName, storageId));
                }
            }
            
            StorablePackage result = null;
            if (storageId != null) {
                result = new StorablePackage(mdrStorage, immediatePackage == null ? null : immediatePackage.getMofId(), metaObject.refMofId(), context, datatypes, storageId);

            if (immediatePackage != null && !clustered) {
                immediatePackage.addPackage(metaObject.getName(), result.getMofId());
            }
            
            return result;
        } catch ( StorageException e ) {
            throw new DebugException("Storage exception: " + e.getMessage());
        }
    }
    
    /** Creates handler for Class Proxy */
    private StorableClass createClassProxyHandler(javax.jmi.model.MofClass metaObject, StorablePackage immediatePackage, Map localClassProxies) {
        ModelElement element;

                    if (element instanceof EnumerationType) {
                        List members = new ArrayList(((EnumerationType) element).getLabels());
                        String ifcName = TagSupport.getTypeFullName((StorableObject) ((BaseObjectHandler) element)._getDelegate());
                        datatypes.put(element.getName(), new DatatypeDescriptor(mdrStorage, members, ifcName, MdrStorage.getStorageIdFromMofId(immediatePackage.getMofId())));
                    } else if (element instanceof StructureType) {
                        ModelElement me;
                        List members = new ArrayList();
                        List memberTypes = new ArrayList();
                        
                        for (Iterator it2 = ((StructureType) element).getContents().iterator(); it2.hasNext();) {
                            me = (ModelElement) it2.next();
                            if (me instanceof StructureField) {

                            }
                        }
                        String ifcName = TagSupport.getTypeFullName((StorableObject) ((BaseObjectHandler) element)._getDelegate());
                        datatypes.put(element.getName(), new DatatypeDescriptor(mdrStorage, element.getQualifiedName(), members, memberTypes, ifcName, MdrStorage.getStorageIdFromMofId(immediatePackage.getMofId())));
                    }
                    isDerived = false;
                    isInterceptable = false;

                }
            }
            
            String tagValue = TagProvider.getTagValue(metaObject, TRANSIENT_TAG_ID, "");
            if (tagValue.equals(TAG_VALUE_TRUE)) {
                storable = new TransientStorableClass(mdrStorage, immediatePackage.getMofId(),
                metaObject.refMofId(), attrDescs, clAttrDescs, datatypes, classDerived,
                instanceDerived, metaObject.isSingleton(), metaObject.isAbstract());
            }
            else {
                storable = new StorableClass(mdrStorage, immediatePackage.getMofId(),
                metaObject.refMofId(), attrDescs, clAttrDescs, datatypes, classDerived,
                instanceDerived, metaObject.isSingleton(), metaObject.isAbstract());
            }
            
            immediatePackage.addClass(metaObject.getName(), storable.getMofId());
            classProxies.put(metaObject, storable);
            classProxiesMofIds.put(metaObject.refMofId(), storable.getMofId());
            localClassProxies.put(metaObject, storable);
            return storable;
        } catch ( StorageException e ) {
            e.printStackTrace();
            throw new DebugException("Storage exception: " + e.getMessage());
        }
    }
    
    /** Creates handler for Association */
    private StorableAssociation createAssociationHandler(
    javax.jmi.model.Association metaObject,
    StorablePackage immediatePackage,
    String assocationEnd1, String assocEnd1MofId,
    String assocationEnd2, String assocEnd2MofId,
    Class type1, Class type2,
    int min1, int max1,
    int min2, int max2,
    boolean isOrdered1,
    boolean isOrdered2,
    boolean isUnique1,
    boolean isUnique2,
    boolean isAggr1,
    boolean isAggr2,
    boolean isIndexed1,
    boolean isIndexed2,
    Set localAssocProxies) {
        
        try {
            StorableAssociation result = new StorableAssociation(
            mdrStorage,
            immediatePackage.getMofId(),
            metaObject.refMofId(),
            assocationEnd1, assocEnd1MofId, assocationEnd2, assocEnd2MofId,
            type1, type2,
            min1, max1, min2, max2,
            isOrdered1, isOrdered2,
            isUnique1, isUnique2,
            isAggr1, isAggr2,
            isIndexed1, isIndexed2);
            immediatePackage.addAssociation(metaObject.getName(), result.getMofId());
            associationProxies.put(metaObject.refMofId(), result.getMofId());
            localAssocProxies.add(result.getMofId());

    }
    
    private StorableAssociation createTransientAssociationHandler(
    javax.jmi.model.Association metaObject,
    StorablePackage immediatePackage,
    String assocationEnd1, String assocEnd1MofId,
    String assocationEnd2, String assocEnd2MofId,
    Class type1, Class type2,
    int min1, int max1,
    int min2, int max2,
    boolean isOrdered1,
    boolean isOrdered2,
    boolean isUnique1,
    boolean isUnique2,
    boolean isAggr1,
    boolean isAggr2,
    Set localAssocProxies) {
        
        try {
            StorableAssociation result = new TransientStorableAssociation(
            mdrStorage,
            immediatePackage.getMofId(),
            metaObject.refMofId(),
            assocationEnd1, assocEnd1MofId, assocationEnd2, assocEnd2MofId,
            type1, type2,
            min1, max1, min2, max2,
            isOrdered1, isOrdered2,
            isUnique1, isUnique2,
            isAggr1, isAggr2);
            immediatePackage.addAssociation(metaObject.getName(), result.getMofId());
            associationProxies.put(metaObject.refMofId(), result.getMofId());
            localAssocProxies.add(result.getMofId());

    /* -------------------------------------------------------------------- */
    /* -- Methods for bootstrapping (private) ----------------------------- */
    /* -------------------------------------------------------------------- */
    
    /**
     * Main bootstrapping method.
     */

        try {
            beginTrans(true);
            installFakeMof();
            installPureMof();
            fail = false;
        } catch (Throwable e) {
            e.printStackTrace();

            endTrans(fail);
        }
        Log.out.unindent();
    }
    
    /** Installs the fake MOF
     */
    private void installFakeMof() {
        Log.out.println("Creating boot MOF metamodel ...");
        
        createBootMOF();
        if (getExtent(BOOT_MOF) == null) {
            throw new DebugException("Cannot create instance of BOOT_MOF: Fatal error during bootstrapping.");
            e.printStackTrace();
            throw new DebugException("Cannot create instance of BOOT_MOF: " + e.getMessage());
        }
    }
    
    /**  Programatically installs the pure MOF model.
     */
    private void installPureMof() {
        Log.out.println("Installing pure MOF Metamodel ... ");
        Log.out.indent();
        
        try {
            Log.out.println("Parsing MOF model to DOM represtentation ....");
            ModelPackage modelPackage = (ModelPackage) createExtent(PURE_MOF, getBMModelPackage());

            Log.out.unindent();
        }
    }
    
    /**
     * Returns the MOF Model package as a model element of the
     * bootstrapping MOF model. Needed only during bootstrapping.

        }
        return null;
    }
    
    /** Reads the XMI description of the mof directly into reporitory
     */
    private void createBootMOF() {
        try {
            BootReader br = new BootReader(mdrStorage, BOOTMOF_XML_URL);

Lines 302-321 Link Here

(-)src/org/netbeans/mdr/handlers/AssociationHandler.java (-5 / +30 lines)
302	/*	302	/*
303	public void replace(RefObject oldEnd1, RefObject oldEnd2, RefObject newEnd1, RefObject newEnd2) {	303	public void replace(RefObject oldEnd1, RefObject oldEnd2, RefObject newEnd1, RefObject newEnd2) {
304	}	304	}
		305
		306	/* -------------------------------------------------------------------- */
		307	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
		308	/* -------------------------------------------------------------------- */
		309
		310	/** Registers a listener for receiving event notifications with are
		311	* initially fired on this object.
		312	* @param listener Object that implements {@link MDRChangeListener} interface.
305	*/	313	*/
		314	public void addListener(MDRChangeListener listener) {
		315	addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
		316	}
		317
306	/** Registers a listener for receiving event notifications.	318	/** Registers a listener for receiving event notifications.
307	* @param listener Object that implements {@link Listener} interface.	319	* @param listener Object that implements {@link MDRChangeListener} interface.
		320	* @param mask bitmask to filter types of events the listener listens on
308	*/	321	*/
309	public void addListener(MDRChangeListener listener) {	322	public void addListener(MDRChangeListener listener, int mask) {
310	_getMdrStorage().getEventNotifier().ASSOCIATION.addListener(listener, this);	323	_getMdrStorage().getEventNotifier().ASSOCIATION.addListener(listener, mask, this);
311	}	324	}
312		325
313	/** Removes listener from the list of objects registered for events notifications.	326	/** Removes listener from the list of objects registered for event notifications.
314	* @param listener Object that implements {@link Listener} interface.	327	* @param listener Object that implements {@link MDRChangeListener} interface.
315	*/	328	*/
316	public void removeListener(MDRChangeListener listener) {	329	public void removeListener(MDRChangeListener listener) {
317	_getMdrStorage().getEventNotifier().ASSOCIATION.removeListener(listener, this);	330	_getMdrStorage().getEventNotifier().ASSOCIATION.removeListener(listener, this);
318	}	331	}
		332
		333	/** Removes listener from the list of objects registered for event notifications.
		334	* @param listener Object that implements {@link MDRChangeListener} interface.
		335	* @param mask determines type of the events the listeners stops to listen on
		336	*/
		337	public void removeListener(MDRChangeListener listener, int mask) {
		338	_getMdrStorage().getEventNotifier().ASSOCIATION.removeListener(listener, mask, this);
		339	}
		340
		341	/* --------------------------------------------------------------------- */
		342	/* -- -- */
		343	/* --------------------------------------------------------------------- */
319		344
320	static void _removeExternalLink(AssociationHandler associationHandler, RefObject thisEnd, RefObject otherEnd) {	345	static void _removeExternalLink(AssociationHandler associationHandler, RefObject thisEnd, RefObject otherEnd) {
321	if (MdrStorage.isTransientMofId (thisEnd.refMofId ()) \|\| MdrStorage.isTransientMofId (otherEnd.refMofId ()))	346	if (MdrStorage.isTransientMofId (thisEnd.refMofId ()) \|\| MdrStorage.isTransientMofId (otherEnd.refMofId ()))




 * @version 
 */
public abstract class BaseObjectHandler extends ImplClass implements MDRObject/*, OclAny*/ {
    
    /* --------------------------------------------------------------------- */
    /* -- Static attributes ------------------------------------------------ */
    /* --------------------------------------------------------------------- */
    
    /**
     * Maps storage objects (instances of {@link StorableBaseObject}) to
     * JMI compliant handler objects (instances of {@link RefBaseObject}).
     */
    private static final Map facilityCache = new FacilityCache();
    
    /**
     * Maps mof ids of meta-objects to the appropriate JMI interfaces (String =&gt; Class).
     */
    private static final Hashtable classCache = new Hashtable();

    private static MDRClassLoader defaultLoader = null;
    private static ClassLoaderProvider provider = null;

    /** The object in strorage to delegate to
    */
//    private final StorableBaseObject storableDelegate;
    private final String mofId;
    private final MdrStorage mdrStorage;
    private StorableBaseObject storable;
    
    /* --------------------------------------------------------------------- */
    /* -- Static setters/getters ------------------------------------------- */
    /* --------------------------------------------------------------------- */
    
    public static synchronized void setClassLoaderProvider(ClassLoaderProvider provider) {
        BaseObjectHandler.provider = provider;
    }
    
    public static synchronized MDRClassLoader getDefaultClassLoader() {
        if (defaultLoader == null) {
            defaultLoader = new MDRClassLoader(provider);
        }
//	System.out.println(defaultLoader.toString() + " : " + defaultLoader.getClass().getName());
        return defaultLoader;   
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Static helper methods (private) ---------------------------------- */
    /* --------------------------------------------------------------------- */

    /**
     * Returns the handler class for JMI interface <code>ifc</code> and storage object <code>s</code>.
     *
     * @param loader the class loader for the definition of new classes
     * @param ifc JMI interface to be implemented by the class
     * @param s storage object to be wrapped by an instances of the class
     * @return class implementing <code>ifc</code>
     */
    private static Class getHandlerClass(MDRClassLoader loader, Class ifc, StorableBaseObject s) throws IllegalArgumentException {
        /* check if the loader may load the interface */
        check(loader, ifc);
        /* try to load from cache */
        Map cache = getLoaderCache(loader);
        String className = getName(ifc);
        Class result = getFromCache(cache, ifc, className);
        
        if (result == null) {
            try {
                /* generate and define handler class */
                byte[] handlerClassFile = HandlerGenerator.generateHandler(className, ifc, s);
                
                /* [XXX] Allow the use of a system property org.netbeans.mdr.byteCodeDir, write class
                 * files to that directory, if the system property is set.
                 */
//                try {
//                    java.io.FileOutputStream file = new java.io.FileOutputStream("e:/classes/" + className.substring(className.lastIndexOf('.') + 1) + ".class");
//                    file.write(handlerClassFile);
//                    file.close();
//                } catch (Exception e) {
//                    e.printStackTrace();
//                }
                
                result = loader.defineClass(className, handlerClassFile);
            } finally {
                releaseCache(cache, result, className);

        return result;
    }

    /**
     * Returns the JMI interface to be implemented by the handler of <code>s</code>.
     *
     * @param s a storage object
     * @return the JMI interface for <code>s</code>
     */
    private static Class resolveClass(StorableBaseObject s) {
        try {
            StorableObject metaObject = s.getMetaObject();
            String suffix;

            /* cache lookup */
            if (s instanceof StorableObject || s instanceof StorableAssociation) {
                suffix = "";
            } else if (s instanceof StorablePackage) {

            String key = metaObject.getMofId() + ":" + suffix;
            Class result = (Class) classCache.get(key);

            /* interface resolution */
            if (result == null) {
                try {
                    String metaName = TagSupport.getTypeFullName(metaObject);

            throw new DebugException();
        }
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Static methods (public) ------------------------------------------ */
    /* --------------------------------------------------------------------- */

    /**
     * Frees the caches of JMI compliant handler objects (for storage objects)
     * and of JMI implementation classes (for meta-objects).
     */
    public static void _freeCache() {
        facilityCache.clear();
        classCache.clear();
    }
    
    /**
     * Returns JMI compliant handler object for <code>s</code>.
     *
     * @param s the storage object to be wrapped or <code>null</code>
     * @return handler implementing JMI interface or <code>null</code>
     */
    public static RefBaseObject getHandler(StorableBaseObject s) throws IllegalArgumentException {
        if (s == null) {
            return null;

        return getHandler(s, ifc);
    }
    
    /**
     * Returns JMI compliant handler object for <code>s</code>.
     *
     * @param s the storage object to be wrapped or <code>null</code>
     * @param ifc the JMI interface to be implemented by the handler
     * @return handler implementing JMI interface or <code>null</code>
     */
    public static RefBaseObject getHandler(StorableBaseObject s, Class ifc) throws IllegalArgumentException {
	if (s == null) {
	    return null;
	}

        /* [XXX] For performance reasons the following piece of code should
         * be enabled, when it is expected that cache lookup succeeds quite
         * often. hkrug@rationalizer.com */
//        Object oldRecord;
//        synchronized (facilityCache) {
//            oldRecord = facilityCache.get(s.getMofId());
//        }
//        if ( oldRecord != null ) {
//            return oldRecord;
//        }
        
        /* load the handler class */
        MDRClassLoader loader = getDefaultClassLoader();
	Class cl = getHandlerClass(loader, ifc, s);


            else if (cls.equals (TransientStorableAssociation.class)) {
                cls = StorableAssociation.class;
            }
            /* create handler object, if necessary */
            Constructor cons = cl.getConstructor(new Class[] {cls});

            synchronized (facilityCache) {

	}
    }
    
    /**
     * Returns interface <code>ifcName</code>. The interface is not generated on the
     * fly, but must be available for loading by the default class-loader
     * (see {@link #getDefaultClassLoader()}).
     *
     * @param ifcName name of the interface to be loaded
     * @return the interface named <code>ifcName</code>
     */
//	System.out.println(defaultLoader.toString() + " : " + defaultLoader.getClass().getName());
        return defaultLoader;   
    }
    
    public static Class resolveInterface(String ifcName) throws ClassNotFoundException {
        try {
            return Class.forName(ifcName, true, getDefaultClassLoader());

	}
    }
        
    /**
     * Loads the class <code>implName</code> from the default class loader.
     *
     * @param implName class name
     * @return the class
     */
    public static Class resolveImplementation(String implName) throws ClassNotFoundException {
        try {
            return Class.forName(implName, true, getDefaultClassLoader());

            throw e;
        }
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Private attributes ----------------------------------------------- */
    /* --------------------------------------------------------------------- */

//    /** The object in strorage to delegate to
//    */
//    private final StorableBaseObject storableDelegate;
    private final String mofId;
    private final MdrStorage mdrStorage;
    private StorableBaseObject storable;
    
    /* --------------------------------------------------------------------- */
    /* -- Constructor(s) --------------------------------------------------- */
    /* --------------------------------------------------------------------- */

    /** Creates new RefBaseObjectHandler */
    protected BaseObjectHandler(StorableBaseObject storable) {

            this.storable = null;
        }
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Transaction related methods -------------------------------------- */
    /* --------------------------------------------------------------------- */
    
    protected final void _lock() {
        _lock(true);
                storableDelegate = new SoftReference(storable);
            } catch (StorageException e) {
                throw new DebugException("Storage exception: " + e);
            }
        }
 */
        try {
            if (this.storable != null)
                return this.storable;
            else
                return mdrStorage.getObject(mofId);
        } catch (StorageBadRequestException e) {
            throw new InvalidObjectException(null, "Object with MOFID " + mofId + " no longer exists.");
        } catch (StorageException e) {
            throw new DebugException(e.toString());
        }
        //return storableDelegate;
    }
    
    protected final void _lock(boolean write) {
        mdrStorage.getRepositoryMutex().enter(write);
    }
    
    protected final void _unlock() {
        mdrStorage.getRepositoryMutex().leave();
    }

    protected final void _unlock(boolean fail) {
        mdrStorage.getRepositoryMutex().leave(fail);
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Implements org.netbeans.api.mdr.MDRObject ------------------------ */
    /* --------------------------------------------------------------------- */
    
    public final MDRepository repository() {
        return mdrStorage.getRepository();
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Extends java.lang.Object ----------------------------------------- */
    /* --------------------------------------------------------------------- */

    public final boolean equals(Object obj) {
        if (obj instanceof BaseObjectHandler) {

    public final int hashCode() {
        return refMofId().hashCode();
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Implements javax.jmi.reflect.RefBaseObject ----------------------- */
    /* --------------------------------------------------------------------- */

    public final RefObject refMetaObject() {
        try {

        else return _verify(new ArrayList());
    }
    
    /* --------------------------------------------------------------------- */
    /* -- --------------------------------------------------- */
    /* --------------------------------------------------------------------- */

    public final StorableBaseObject _getDelegate() {
/*        
        StorableBaseObject storable = (StorableBaseObject) storableDelegate.get();
        if (storable == null) {
            try {
                storable = mdrStorage.getObject(mofId);
                storableDelegate = new SoftReference(storable);
            } catch (StorageException e) {
                throw new DebugException("Storage exception: " + e);
            }
        }
 */
        try {
            if (this.storable != null)
                return this.storable;
            else
                return mdrStorage.getObject(mofId);
        } catch (StorageBadRequestException e) {
            throw new InvalidObjectException(null, "Object with MOFID " + mofId + " no longer exists.");
        } catch (StorageException e) {
            throw new DebugException(e.toString());
        }
        //return storableDelegate;
    }
    
    protected final MdrStorage _getMdrStorage() {
        return mdrStorage;
    }
    
    /* --------------------------------------------------------------------- */
    /* -- Methods to be overridden by sub-classes -------------------------- */
    /* --------------------------------------------------------------------- */

    protected abstract Collection _recursiveVerify(Collection violations, Set visited);
    protected abstract Collection _verify(Collection violations);

    /* --------------------------------------------------------------------- */
    /* -- FacilityCache (static inner class) ------------------------------- */
    /* --------------------------------------------------------------------- */

    /** Weak cache for created Handlers
    */




    /* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
    /* -------------------------------------------------------------------- */
    
    /** Registers a listener for receiving event notifications with are
     *  initially fired on this object.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void addListener(MDRChangeListener listener) {
        addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
    }
    
    /** Registers a listener for receiving event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask bitmask to filter types of events the listener listens on
     */
    public void addListener(MDRChangeListener listener, int mask) {
        _getMdrStorage().getEventNotifier().CLASS.addListener(listener, mask, this);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void removeListener(MDRChangeListener listener) {
        _getMdrStorage().getEventNotifier().CLASS.removeListener(listener, this);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask determines type of the events the listeners stops to listen on
     */
    public void removeListener(MDRChangeListener listener, int mask) {
        _getMdrStorage().getEventNotifier().CLASS.removeListener(listener, mask, this);
    }
    
    /* -------------------------------------------------------------------- */
    /* -- ClassProxyHandler.CreateInstanceEvent (inner class) ------------- */
    /* -------------------------------------------------------------------- */

Lines 88-94 Link Here

(-)src/org/netbeans/mdr/handlers/FeaturedHandler.java (-1 / +1 lines)
88	}	88	}
89		89
90		90
91	// Methods to refine for classes with the intercaptable tag set --------------	91	// Methods to refine for classes with the interceptable tag set --------------
92		92
93	protected void _interceptPreSet(String featureName, Object newValue) {	93	protected void _interceptPreSet(String featureName, Object newValue) {
94	}	94	}




    /* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
    /* -------------------------------------------------------------------- */
    
    /** Registers a listener for receiving event notifications with are
     *  initially fired on this object.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void addListener(MDRChangeListener listener) {
        addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
    }
    
    /** Registers a listener for receiving event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask bitmask to filter types of events the listener listens on
     */
    public void addListener(MDRChangeListener listener, int mask) {
        _getMdrStorage().getEventNotifier().INSTANCE.addListener(listener, mask, this);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void removeListener(MDRChangeListener listener) {
        _getMdrStorage().getEventNotifier().INSTANCE.removeListener(listener, this);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask determines type of the events the listeners stops to listen on
     */
    public void removeListener(MDRChangeListener listener, int mask) {
        _getMdrStorage().getEventNotifier().INSTANCE.removeListener(listener, mask, this);
    }

    /* ---------------------------------------------------------------- */




    /* -------------------------------------------------------------------- */
    /* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
    /* -------------------------------------------------------------------- */
    
    /** Registers a listener for receiving event notifications with are
     *  initially fired on this object.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void addListener(MDRChangeListener listener) {
        addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
    }
    
    /** Registers a listener for receiving event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask bitmask to filter types of events the listener listens on
     */
    public void addListener(MDRChangeListener listener, int mask) {
        _getMdrStorage().getEventNotifier().PACKAGE.addListener(listener, mask, this);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     */
    public void removeListener(MDRChangeListener listener) {
        _getMdrStorage().getEventNotifier().PACKAGE.removeListener(listener, this);
    }
    
    /** Removes listener from the list of objects registered for event notifications.
     * @param listener Object that implements {@link MDRChangeListener} interface.
     * @param mask determines type of the events the listeners stops to listen on
     */
    public void removeListener(MDRChangeListener listener, int mask) {
        _getMdrStorage().getEventNotifier().PACKAGE.removeListener(listener, mask, this);
    }
    
    /* ---------------------------------------------------------------- */




import java.util.*;

/**
 * [XXX]: put this class into correct package !
 *
 * @author  mmatula
 * @version 


    private static final String CONSTRUCTOR_DESCRIPTOR = "(Ljava/util/List;Ljava/util/Map;Ljava/util/List;)V";

    private StructGenerator(String className, Class ifc, Class superClass) {
        super(className, ifc, superClass);
    }

    public static byte[] generateStruct(final String name, Class ifc, Class superClass) {
	StructGenerator gen = new StructGenerator(name, ifc, superClass);
	final byte[] classFile = gen.generateClassFile();

	return classFile;




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
 * Microsystems, Inc. All Rights Reserved.

import org.netbeans.mdr.storagemodel.*;

/**
 * Abstract base class for generated structure implementations.
 *
 * <p>[XXX]: Replacing this class by a repository parameter is not yet
 *   implemented. The problem is, that in {@link #newInstance(Class, List, Map, List)}
 *   there is no access to the <code>MdrStorage</code> which holds this parameter.</p>
 *
 * @author  mmatula
 * @version
 */
public abstract class StructImpl extends ImplClass implements RefStruct {
    
    /* -------------------------------------------------------------------- */
    /* -- Factory methods (static) ---------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    /**
     * Returns the structure implementation implementing <code>ifc</code>.
     *
     * @param loader the class-loader for the definition of the implementation class
     * @param ifc the interface to be implementated by the implementation class
     * @param superClass the super class for structure implementations
     * @return a class implementing <code>ifc</code>
     */
    private static Class getStructClass(MDRClassLoader loader, Class ifc, Class superClass) throws IllegalArgumentException {
        check(loader, ifc);
        Map cache = getLoaderCache(loader);
        String className = getName(ifc);

        
        if (result == null) {
            try {
                byte[] structClassFile = StructGenerator.generateStruct(className, ifc, superClass);
                result = loader.defineClass(className, structClassFile);
            } finally {
                releaseCache(cache, result, className);

        return result;
    }
    
    private static Class getStructClass(MDRClassLoader loader, Class ifc) throws IllegalArgumentException {
        return getStructClass(loader, ifc, StructImpl.class);
    }
    
    public static RefStruct newInstance(DatatypeDescriptor dataType, Object fieldValues[]) {
        try {
            HashMap values = new HashMap(fieldValues.length, 1);

        }
    }
    
    /**
     * @param ifc  the specific JMI interface for the structure type
     * @param fields list of field names
     * @param values maps field names to field values
     * @param qualifiedName fully qualified name of the structure type
     */
    public static RefStruct newInstance(Class ifc, List fields, Map values, List qualifiedName) {
        MDRClassLoader loader = BaseObjectHandler.getDefaultClassLoader();
        Class cl = getStructClass(loader, ifc, StructImpl.class);
        
        try {
            Constructor cons = cl.getConstructor(new Class[] {List.class, Map.class, List.class});
            RefStruct struct = (RefStruct) cons.newInstance(new Object[] {fields, values, qualifiedName});
            
            return struct;
        } catch (NoSuchMethodException e) {
            e.printStackTrace();
            throw new DebugException(e.toString());
        } catch (IllegalAccessException e) {
            e.printStackTrace();
            throw new DebugException(e.toString());
        } catch (InstantiationException e) {
            e.printStackTrace();
            throw new DebugException(e.toString());
        } catch (InvocationTargetException e) {
            e.printStackTrace();
            throw new DebugException(e.toString());
        }
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Attributes (private) -------------------------------------------- */
    /* -------------------------------------------------------------------- */

    /**
     * Field names
     */
    private final List fields;
    /**
     * Field names =&gt; values
     */
    private final Map values;
    /**
     * Fully qualified name of metaobject
     */
    private final List qualifiedName;
    
    /* -------------------------------------------------------------------- */
    /* -- Constructor (protected) ----------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    /** Creates new StructHandler */
    protected StructImpl(List fields, Map values, List qualifiedName) {
        this.values = values;
        this.qualifiedName = qualifiedName;
        this.fields = fields;
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Methods to be called by generated classes ----------------------- */
    /* -------------------------------------------------------------------- */
    
    protected Object handleGet(String memberName) {
        return refGetValue(memberName);
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Implements of javax.jmi.reflect.RefStruct ----------------------- */
    /* -------------------------------------------------------------------- */
    
    public Object refGetValue(String memberName) {
        if (values.containsKey(memberName)) {
            return values.get(memberName);
        } else {
            throw new InvalidNameException(memberName);
        }
    }
    

    public List refTypeName() {
        return this.qualifiedName;
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Extends java.lang.Object ---------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    // [XXX]: hashCode() must be implemented, too !
    
    public boolean equals(Object other) {
        // check whether other is instance of the same structure
        if ((other instanceof RefStruct) && ((RefStruct) other).refTypeName().equals(qualifiedName)) {

Lines 56-61 Link Here

(-)src/org/netbeans/mdr/handlers/gen/HandlerGenerator.java (-1 / +6 lines)
56	/**	56	/**
57	* Generate a handler class given a name, interface and storable object to	57	* Generate a handler class given a name, interface and storable object to
58	* be wrapped by a handler object.	58	* be wrapped by a handler object.
		59	*
		60	* @param name the name of the handler class
		61	* @param ifc JMI interface to be implemented by the handler class
		62	* @param storable informs about the super-class for the handler class
		63	* @return the byte code for the class implementing <code>ifc</code>
59	*/	64	*/
60	public static byte[] generateHandler(final String name, Class ifc, StorableBaseObject storable) {	65	public static byte[] generateHandler(final String name, Class ifc, StorableBaseObject storable) {
61	HandlerGenerator gen;	66	HandlerGenerator gen;
Lines 65-71 Link Here
65	} else if (storable instanceof StorableClass) {	70	} else if (storable instanceof StorableClass) {
66	gen = new ClassGenerator(name, ifc, ((StorableClass) storable).getClassSuperclass(), (StorableClass)storable);	71	gen = new ClassGenerator(name, ifc, ((StorableClass) storable).getClassSuperclass(), (StorableClass)storable);
67	} else if (storable instanceof StorablePackage) {	72	} else if (storable instanceof StorablePackage) {
68	gen = new PackageGenerator(name, ifc, PackageProxyHandler.class, (StorablePackage)storable);	73	gen = new PackageGenerator(name, ifc, ((StorablePackage)storable).getPackageSuperclass(), (StorablePackage)storable);
69	} else if (storable instanceof StorableObject) {	74	} else if (storable instanceof StorableObject) {
70	gen = new InstanceGenerator(name, ifc, ((StorableObject) storable).getClassProxy().getInstanceSuperclass(), (StorableObject)storable);	75	gen = new InstanceGenerator(name, ifc, ((StorableObject) storable).getClassProxy().getInstanceSuperclass(), (StorableObject)storable);
71	} else {	76	} else {

Lines 19-25 Link Here

(-)src/org/netbeans/mdr/persistence/MultivaluedIndex.java (-1 / +1 lines)
19	*/	19	*/
20	public interface MultivaluedIndex extends Index {	20	public interface MultivaluedIndex extends Index {
21	/** Returns a collection view of the values associated in the index with specified key.	21	/** Returns a collection view of the values associated in the index with specified key.
22	* Returned collection is read only and may not be modified.	22	* Returned collection is live and modifiable.
23	* If there are no values associated with the key empty collection is returned.	23	* If there are no values associated with the key empty collection is returned.
24	* @return	24	* @return
25	* @param key	25	* @param key

Lines 19-25 Link Here

(-)src/org/netbeans/mdr/persistence/MultivaluedOrderedIndex.java (-1 / +1 lines)
19	*/	19	*/
20	public interface MultivaluedOrderedIndex extends MultivaluedIndex {	20	public interface MultivaluedOrderedIndex extends MultivaluedIndex {
21	/** Returns a list view of the values assosiated in the index with specified key.	21	/** Returns a list view of the values assosiated in the index with specified key.
22	* Returned collection is read only and may not be modified.	22	* Returned collection is live and modifiable.
23	* If there are no values associated with the key empty collection is returned.	23	* If there are no values associated with the key empty collection is returned.
24	* @param key	24	* @param key
25	* @return	25	* @return




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
 * Microsystems, Inc. All Rights Reserved.
 */
package org.netbeans.mdr.shell;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;

import java.util.Collection;
import java.util.ArrayList;
import java.util.Iterator;

import javax.jmi.reflect.*;

public class Main extends Object {
    
    /**
     * Resources names of the standard library files
     */
    public static String[] STANDARD_LIBS = new String[] { "resources/start.ms", "resources/ext.ms" };
    
    /**
     *  Command line interface of the MDRShell. The MDRShell is a
     *  <em>Dynamic Java</em> shell with preprocessor. Before user input
     *  is processed the files <code>start.ms</code> and <code>ext.ms</code>
     *  in the package <code>org.netbeans.mdr.shell.resources</code> and the
     *  files given as command line arguments are processed.
     *
     *  @param args a list of file names read into the shell
     *  @throws FileNotFoundException if one of the arguments does not denote a
     *                         valid file name
     *  @throws SecurityException if there is no read access to a file given as
     *                          argument
     */
    public static void main( String[] args ) throws FileNotFoundException {
        /* the input streams */
        InputStream[] iss = new InputStream[STANDARD_LIBS.length+args.length+1];
        
        /* standard library files */
        for ( int i=0; i<STANDARD_LIBS.length; i++ ) {
            iss[i] = Main.class.getResourceAsStream(STANDARD_LIBS[i]);
        }
        /* files given as arguments */
        for ( int i=0; i<args.length; i++ ) {
            iss[STANDARD_LIBS.length+i] = new FileInputStream(args[i]);
        }
        /* System.in for user input */
        iss[STANDARD_LIBS.length+args.length] = System.in;
        
        // Create and run the shell
        
        new Shell().run( iss );
        //System.out.println("saving data...");
        MDRManager.getDefault().shutdownAll();
        
        Log.out.unindent();
    }
}

Lines 188-198 Link Here

(-)src/org/netbeans/mdr/shell/Shell.java (-2 / +17 lines)
188	// Public methods ----------------------------------------------------------	188	// Public methods ----------------------------------------------------------
189		189
190	/** Starts interpretting commands in the InputStream.	190	/** Starts interpretting commands in the InputStream.
191	* @param is InputStream to read commands from. If null the System.in is used.	191	* @param is InputStream to read commands from. If <code>null</code>
		192	* <code>System.in</code> is used.
192	*/	193	*/
193	public void run( InputStream is ) {	194	public void run( InputStream is ) {
		195	run( new InputStream[] { is } );
		196	}
		197
		198	/** Starts interpretting commands in the InputStreams.
		199	* @param iss InputStreams to read commands from. If <code>null</code>
		200	* <code>System.in</code> is used.
		201	*/
		202	public void run( InputStream[] iss ) {
194		203
195	pushInput( is == null ? System.in : is );	204	if ( iss == null ) {
		205	pushInput(System.in);
		206	} else {
		207	for ( int i = iss.length-1; i >= 0; i-- ) {
		208	pushInput(iss[i]);
		209	}
		210	}
196		211
197	DJava.initialize();	212	DJava.initialize();
198	DJava.declareVariable( "SHELL", this );	213	DJava.declareVariable( "SHELL", this );

Lines 159-165 Link Here

(-)src/org/netbeans/mdr/storagemodel/BootReader.java (-1 lines)
159	private Collection createInstances(Node xmiContent) {	159	private Collection createInstances(Node xmiContent) {
160	XmiUtils.XmiNodeIterator classes = new XmiUtils.XmiNodeIterator(xmiContent);	160	XmiUtils.XmiNodeIterator classes = new XmiUtils.XmiNodeIterator(xmiContent);
161	Collection result = createInstances(classes, null, "", null);	161	Collection result = createInstances(classes, null, "", null);
162	classes = new XmiUtils.XmiNodeIterator(xmiContent);
163	resolveSuperClasses();	162	resolveSuperClasses();
164	resolveReferences();	163	resolveReferences();
165	setValues();	164	setValues();




import org.netbeans.mdr.util.*;

/**
 * Instances of <code>CompositeCollection</code> are immutable collections uniting
 * several other collections. The methods of this class must be called in the following
 * order:
 *
 * <p><ol>

 *    <li>{@link addCollection(Collection} to add a collection forming a part of
 *         the current collection</li>
 *    <li>any accessor method</li>
 * </ol></p>
 *
 * <p>It is not allowed to add further collections after any of the accessors has
 * been called.</p>
 *
 * <p>Because the collections added using @link addCollection(Collection} are added
 * as is and their members are accessed only, when to be returned by methods of
 * this class resp. its {@link Iterator}, instances of <code>CompositeCollection</code>
 * are live if and only if all of the composed collections are live.</p>
 *
 * <p><b>[XXX]:</b> Put this class into <code>org.netbeans.mdr.util</code>
 *  package.</p>
 *
 * @author  mm109185
 */

    private final ArrayList innerCollections = new ArrayList();
    private volatile boolean canChange = true;
    
    public CompositeCollection() {
    }
    
    /**
     * Adds a new collection. Can only be called before any accessor call.
     */
    public void addCollection(Collection collection) {
        if (canChange) {
            innerCollections.add(collection);
        } else {

    public Object[] toArray() {
        return toArray(new Object[0]);
    }

    /**
     * operation not supported
     */
    public void clear() {
        throw new UnsupportedOperationException();
    }
    
    /**
     * operation not supported
     */
    public boolean addAll(Collection collection) {
        throw new UnsupportedOperationException();
    }
    
    /**
     * operation not supported
     */
    public boolean remove(Object obj) {
        throw new UnsupportedOperationException();
    }
    
    /**
     * operation not supported
     */
    public boolean add(Object obj) {
        throw new UnsupportedOperationException();
    }
    
    /**
     * operation not supported
     */
    public boolean retainAll(Collection collection) {
        throw new UnsupportedOperationException();
    }
    
    /**
     * operation not supported
     */
    public boolean removeAll(Collection collection) {
        throw new UnsupportedOperationException();
    }

    /* --------------------------------------------------------------------- */
    /* -- CompositeIterator (inner class) ---------------------------------- */
    /* --------------------------------------------------------------------- */
    
    protected class CompositeIterator implements Iterator {
        private final Iterator innerIterators;

            return result;
        }
        
       /**
        * operation not supported
        */
        public void remove() {
            throw new UnsupportedOperationException();
        }

Lines 1-11 Link Here

(-)src/org/netbeans/mdr/storagemodel/DatatypeDescriptor.java (-37 / +144 lines)
1	/*	1	/*
2	* Sun Public License Notice	2	* Sun Public License Notice
3	*	3	*
4	* The contents of this file are subject to the Sun Public License	4	* The contents of this file are subject to the Sun Public License
5	* Version 1.0 (the "License"). You may not use this file except in	5	* Version 1.0 (the "License"). You may not use this file except in
6	* compliance with the License. A copy of the License is available at	6	* compliance with the License. A copy of the License is available at
7	* http://www.sun.com/	7	* http://www.sun.com/
8	*	8	*
9	* The Original Code is NetBeans. The Initial Developer of the Original	9	* The Original Code is NetBeans. The Initial Developer of the Original
10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun	10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
11	* Microsystems, Inc. All Rights Reserved.	11	* Microsystems, Inc. All Rights Reserved.
Lines 24-49 Link Here
24	*/	24	*/
25		25
26	public class DatatypeDescriptor extends Object {	26	public class DatatypeDescriptor extends Object {
		27
		28	/* --------------------------------------------------------------------- */
		29	/* -- Attributes (private) --------------------------------------------- */
		30	/* --------------------------------------------------------------------- */
		31
		32	/**
		33	*
		34	*/
27	private final int memberIDs[];	35	private final int memberIDs[];
		36
		37	/**
		38	*
		39	*/
28	private final int memberTypeIDs[];	40	private final int memberTypeIDs[];
		41
		42	/**
		43	*
		44	*/
29	private final int ifcIndex;	45	private final int ifcIndex;
		46
		47	/**
		48	*
		49	*/
30	private final int typeNameIndex;	50	private final int typeNameIndex;
31		51
		52	/**
		53	*
		54	*/
32	private final transient MdrStorage storage;	55	private final transient MdrStorage storage;
33		56
34	// name of the interface that the datatype maps to	57	/**
		58	* name of the interface that the datatype maps to
		59	*/
35	private transient String ifcName = null;	60	private transient String ifcName = null;
36	// list of datatype members (enum. literals/structure fields)	61
		62	/**
		63	* list of datatype members (enum. literals/structure fields)
		64	*/
37	private transient List members = null;	65	private transient List members = null;
38	// list of datatypes of members (applicable for structure fields only)	66
		67	/**
		68	* list of datatypes of members (applicable for structure fields only)
		69	*/
39	private transient List memberTypes = null;	70	private transient List memberTypes = null;
40	// fully qualified name of datatype	71
41	// (stored only for structs - FQNs for enums are hardcoded in their impls)	72	/** fully qualified name of datatype
		73	* (stored only for structs - FQNs for enums are hardcoded in their impls)
		74	**/
42	private transient List typeName = null;	75	private transient List typeName = null;
43	// storage id	76
		77	/**
		78	* storage id
		79	*/
44	private transient String storageId = null;	80	private transient String storageId = null;
45		81
46	// used for constructing structure descriptor	82	/* --------------------------------------------------------------------- */
		83	/* -- Constructors (public/private) ------------------------------------ */
		84	/* --------------------------------------------------------------------- */
		85
		86	/**
		87	* Creates a new structure descriptor.
		88	*
		89	* @param storage
		90	* @param typeName
		91	* @param memberTypes
		92	* @param ifcName
		93	* @param storageId
		94	*/
47	public DatatypeDescriptor(MdrStorage storage, List typeName, List members, List memberTypes, String ifcName, String storageId) {	95	public DatatypeDescriptor(MdrStorage storage, List typeName, List members, List memberTypes, String ifcName, String storageId) {
48	this.storage = storage;	96	this.storage = storage;
49	this.ifcName = ifcName;	97	this.ifcName = ifcName;
Lines 58-64 Link Here
58	this.typeNameIndex = 0;	106	this.typeNameIndex = 0;
59	} else {	107	} else {
60	this.typeName = Collections.unmodifiableList(typeName);	108	this.typeName = Collections.unmodifiableList(typeName);
61	this.typeNameIndex = storage.storageValues (this.storageId).store(typeName);	109	this.typeNameIndex = storage.storageValues(this.storageId).store(typeName);
62	}	110	}
63	if (memberTypes == null) {	111	if (memberTypes == null) {
64	this.memberTypeIDs = null;	112	this.memberTypeIDs = null;
Lines 71-81 Link Here
71	}	119	}
72	}	120	}
73		121
74	// used for creating enumeration descriptor	122	/**
		123	* Create a new enumeration descriptor.
		124	*
		125	* @param storage
		126	* @param members
		127	* @param ifcName
		128	* @param storageId
		129	*/
75	public DatatypeDescriptor(MdrStorage storage, List members, String ifcName, String storageId) {	130	public DatatypeDescriptor(MdrStorage storage, List members, String ifcName, String storageId) {
76	this(storage, null, members, null, ifcName, storageId);	131	this(storage, null, members, null, ifcName, storageId);
77	}	132	}
78		133
		134	/**
		135	* Constructor used during deserialization.
		136	*
		137	* @param storage
		138	* @param typeNameIndex
		139	* @param memberIDs
		140	* @param memberTypeIDs
		141	* @param ifcIndex
		142	* @param storageId
		143	*/
79	private DatatypeDescriptor(MdrStorage storage, int typeNameIndex, int[] memberIDs, int[] memberTypeIDs, int ifcIndex, String storageId) {	144	private DatatypeDescriptor(MdrStorage storage, int typeNameIndex, int[] memberIDs, int[] memberTypeIDs, int ifcIndex, String storageId) {
80	this.storage = storage;	145	this.storage = storage;
81	this.typeNameIndex = typeNameIndex;	146	this.typeNameIndex = typeNameIndex;
Lines 85-133 Link Here
85	this.storageId = storageId;	150	this.storageId = storageId;
86	}	151	}
87		152
88	public synchronized List getMembers() {	153	/* --------------------------------------------------------------------- */
		154	/* -- Getters (with lazy initialization) ------------------------------- */
		155	/* --------------------------------------------------------------------- */
		156
		157	/**
		158	*
		159	*/
		160	public List getMembers() {
89	if (members == null) {	161	if (members == null) {
90	members = new ArrayList(memberIDs.length);	162	synchronized(this) {
91	for (int i = 0; i < memberIDs.length; i++) {	163	if (members == null ) {
92	members.add(storage.storageValues(this.storageId).resolve(memberIDs[i]));	164	members = new ArrayList(memberIDs.length);
		165	for (int i = 0; i < memberIDs.length; i++) {
		166	members.add(storage.storageValues(this.storageId).resolve(memberIDs[i]));
		167	}
		168	members = Collections.unmodifiableList(members);
		169	}
93	}	170	}
94	members = Collections.unmodifiableList(members);
95	}	171	}
96	return members;	172	return members;
97	}	173	}
98		174
99	public synchronized List getMemberTypes() {	175	/**
100	if (memberTypeIDs == null) return null;	176	*
		177	*/
		178	public List getMemberTypes() {
101	if (memberTypes == null) {	179	if (memberTypes == null) {
102	memberTypes = new ArrayList(memberTypeIDs.length);	180	if (memberTypeIDs == null) return null;
103	for (int i = 0; i < memberTypeIDs.length; i++) {	181	synchronized(this) {
104	try {	182	if (memberTypes == null) {
105	memberTypes.add(BaseObjectHandler.resolveInterface((String) storage.storageValues(this.storageId).resolve(memberTypeIDs[i])));	183	memberTypes = new ArrayList(memberTypeIDs.length);
106	} catch (ClassNotFoundException e) {	184	for (int i = 0; i < memberTypeIDs.length; i++) {
107	e.printStackTrace();	185	try {
108	throw new DebugException();	186	memberTypes.add(BaseObjectHandler.resolveInterface((String) storage.storageValues(this.storageId).resolve(memberTypeIDs[i])));
		187	} catch (ClassNotFoundException e) {
		188	e.printStackTrace();
		189	throw new DebugException();
		190	}
		191	}
		192	memberTypes = Collections.unmodifiableList(memberTypes);
109	}	193	}
110	}	194	}
111	memberTypes = Collections.unmodifiableList(memberTypes);
112	}	195	}
113	return memberTypes;	196	return memberTypes;
114	}	197	}
115		198
116	public synchronized List getTypeName() {	199	/**
		200	*
		201	*/
		202	public List getTypeName() {
117	if (typeName == null) {	203	if (typeName == null) {
118	typeName = (List) storage.storageValues(this.storageId).resolve(typeNameIndex);	204	synchronized(this) {
		205	if (typeName == null ) {
		206	typeName = (List) storage.storageValues(this.storageId).resolve(typeNameIndex);
		207	typeName = Collections.unmodifiableList(typeName);
		208	}
		209	}
119	}	210	}
120	return typeName;	211	return typeName;
121	}	212	}
122		213
123	public synchronized String getIfcName() {	214	/**
		215	*
		216	*/
		217	public String getIfcName() {
124	if (ifcName == null) {	218	if (ifcName == null) {
125	ifcName = (String) storage.storageValues(this.storageId).resolve(ifcIndex);	219	synchronized(this) {
		220	if (ifcName == null) {
		221	ifcName = (String) storage.storageValues(this.storageId).resolve(ifcIndex);
		222	}
		223	}
126	}	224	}
127
128	return ifcName;	225	return ifcName;
129	}	226	}
130		227
		228	/* --------------------------------------------------------------------- */
		229	/* -- Read/Write ------------------------------------------------------- */
		230	/* --------------------------------------------------------------------- */
		231
		232	/**
		233	*
		234	*/
131	static DatatypeDescriptor readResolve(java.io.InputStream inputStream, StorableBaseObject storable) throws java.io.IOException {	235	static DatatypeDescriptor readResolve(java.io.InputStream inputStream, StorableBaseObject storable) throws java.io.IOException {
132	int typeNameIndex = IOUtils.readInt(inputStream);	236	int typeNameIndex = IOUtils.readInt(inputStream);
133	int[] memberIDs = new int[IOUtils.readInt(inputStream)];	237	int[] memberIDs = new int[IOUtils.readInt(inputStream)];
Lines 146-151 Link Here
146	return new DatatypeDescriptor(storable.getMdrStorage(), typeNameIndex, memberIDs, memberTypeIDs, IOUtils.readInt(inputStream), MdrStorage.getStorageIdFromMofId(storable.getMofId()));	250	return new DatatypeDescriptor(storable.getMdrStorage(), typeNameIndex, memberIDs, memberTypeIDs, IOUtils.readInt(inputStream), MdrStorage.getStorageIdFromMofId(storable.getMofId()));
147	}	251	}
148		252
		253	/**
		254	*
		255	*/
149	void write(java.io.OutputStream outputStream) throws java.io.IOException {	256	void write(java.io.OutputStream outputStream) throws java.io.IOException {
150	IOUtils.writeInt(outputStream, typeNameIndex);	257	IOUtils.writeInt(outputStream, typeNameIndex);
151	IOUtils.writeInt(outputStream, memberIDs.length);	258	IOUtils.writeInt(outputStream, memberIDs.length);

Lines 18-36 Link Here

(-)src/org/netbeans/mdr/storagemodel/IndexImmutSet.java (+52 lines)
18	import org.netbeans.mdr.util.DebugException;	18	import org.netbeans.mdr.util.DebugException;
19		19
20	/**	20	/**
		21	* Instances of this class are immutable, live collections representing
		22	* results of index access.
21	*	23	*
22	* @author mm109185	24	* @author mm109185
23	*/	25	*/
24	public class IndexImmutSet implements Collection {	26	public class IndexImmutSet implements Collection {
		27
		28	/* --------------------------------------------------------------------- */
		29	/* -- Attributes (protected) ------------------------------------------- */
		30	/* --------------------------------------------------------------------- */
		31
25	protected final MdrStorage storage;	32	protected final MdrStorage storage;
26	protected final MultivaluedIndex index;	33	protected final MultivaluedIndex index;
27	protected final Object indexKey;	34	protected final Object indexKey;
28		35
		36	/* --------------------------------------------------------------------- */
		37	/* -- Constructor (protected) ------------------------------------------ */
		38	/* --------------------------------------------------------------------- */
		39
		40	/**
		41	* @param storage
		42	* @param index the index where to look up the members of the current collection
		43	* @param indexKey the key under which to look up the members of the current collection
		44	*/
29	protected IndexImmutSet(MdrStorage storage, MultivaluedIndex index, Object indexKey) {	45	protected IndexImmutSet(MdrStorage storage, MultivaluedIndex index, Object indexKey) {
30	this.storage = storage;	46	this.storage = storage;
31	this.index = index;	47	this.index = index;
32	this.indexKey = indexKey;	48	this.indexKey = indexKey;
33	}	49	}
		50
		51	/* --------------------------------------------------------------------- */
		52	/* -- Methods for index access ----------------------------------------- */
		53	/* --------------------------------------------------------------------- */
34		54
35	protected Collection getItems() {	55	protected Collection getItems() {
36	try {	56	try {
Lines 50-55 Link Here
50	}	70	}
51	}	71	}
52		72
		73	/* --------------------------------------------------------------------- */
		74	/* -- implements java.util.Collection ---------------------------------- */
		75	/* --------------------------------------------------------------------- */
		76
53	public int size() {	77	public int size() {
54	return getItems().size();	78	return getItems().size();
55	}	79	}
Lines 78-107 Link Here
78	return getObjects().toArray();	102	return getObjects().toArray();
79	}	103	}
80		104
		105	/**
		106	* operation not supported
		107	*/
81	public boolean remove(Object o) {	108	public boolean remove(Object o) {
82	throw new UnsupportedOperationException();	109	throw new UnsupportedOperationException();
83	}	110	}
84		111
		112	/**
		113	* operation not supported
		114	*/
85	public boolean add(Object obj) {	115	public boolean add(Object obj) {
86	throw new UnsupportedOperationException();	116	throw new UnsupportedOperationException();
87	}	117	}
88		118
		119	/**
		120	* operation not supported
		121	*/
89	public boolean removeAll(Collection collection) {	122	public boolean removeAll(Collection collection) {
90	throw new UnsupportedOperationException();	123	throw new UnsupportedOperationException();
91	}	124	}
92		125
		126	/**
		127	* operation not supported
		128	*/
93	public boolean addAll(Collection collection) {	129	public boolean addAll(Collection collection) {
94	throw new UnsupportedOperationException();	130	throw new UnsupportedOperationException();
95	}	131	}
96		132
		133	/**
		134	* operation not supported
		135	*/
97	public boolean retainAll(Collection collection) {	136	public boolean retainAll(Collection collection) {
98	throw new UnsupportedOperationException();	137	throw new UnsupportedOperationException();
99	}	138	}
100		139
		140	/**
		141	* operation not supported
		142	*/
101	public void clear() {	143	public void clear() {
102	throw new UnsupportedOperationException();	144	throw new UnsupportedOperationException();
103	}	145	}
104		146
		147	/* --------------------------------------------------------------------- */
		148	/* -- IndexImmutIterator (inner class) --------------------------------- */
		149	/* --------------------------------------------------------------------- */
		150
		151	/**
		152	* Wrapper for the index access iterator diabling modifying accesses.
		153	*/
105	protected class IndexImmutIterator implements Iterator {	154	protected class IndexImmutIterator implements Iterator {
106	protected Iterator innerIterator;	155	protected Iterator innerIterator;
107		156
Lines 117-122 Link Here
117	return innerIterator.next();	166	return innerIterator.next();
118	}	167	}
119		168
		169	/**
		170	* operation not supported
		171	*/
120	public void remove() {	172	public void remove() {
121	throw new UnsupportedOperationException();	173	throw new UnsupportedOperationException();
122	}	174	}




    /* -------------------------------------------------------------------- */
    /* -- Private static constants ---------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    private static final int STORAGE_VERSION = 12;
    
    // names of global storage indexes

    /* -- Transient support ---*/
    private long transientSerialNumber = 0;
    
    /**
     * The default super-class for package proxy implementations.
     */
    private Class packageProxyHandlerClass = null;
    
    /**
     * The default super-class for class proxy implementations.
     */
    private Class classProxyHandlerClass = null;
    
    /**
     * The default super-class for instance implementations.
     */
    private Class instanceHandlerClass = null;
    
    /**
     * The default super-class for association implementations.
     */
    private Class associationHandlerClass = null;
    
    /**
     * The super-class for structure implementations.
     */
    private Class structureHandlerClass = null;
    
    /** The constructor parameters */
    private Map params;
    
    /* -- boot specific stuff --------------------------------------------- */
    
    /**

    /** boot association proxies */
    private Collection bootAssociations = null;
    
    
    /* -------------------------------------------------------------------- */
    /* -- Setters/Getters (public) ---------------------------------------- */
    /* -------------------------------------------------------------------- */

    }
    
    /* -------------------------------------------------------------------- */
    /* -- Getters for names of implementation classes --------------------- */
    /* -------------------------------------------------------------------- */
    
    /**
     * Returns the class to be used as base class for package proxy
     * implementations.
     */
    Class getPackageProxyHandlerClass() throws ClassNotFoundException {
        if (packageProxyHandlerClass == null) {
          synchronized ( this ) {
            if (packageProxyHandlerClass == null) {
//              String className = (String) params.get("PackageProxyHandler");
//              if ( className != null ) {
//                try {
//                    packageProxyHandlerClass = BaseObjectHandler.resolveImplementation(className);
//                } catch (ClassNotFoundException e) {
//                    e.printStackTrace();
//                }
//              }
//              if ( packageProxyHandlerClass == null ) {
                packageProxyHandlerClass = PackageProxyHandler.class;
//              }
            }
          }
        }
        return packageProxyHandlerClass;
    }
    
    /**
     * Returns the default class to be used as base class for class proxy
     * implementations.
     */
    Class getClassProxyHandlerClass() throws ClassNotFoundException {
        if (classProxyHandlerClass == null) {
            synchronized(this) {
                if (classProxyHandlerClass == null) {
//                    String className = (String) params.get("ClassProxyHandler");
//                    if ( className != null ) {
//                        try {
//                            classProxyHandlerClass = BaseObjectHandler.resolveImplementation(className);
//                        } catch (ClassNotFoundException e) {
//                            e.printStackTrace();
//                        }
//                    }
//                    if ( classProxyHandlerClass == null ) {
                        classProxyHandlerClass = ClassProxyHandler.class;
//                    }
                }
            }
        }
        return classProxyHandlerClass;
    }
    
    /**
     * Returns the default class to be used as base class for instance
     * implementations.
     */
    Class getInstanceHandlerClass() throws ClassNotFoundException {
        if (instanceHandlerClass == null) {
            synchronized(this) {
                if (instanceHandlerClass == null) {
//                    String className = (String) params.get("InstanceHandler");
//                    if ( className != null ) {
//                        try {
//                            instanceHandlerClass = BaseObjectHandler.resolveImplementation(className);
//                        } catch (ClassNotFoundException e) {
//                            e.printStackTrace();
//                        }
//                    }
//                    if ( instanceHandlerClass == null ) {
                        instanceHandlerClass = InstanceHandler.class;
//                    }
                }
            }
        }
        return instanceHandlerClass;
    }
    
    /**
     * Returns the default class to be used as base class for association proxy
     * implementations.
     */
    Class getAssociationHandlerClass() throws ClassNotFoundException {
        if (associationHandlerClass == null) {
            synchronized(this) {
                if (associationHandlerClass == null) {
//                    String className = (String) params.get("AssociationHandler");
//                    if ( className != null ) {
//                        try {
//                            associationHandlerClass = BaseObjectHandler.resolveImplementation(className);
//                        } catch (ClassNotFoundException e) {
//                            e.printStackTrace();
//                        }
//                    }
//                    if ( associationHandlerClass == null ) {
                        associationHandlerClass = AssociationHandler.class;
//                    }
                }
            }
        }
        return associationHandlerClass;
    }
    
    /**
     * Returns the class to be used as base class for structure
     * implementations.
     */
    public Class getStructureHandlerClass() throws ClassNotFoundException {
        if (structureHandlerClass == null) {
            synchronized(this) {
                if (structureHandlerClass == null) {
//                    String className = (String) params.get("StructureHandler");
//                    if ( className != null ) {
//                        try {
//                            structureHandlerClass = BaseObjectHandler.resolveImplementation(className);
//                        } catch (ClassNotFoundException e) {
//                            e.printStackTrace();
//                        }
//                    }
//                    if ( structureHandlerClass == null ) {
                        structureHandlerClass = StructImpl.class;
//                    }
                }
            }
        }
        return structureHandlerClass;
    }
    
    /* -------------------------------------------------------------------- */
    /* -- Constructor (public) -------------------------------------------- */
    /* -------------------------------------------------------------------- */
    
    /** Creates a new <code>MdrStorage</code> using factory <code>storageFactoryClassName</code>
     *  and parameters <code>params</code>. Creates a default storage, if the
     *  <code>storageFactoryClassName</code> is not a
     * {@link org.netbeans.mdr.persistence.StorageFactory} or cannot be instantiated.
     *
     *  @param repository
     *  @param storageFactoryClassName fully qualified name of class implementing
     *         {@link org.netbeans.mdr.persistence.StorageFactory}
     *  @param params parameters for storage creation
     *  @exception DebugException if the storage cannot be created
     */
    public MdrStorage(NBMDRepositoryImpl repository, String storageFactoryClassName, Map params) {
        this.storages = new HashMap();
        this.nullMofId = new HashMap();
        this.objects = new HashMap();

        this.valuesObjects = new HashMap();
        
        this.repository = repository;
        
        this.params = params;
        StorageFactory storageFactory = null;
        try {
            // try to instantiate storage factory (its class name was passed as storageClass argument)
            Class storageFactoryClass = Class.forName(storageFactoryClassName);
            // does the class implement StorageFactory interface?
            if (StorageFactory.class.isAssignableFrom(storageFactoryClass)) {
                // yes - create new instance

            } else {
                // no - throw exception
                // (this exception will not be propagated - it will be caught immediately - see following lines)
                throw new Exception("class "+storageFactoryClassName+" does not implement StorageFactory");
            }
        } catch (Exception e) {
            // in case the passed StorageFactory class could not be created, create default implementation

        
        try {
            // create storage passing the parameters to the factory method
            this.bootStorage = storageFactory.createStorage(params);
            // cache the NULL MOFID of the boot storage
            this.bootNullMofId = storageFactory.createNullMOFID();
        } catch (StorageException e) {

        
        // create the utilities for storage management
        eventNotifier = new EventNotifier();
        repositoryMutex = new TransactionMutex(this, eventNotifier, repository);
    }
    
    /* -------------------------------------------------------------------- */

    /* -- Methods for initialization and reinitialization (public/private)  */
    /* -------------------------------------------------------------------- */
    
    
    /** Initializes MdrStorage instance.
     * This method is called by the {@link org.netbeans.mdr.NBMDRepositoryImpl repository}
     * during its initialization. It initializes resp. creates the boot storage.

     *
     * @param context
     * @param indexName
     * @return  the index for the given attribute or <code>null</code> */
    private MultivaluedIndex getAdditionalIndex(String context, String indexName) {
        try {
            Storage storage = getStorageByMofId(context);

        Hashtable temp = new Hashtable();
        Object key;
        String extent = getContextOutermostPackage(mofContext).getMofId();
         
        // rebuild attribute indexes
        SinglevaluedIndex attributeIndexes = bootStorage.getSinglevaluedIndex(PREFIX_ATTR_INDEXES_BY_NAME + extent);
        String oldValue;

            }
            bootStorage.dropIndex(oldAttributeIndex.getName());
        }
         */
        
        Object key;
        String newValue;

    private String getContextAssocEndIndexName(String context, String assocMofId, int end) {
        return PREFIX_ASSOC_END + context + ":" + assocMofId + end;
    }
    
    public Storage getStorageByMofId(String mofId) {
        String storageId = getStorageIdFromMofId(mofId);
        if (storageId == null) {

    
    /** Transient support **/
    void registerTransientObjectsContainer(String mofId, TransientStorableClass tsc) {
        org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex tir = (org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex)
        this.objects.get(org.netbeans.mdr.storagemodel.transientimpl.MOFID.TRANSIENT_STORAGE_PREFIX);
        if (tir == null) {
            tir = new org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex();
            this.objects.put(org.netbeans.mdr.storagemodel.transientimpl.MOFID.TRANSIENT_STORAGE_PREFIX, tir);
        }
        tir.register(mofId, tsc);
    }
    
    void unregisterTransientObjectsContainer(String mofId) throws StorageException {




        if (((Boolean) getMetaObject().getAttribute(MOFConstants.SH_MODEL_ASSOCIATION_IS_DERIVED)).booleanValue() || TagSupport.getTagValue(getMetaObject(), INTERCEPTABLE_TAG_ID, "").equals("true"))
            return BaseObjectHandler.resolveImplementation(TagSupport.getImplFullName(getMetaObject(), TagSupport.ASSOCIATION));
        else
            return getMdrStorage().getAssociationHandlerClass();
    }

    /** Returns multiplicity of the first association end.

    }

    /**
     * Returns immutable, live collection of all links managed by this association
     * proxy.
     *
     * @throws StorageException
     * @return immutable, live collection of all links
     */
    public Collection getAllLinks() throws StorageException {
        return new LinkSetCollection();

        for (Iterator it = bIndex.keySet().iterator (); it.hasNext();) {
            String a = (String) it.next();
            if (isMultivaluedB()) {
                Collection bees = getMdrStorage().getObjectsFromIndex((MultivaluedIndex) bIndex, a);
                for (Iterator it2 = bees.iterator (); it2.hasNext();){
                    AssociationLink oneLink = new AssociationLink((StorableObject) getMdrStorage().getObject(a), (StorableObject) it2.next());
                    allLinks.add(oneLink);
                }
            } else {
                AssociationLink oneLink = new AssociationLink((StorableObject) getMdrStorage().getObject(a), (StorableObject) getMdrStorage().getObjectFromIndexIfExists((SinglevaluedIndex) bIndex, a));
                allLinks.add(oneLink);
            }
        }
        return Collections.unmodifiableCollection(allLinks);
    }

    /**

            e.printStackTrace();
            throw new RuntimeException();
        }
    }
    
    /* --------------------------------------------------------------------- */
    /* -- LinkSetCollection (inner class) ---------------------------------- */
    /* --------------------------------------------------------------------- */
    
    protected class LinkSetCollection extends AbstractCollection {
        
        public Iterator iterator() {
            return new LinkSetIterator();
        }
        
        public int size() {
            int size = 0;
            LinkSetIterator it = new LinkSetIterator();
            it.initCheck();
            while (it.b != null) {
                size++;
                it.fetchNext();
            }
            return size;
        }
    }
    
    /* --------------------------------------------------------------------- */
    /* -- LinkSetIterator (inner class) ------------------------------------ */
    /* --------------------------------------------------------------------- */
    
    protected class LinkSetIterator implements Iterator {

        boolean initialized = false;
        
        /**
         * Iterator through all instances at the a-side of this association or
         * <code>null</code> before the first access or if a storage problem
         * occured.
         */
        Iterator as = null;
        
        /**
         * MOF ID of the current instance at the a side. <code>null</code>
         * only before the first call to <code>fetchNext()</code>.
         */
        String aID = null;
        
        /**
         * Object with ID <code>aID</code> or <code>null</code> if not yet
         * retrieved.
         */
        StorableObject a = null;
        
        /**
         * If the association if multi-valued at b's end, <code>bs</code>
         * contains the iterator for the b's associated with the current a.
         * Shall only be accessed inside <code>fetchNext()</code>.
         */
        Iterator bs = null;
        
        /**
         * The current b object, <code>null</code> initially and after the
         * last link has been retrieved.
         */
        StorableObject b = null;
        
        private void initCheck() {
            if ( ! initialized ) {
                initialized = true;
                try {
                    as = bIndex.keySet().iterator();
                } catch ( StorageException se ) {
                    // [XXX]: probably throw a DebugException here
                    as = null;
                }
                fetchNext();
            }
        }
        
        private void fetchNext() {
            if ( as == null ) {
                return;
            }
            b = null;
            //  check if there is yet another b for the current a
            if ( bs != null ) {
                if ( bs.hasNext() ) {
                    b = (StorableObject) bs.next();
                    return;
                }
            }
            
            try {
                // fetch the next a
                while ( as.hasNext() ) {
                    aID = (String) as.next();
                    a = null;
                    // fetch the first b for the given a, if exists
                    if ( isMultivaluedB() ) {
                        bs = getMdrStorage().getObjectsFromIndex((MultivaluedIndex) bIndex, aID).iterator();
                        if ( bs.hasNext() ) {
                            b = (StorableObject) bs.next();
                        }
                    } else {
                        b = (StorableObject) getMdrStorage().getObjectFromIndexIfExists((SinglevaluedIndex) bIndex, aID);
                    }
                    // check, if a b was found, return, if yes
                    if ( b != null ) {
                        return;
                    }
                }
            } catch (StorageException se) {
                // [XXX]: probably throw a DebugException here
                as = null;
                b = null;
            }
            
            // there are not more links !
            return;
        }
        
        public boolean hasNext() {
            initCheck();
            return b != null;
        }
        
        public Object next() {
            initCheck();
            if ( b == null ) {
                throw new NoSuchElementException();
            }
            if ( a == null ) {
                try {
                    a = (StorableObject) getMdrStorage().getObject(aID);
                } catch (StorageException se) {
                    // {XXX]: better exception handling
                    se.printStackTrace();
                    throw new DebugException();
                }
            }
            AssociationLink link = new AssociationLink(a,b);
            fetchNext();
            return link;
        }
        
       /**
        * operation not supported
        */
        public void remove() {
            throw new UnsupportedOperationException();
        }
        
    }
}

Lines 224-232 Link Here

(-)src/org/netbeans/mdr/storagemodel/StorableClass.java (-11 / +43 lines)
224	return (DatatypeDescriptor) datatypes.get(name);	224	return (DatatypeDescriptor) datatypes.get(name);
225	}	225	}
226		226
227	/** Returns all instances of MOF class represented by this proxy within the current context.	227	/** Returns immutable, live collection of all instances of MOF class
		228	* represented by this proxy.
		229	*
		230	* @param subclasses if <code>true</code> also the instances of sub-classes
		231	* will be returned, otherwise only the instances of the current class
		232	* @return collection of instances of this class (and its sub-classes)
228	* @throws StorageException problem in storage	233	* @throws StorageException problem in storage
229	* @return collection of instances
230	*/	234	*/
231	public Collection allObjects(boolean subclasses) throws StorageException {	235	public Collection allObjects(boolean subclasses) throws StorageException {
232	if (subclasses) {	236	if (subclasses) {
Lines 240-249 Link Here
240	}	244	}
241	}	245	}
242		246
		247	/**
		248	* Adds the instances of this class and its super-classes to <code>result</code>
		249	* and adds the MOF IDs of all visited class proxies to <code>visited</code>.
		250	* Instances of a class already being a member of <code>visited</code> are
		251	* not added to <code>result</code> a second time.
		252	*
		253	* @param result the collection where to add the instances
		254	* @param visited MOF IDs of class proxies already visited
		255	*/
243	private void collectObjects(CompositeCollection result, Set visited) throws StorageException {	256	private void collectObjects(CompositeCollection result, Set visited) throws StorageException {
244	if (!visited.contains(getMofId())) {	257	if (visited.add(getMofId())) {
245	result.addCollection(allObjects(false));	258	result.addCollection(allObjects(false));
246	visited.add(getMofId());
247	for (Iterator it = subclasses.iterator(); it.hasNext();) {	259	for (Iterator it = subclasses.iterator(); it.hasNext();) {
248	((StorableClass) getMdrStorage().getObject((String) it.next())).collectObjects(result, visited);	260	((StorableClass) getMdrStorage().getObject((String) it.next())).collectObjects(result, visited);
249	}	261	}
Lines 449-454 Link Here
449	visited.add(getMofId());	461	visited.add(getMofId());
450	}	462	}
451		463
		464	/**
		465	* Returns the super-class for generated handler classes.
		466	*/
452	public Class getClassSuperclass() throws StorageException, ClassNotFoundException {	467	public Class getClassSuperclass() throws StorageException, ClassNotFoundException {
453	if (classSuperclass == null) {	468	if (classSuperclass == null) {
454	synchronized (superclassMutex) {	469	synchronized (superclassMutex) {
Lines 485-490 Link Here
485	return false;	500	return false;
486	}	501	}
487		502
		503	/**
		504	* Returns the implementation super-class for the generated handler.
		505	*
		506	* <p>If the class has derived or inceptable members, {@link
		507	* TagSupport#getImplFullName(StorableObject, int)} determines the class
		508	* name.</p>
		509	*
		510	* <p>If this model class has model super-classes then the return value
		511	* depends on if there is a most specific implementation class among the
		512	* implementation classes of those super-classes. If yes, this most
		513	* specific implementation class is returned, otherwise {@link
		514	* TagSupport#getImplFullName(StorableObject, int)} determines the class
		515	* name.</p>
		516	*
		517	* <p>If non of the cases above applies, <code>ClassProxyHandler.class</code>
		518	* is returned as default value.</p>
		519	*/
488	private Class resolveClassSuperclass() throws StorageException, ClassNotFoundException {	520	private Class resolveClassSuperclass() throws StorageException, ClassNotFoundException {
489	Class result = null;	521	Class result = null;
490	if (classDerived) {	522	if (classDerived) {
Lines 505-520 Link Here
505	}	537	}
506	}	538	}
507	if (result == null) {	539	if (result == null) {
508	result = ClassProxyHandler.class;	540	result = getMdrStorage().getClassProxyHandlerClass();
509	}	541	}
510	}	542	}
511	return result;	543	return result;
512	}	544	}
513		545
514	private Class resolveClass(String className) throws ClassNotFoundException {
515	return BaseObjectHandler.resolveImplementation(className);
516	}
517
518	private Class resolveInstanceSuperclass() throws StorageException, ClassNotFoundException {	546	private Class resolveInstanceSuperclass() throws StorageException, ClassNotFoundException {
519	Class result = null;	547	Class result = null;
520	if (instanceDerived \|\| TagSupport.getTagValue(getMetaObject(), INTERCEPTABLE_TAG_ID, "").equals("true")) try {	548	if (instanceDerived \|\| TagSupport.getTagValue(getMetaObject(), INTERCEPTABLE_TAG_ID, "").equals("true")) try {
Lines 540-550 Link Here
540	}	568	}
541	}	569	}
542	}	570	}
543	if (result == null) {	571	if ( result == null ) {
544	result = InstanceHandler.class;	572	result = getMdrStorage().getInstanceHandlerClass();
545	}	573	}
546	}	574	}
547	return result;	575	return result;
		576	}
		577
		578	private Class resolveClass(String className) throws ClassNotFoundException {
		579	return BaseObjectHandler.resolveImplementation(className);
548	}	580	}
549		581
550	protected void deleteRecursive() throws StorageException {	582	protected void deleteRecursive() throws StorageException {

Lines 54-59 Link Here

(-)src/org/netbeans/mdr/storagemodel/StorablePackage.java (+7 lines)
54	}	54	}
55		55
56	/**	56	/**
		57	* Returns the super-class for generated handler classes.
		58	*/
		59	public Class getPackageSuperclass() throws StorageException, ClassNotFoundException {
		60	return getMdrStorage().getPackageProxyHandlerClass();
		61	}
		62
		63	/**
57	* @param pkgMeta	64	* @param pkgMeta
58	* @param clustered	65	* @param clustered
59	* @throws StorageException	66	* @throws StorageException




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
 * Microsystems, Inc. All Rights Reserved.


import org.netbeans.api.mdr.events.*;
import org.netbeans.mdr.handlers.BaseObjectHandler;
import org.netbeans.mdr.storagemodel.CompositeCollection;
import java.util.*;
import javax.jmi.reflect.*;


 * after transactions.
 *
 * @author  mmatula
 * @author <a href="mailto:hkrug@rationalizer.com>Holger Krug</code>.
 * @version
 */
public final class EventNotifier {
  
  /* -------------------------------------------------------------------- */
  /* -- Constants ------------------------------------------------------- */
  /* -------------------------------------------------------------------- */
  
  /** Bitmask representing all event types which may be received by listeners
   * listening on associations. */
  public static final int EVENTMASK_BY_ASSOCIATION = MDRChangeEvent.EVENTMASK_ON_ASSOCIATION;
  /** Bitmask representing all event types which may be received by listeners
   * listening on instances. */
  public static final int EVENTMASK_BY_INSTANCE = EVENTMASK_BY_ASSOCIATION | MDRChangeEvent.EVENTMASK_ON_INSTANCE;
  /** Bitmask representing all event types which may be received by listeners
   * listening on class proxies. */
  public static final int EVENTMASK_BY_CLASS = EVENTMASK_BY_INSTANCE | MDRChangeEvent.EVENTMASK_ON_CLASS;
  /** Bitmask representing all event types which may be received by listeners
   * listening on package proxies. */
  public static final int EVENTMASK_BY_PACKAGE = EVENTMASK_BY_CLASS | MDRChangeEvent.EVENTMASK_ON_PACKAGE;
  /** Bitmask representing all event types which may be received by listeners
   * listening on repository proxies. */
  public static final int EVENTMASK_BY_REPOSITORY = EVENTMASK_BY_CLASS | MDRChangeEvent.EVENTMASK_ON_REPOSITORY;
  
  /* -------------------------------------------------------------------- */
  /* -- Methods for debugging purposes (static) ------------------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Pretty prints an event type.
   *
   * <p>[XXX]: Probably this method should be used to a test utility
   * class ?!</p>
   */
  public static String prettyPrintType(MDRChangeEvent e) {
    if (e.isOfType(AttributeEvent.EVENT_ATTRIBUTE_ADD)) return "EVENT_ATTRIBUTE_ADD";
    else if (e.isOfType(AttributeEvent.EVENT_ATTRIBUTE_REMOVE)) return "EVENT_ATTRIBUTE_REMOVE";
    else if (e.isOfType(AttributeEvent.EVENT_ATTRIBUTE_SET)) return "EVENT_ATTRIBUTE_SET";
    else if (e.isOfType(AttributeEvent.EVENT_CLASSATTR_ADD)) return "EVENT_CLASSATTR_ADD";
    else if (e.isOfType(AttributeEvent.EVENT_CLASSATTR_REMOVE)) return "EVENT_CLASSATTR_REMOVE";
    else if (e.isOfType(AttributeEvent.EVENT_CLASSATTR_SET)) return "EVENT_CLASSATTR_SET";
    else if (e.isOfType(InstanceEvent.EVENT_INSTANCE_CREATE)) return "EVENT_INSTANCE_CREATE";
    else if (e.isOfType(InstanceEvent.EVENT_INSTANCE_DELETE)) return "EVENT_INSTANCE_DELETE";
    else if (e.isOfType(AssociationEvent.EVENT_ASSOCIATION_ADD)) return "EVENT_ASSOCIATION_ADD";
    else if (e.isOfType(AssociationEvent.EVENT_ASSOCIATION_REMOVE)) return "EVENT_ASSOCIATION_REMOVE";
    else if (e.isOfType(AssociationEvent.EVENT_ASSOCIATION_SET)) return "EVENT_ASSOCIATION_SET";
    else if (e.isOfType(ExtentEvent.EVENT_EXTENT_CREATE)) return "EVENT_EXTENT_CREATE";
    else if (e.isOfType(ExtentEvent.EVENT_EXTENT_DELETE)) return "EVENT_EXTENT_DELETE";
    else if (e.isOfType(TransactionEvent.EVENT_TRANSACTION_COMMIT)) return "EVENT_TRANSACTION_COMMIT";
    else if (e.isOfType(TransactionEvent.EVENT_TRANSACTION_ROLLBACK)) return "EVENT_TRANSACTION_ROLLBACK";
    else if (e.isOfType(TransactionEvent.EVENT_TRANSACTION_START)) return "EVENT_TRANSACTION_START";
    else return "<UNKNOWN>";
  }
  /**
   * Pretty prints a event type mask.
   *
   * <p>[XXX]: Probably this method should be used to a test utility
   * class ?!</p>
   */
  public static String prettyPrintMask(int mask) {
    StringBuffer buf = new StringBuffer();
    if ( (mask & AttributeEvent.EVENT_ATTRIBUTE_ADD) ==  AttributeEvent.EVENT_ATTRIBUTE_ADD ) buf.append("IAA ");
    if ( (mask & AttributeEvent.EVENT_ATTRIBUTE_REMOVE) == AttributeEvent.EVENT_ATTRIBUTE_REMOVE ) buf.append("IAR ");
    if ( (mask & AttributeEvent.EVENT_ATTRIBUTE_SET) == AttributeEvent.EVENT_ATTRIBUTE_SET ) buf.append("IAS ");
    if ( (mask & AttributeEvent.EVENT_CLASSATTR_ADD) == AttributeEvent.EVENT_CLASSATTR_ADD ) buf.append("CAA ");
    if ( (mask & AttributeEvent.EVENT_CLASSATTR_REMOVE) == AttributeEvent.EVENT_CLASSATTR_REMOVE ) buf.append("CAR ");
    if ( (mask & AttributeEvent.EVENT_CLASSATTR_SET) == AttributeEvent.EVENT_CLASSATTR_SET ) buf.append("CAS ");
    if ( (mask & InstanceEvent.EVENT_INSTANCE_CREATE) == InstanceEvent.EVENT_INSTANCE_CREATE ) buf.append("IC ");
    if ( (mask & InstanceEvent.EVENT_INSTANCE_DELETE) == InstanceEvent.EVENT_INSTANCE_DELETE ) buf.append("ID ");
    if ( (mask & AssociationEvent.EVENT_ASSOCIATION_ADD) == AssociationEvent.EVENT_ASSOCIATION_ADD ) buf.append("AA ");
    if ( (mask & AssociationEvent.EVENT_ASSOCIATION_REMOVE) == AssociationEvent.EVENT_ASSOCIATION_REMOVE ) buf.append("AR ");
    if ( (mask & AssociationEvent.EVENT_ASSOCIATION_SET) == AssociationEvent.EVENT_ASSOCIATION_SET ) buf.append("AS ");
    if ( (mask & ExtentEvent.EVENT_EXTENT_CREATE) == ExtentEvent.EVENT_EXTENT_CREATE ) buf.append("EC ");
    if ( (mask & ExtentEvent.EVENT_EXTENT_DELETE) == ExtentEvent.EVENT_EXTENT_DELETE ) buf.append("ED ");
    if ( (mask & TransactionEvent.EVENT_TRANSACTION_COMMIT) == TransactionEvent.EVENT_TRANSACTION_COMMIT ) buf.append("TC ");
    if ( (mask & TransactionEvent.EVENT_TRANSACTION_ROLLBACK) == TransactionEvent.EVENT_TRANSACTION_ROLLBACK ) buf.append("TR ");
    if ( (mask & TransactionEvent.EVENT_TRANSACTION_START) == TransactionEvent.EVENT_TRANSACTION_START ) buf.append("TS ");
    if ( buf.length() > 0 ) buf.deleteCharAt(buf.length()-1);
    return buf.toString();
  }
  
  /* -------------------------------------------------------------------- */
  /* -- Public attributes ----------------------------------------------- */
  /* -------------------------------------------------------------------- */
  
  public final Association ASSOCIATION = new Association();
  public final Clazz CLASS = new Clazz();
  public final Instance INSTANCE = new Instance();
  public final Package PACKAGE = new Package();
  public final Repository REPOSITORY = new Repository();
  
  /* -------------------------------------------------------------------- */
  /* -- Private attributes ---------------------------------------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Thread for the dispatching of events after transaction success.
   */
  private final Thread dispatcher = new Thread(new EventsDelivery());
  
  /**
   * Maps: event =&gt; instance of <code>QueuedListenerSet</code>.
   */
  private final Hashtable queuedListenerMap = new Hashtable();
  
  /**
   * Queue for the events of the currently running write transaction.
   * The events are stored to inform their listeners either about
   * rollback or success.
   */
  private final LinkedList localQueue = new LinkedList();
  
  /**
   * Queue for the events of successfully finished transactions, the
   * listeners of which still have to be informed.
   */
  private final LinkedList globalQueue = new LinkedList();
  
  /* -------------------------------------------------------------------- */
  /* -- Constructor (public) -------------------------------------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Starts the dispatcher thread as daemon.
   */
  public EventNotifier() {
    dispatcher.setDaemon(true);
    dispatcher.start();
  }
  
  /* -------------------------------------------------------------------- */
  /* -- Methods to fire events at transaction commit or rollback time --- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Calls {@link MDRPreChangeListener.changeCancelled(MDRChangeEvent)} for
   * all pre-change listeners on <code>event</code> to inform them
   * about cancelling the event.
   */
  public void fireCancelled(MDRChangeEvent event) {
    localQueue.remove(event);
    QueuedListenerSet collected = (QueuedListenerSet) queuedListenerMap.remove(event);
    if (collected == null) {
      System.err.println("Change cancelled event not corresponding to any planned change event.");
      Thread.dumpStack();
      return;
    }
    // fire changeCancelled event
    for (QueuedListenerSet.PreListenerIterator it = collected.preListenerIterator(); it.hasNext();) {
      try {
        it.next().changeCancelled(event);
      } catch (RuntimeException e) {
        // log the exception
        e.printStackTrace();
      }
    }
  }
  
  /**
   * Calls {@link MDRPreChangeListener.changeCancelled(MDRChangeEvent)}
   * on all pre-change listeners of all events of the transaction to be
   * rolled back.
   */
  public void fireCancelled() {
    while (!localQueue.isEmpty()) {
      MDRChangeEvent event = (MDRChangeEvent) localQueue.getFirst();
      fireCancelled(event);
    }
  }
  
  /**
   * Enqueues all events of a transaction successfully finished to inform
   * the listeners in a separate thread.
   */
  public void fireChanged() {
    synchronized (globalQueue) {
      globalQueue.addAll(localQueue);
      globalQueue.notify();
    }
    localQueue.clear();
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.EventDelivery (inner class, private) -------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Runnable to be executed by the event dispatcher thread. Waits on the
   * global queue if it is empty. Informs the listeners on queued events.
   * Catches all exceptions and logs the stack trace.
   *
   * <p>Returns if a queued change event was not planned before (i.e. does
   *   not correspond to an entry in {@link #changeListeners}.
   */
  private class EventsDelivery implements Runnable {
    /**
     *
     */
    public void run() {
      QueuedListenerSet collected;
      MDRChangeEvent event;
      
      while (true) {
        synchronized (globalQueue) {
          while (globalQueue.isEmpty()) {
            try {
              globalQueue.wait();
            } catch (InterruptedException e) {
              e.printStackTrace();
            }
          }
          collected = (QueuedListenerSet) queuedListenerMap.remove(event = (MDRChangeEvent) globalQueue.removeFirst());
        }
        if (collected == null) {
          System.err.println("Change event not corresponding to any planned change event.");
          Thread.dumpStack();
          return;
        }
        for (QueuedListenerSet.AllListenerIterator it = collected.allListenerIterator(); it.hasNext();) {
          try {
            it.next().change(event);
          } catch (RuntimeException e) {
            // log the exception
            e.printStackTrace();
          }
        }
      }
    }
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.Abstract (inner class, public abstract) ----------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * This class and its derived classes are used to enqueue all changes into
   * the local queue and to fire the pre-change events.
   */
  public abstract class Abstract {
    /**
     * Maps repository objects to instances of <code>RegisteredListenerSet</code>.
     */
    private final HashMap RegisteredListenerSets = new HashMap();
    
    /**
     * Adds <code>listener</code> to <code>source</code> for event types
     * matching <code>mask</code>.
     */
    public void addListener(MDRChangeListener listener, int mask, Object source) {
      //System.out.println("-- CALLED: addListener on " + source + " with " + prettyPrintMask(mask));
      if ( (listener == null) || (mask == 0) ) return;
      
      synchronized (RegisteredListenerSets) {
        RegisteredListenerSet value = (RegisteredListenerSet) RegisteredListenerSets.get(source);
        if ( value == null ) {
          value = new RegisteredListenerSet();
          RegisteredListenerSets.put(source, value);
        }
        value.addListener(listener, mask);
      }
    }
    
    /**
     * Removes <code>listener</code> from <code>source</code> for all event types.
     */
    public void removeListener(MDRChangeListener listener, Object source) {
      if ( listener == null ) return;
      
      synchronized (RegisteredListenerSets) {
        RegisteredListenerSet value = (RegisteredListenerSet) RegisteredListenerSets.get(source);
        if ( value != null ) {
          value.removeListener(listener);
          if ( value.isEmpty() ) {
            RegisteredListenerSets.remove(source);
          }
        }
      }
    }
    
    /**
     * Removes <code>listener</code> from <code>source</code> for event types
     * matching <code>mask</code>.
     */
    public void removeListener(MDRChangeListener listener, int mask, Object source) {
      if ( (listener == null) || (mask == 0) ) return;
      
      synchronized (RegisteredListenerSets) {
        RegisteredListenerSet value = (RegisteredListenerSet) RegisteredListenerSets.get(source);
        if ( value != null ) {
          value.removeListener(listener, mask);
          if ( value.isEmpty() ) {
            RegisteredListenerSets.remove(source);
          }
        }
      }
    }
    
    /** Informs pre-change listeners about the given event. Internally the
     * event is stored together with its pre-change listeners and change
     * listeners to allow further event processing at transaction rollback
     * resp. commit time.
     *
     * @param current The source object of this event.
     * @param event Event object.
     * @exception DebugException if the event was already fired
     */
    public void firePlannedChange(Object current, MDRChangeEvent event) {
      //System.out.println("-- CALLED: firePlannedChange on " + current + " with type " + prettyPrintType(event));
      localQueue.addLast(event);
      // collect all listeners
      QueuedListenerSet queuedListeners = new QueuedListenerSet(event);
      collectListeners(current, event, queuedListeners);
      for (QueuedListenerSet.PreListenerIterator it = queuedListeners.preListenerIterator(); it.hasNext();) {
        try {
          it.next().plannedChange(event);
        } catch (RuntimeException e) {
          // log the exception
          e.printStackTrace();
        }
      }
      if (queuedListenerMap.put(event,queuedListeners) != null) {
        throw new DebugException("Same event fired twice.");
      }
    }
    
    /**
     * Collects the listeners for the given <code>event</code> on object
     * <code>current</code>. This method has to be overwritten by derived
     * classes to inform listeners on objects to which the events are
     * propagated. Overwriting methods shall call this method first and
     * then add any further listeners.
     *
     * @param current the object on which the event was fired
     * @param event the event
     * @param post if <code>false</code>, listeners implementing
     *    {@link org.netbeans.api.mdr.events.MDRPreChangeListener} are
     *    collected, otherwise listeners implementing only
     *    {@link org.netbeans.api.mdr.events.MDRChangeListener}
     * @param preChange the set where the pre-change listeners are collected
     * @param postChange the set where the post-change only listeners are collected
     */
    protected void collectListeners(Object current, MDRChangeEvent event, QueuedListenerSet queuedListeners) {
      // fire event on all listeners registered on this object
      synchronized (RegisteredListenerSets) {
        RegisteredListenerSet value = (RegisteredListenerSet) RegisteredListenerSets.get(current);
        if (value != null) {
          value.collectListeners(queuedListeners);
        }
      }
    }
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.Assocation (inner class, public) ------------------ */
  /* -------------------------------------------------------------------- */
  
  /**
   * Handles events for associations.
   */
  public final class Association extends Abstract {
    private Association() {
      super();
    }
    
    public void addListener(MDRChangeListener listener, int mask, Object source) {
      super.addListener(listener, mask & EventNotifier.EVENTMASK_BY_ASSOCIATION, source);
    }
    public void removeListener(MDRChangeListener listener, int mask, Object source) {
      super.removeListener(listener, mask & EventNotifier.EVENTMASK_BY_ASSOCIATION, source);
    }
    
    /**
     * Adds listeners on the instances participating in the association link
     * added resp. removed and on the owning package.
     */
    protected void collectListeners(Object current, MDRChangeEvent event, QueuedListenerSet queuedListeners) {
      super.collectListeners(current, event, queuedListeners);
      
      // fire event on all listeners registered on instances that were affected
      if (event instanceof AssociationEvent) {
        AssociationEvent assocEvent = (AssociationEvent) event;
        if (assocEvent.getFixedElement() != null) INSTANCE.collectListeners(assocEvent.getFixedElement(), event, queuedListeners);
        if (assocEvent.getOldElement() != null) INSTANCE.collectListeners(assocEvent.getOldElement(), event, queuedListeners);
        if (assocEvent.getNewElement() != null) INSTANCE.collectListeners(assocEvent.getNewElement(), event, queuedListeners);
      }
      
      // fire event on the immediate package extent
      PACKAGE.collectListeners(((RefAssociation) current).refImmediatePackage(), event, queuedListeners);
    }
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.Clazz (inner class, public) ----------------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Handles events for class proxies.
   */
  public final class Clazz extends Abstract {
    private Clazz() {
      super();
    }
    
    public void addListener(MDRChangeListener listener, int mask, Object source) {
      super.addListener(listener, mask & EventNotifier.EVENTMASK_BY_CLASS, source);
    }
    public void removeListener(MDRChangeListener listener, int mask, Object source) {
      super.removeListener(listener, mask & EventNotifier.EVENTMASK_BY_CLASS, source);
    }
    
    /**
     * Adds listeners on the owning package.
     */
    protected void collectListeners(Object current, MDRChangeEvent event, QueuedListenerSet queuedListeners) {
      super.collectListeners(current, event, queuedListeners);
      PACKAGE.collectListeners(((RefClass) current).refImmediatePackage(), event, queuedListeners);
    }
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.Instance (inner class, public) -------------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Handles events for instances.
   */
  public final class Instance extends Abstract {
    private Instance() {
      super();
    }
    
    public void addListener(MDRChangeListener listener, int mask, Object source) {
      super.addListener(listener, mask & EventNotifier.EVENTMASK_BY_INSTANCE, source);
    }
    public void removeListener(MDRChangeListener listener, int mask, Object source) {
      super.removeListener(listener, mask & EventNotifier.EVENTMASK_BY_INSTANCE, source);
    }
    
    /**
     * Adds listeners on the owning class proxy.
     */
    protected void collectListeners(Object current, MDRChangeEvent event, QueuedListenerSet queuedListeners) {
      super.collectListeners(current, event, queuedListeners);
      CLASS.collectListeners(((RefObject) current).refClass(), event, queuedListeners);
    }
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.Package (inner class, public) --------------------- */
  /* -------------------------------------------------------------------- */
  
  /**
   * Handles events for packages.
   */
  public final class Package extends Abstract {
    private Package() {
      super();
    }
    
    public void addListener(MDRChangeListener listener, int mask, Object source) {
      super.addListener(listener, mask & EventNotifier.EVENTMASK_BY_PACKAGE, source);
    }
    public void removeListener(MDRChangeListener listener, int mask, Object source) {
      super.removeListener(listener, mask & EventNotifier.EVENTMASK_BY_PACKAGE, source);
    }
    
    /**
     * Adds listeners on the owning package resp., if this package is
     * outermost, on the repository.
     */
    protected void collectListeners(Object current, MDRChangeEvent event, QueuedListenerSet queuedListeners) {
      super.collectListeners(current, event, queuedListeners);
      RefPackage immediate = ((RefPackage) current).refImmediatePackage();
      if (immediate != null) {
        collectListeners(immediate, event, queuedListeners);
      } else {
        REPOSITORY.collectListeners(((BaseObjectHandler) current)._getDelegate().getMdrStorage(), event, queuedListeners);
      }
    }
  }
  
  /* -------------------------------------------------------------------- */
  /* -- EventNotifier.Repository (inner class, public) ------------------ */
  /* -------------------------------------------------------------------- */
  
  /**
   * Handles events for repositories.
   */
  public final class Repository extends Abstract {
    private Repository() {
      super();
    }
    
    public void addListener(MDRChangeListener listener, int mask, Object source) {
      super.addListener(listener, mask & EventNotifier.EVENTMASK_BY_REPOSITORY, source);
    }
    public void removeListener(MDRChangeListener listener, int mask, Object source) {
      super.removeListener(listener, mask & EventNotifier.EVENTMASK_BY_REPOSITORY, source);
    }
  }
  
  /* ===================================================================== */
  /* == INNER CLASS CONTAINING OPTIMIZED/OPTIMIZABLE DATASTRUCTURES ====== */
  /* == FOR LISTENER MANAGEMENT ========================================== */
  /* ===================================================================== */
  Index: src/org/netbeans/mdr/util/ImplClass.java

 * @version 
 */
public abstract class ImplClass {
    
    /* Suffix for the names of implementation classes. */
    protected static final String classNameSuffix = "$Impl";
    private static final ProtectionDomain pd;


Lines 13-18 Link Here

(-)src/org/netbeans/mdr/util/TransactionMutex.java (-4 / +27 lines)
13	package org.netbeans.mdr.util;	13	package org.netbeans.mdr.util;
14		14
15	import java.util.HashMap;	15	import java.util.HashMap;
		16	import org.netbeans.api.mdr.events.TransactionEvent;
		17	import org.netbeans.mdr.NBMDRepositoryImpl;
16	import org.netbeans.mdr.storagemodel.MdrStorage;	18	import org.netbeans.mdr.storagemodel.MdrStorage;
17	import org.netbeans.mdr.persistence.StorageException;	19	import org.netbeans.mdr.persistence.StorageException;
18		20
Lines 52-65 Link Here
52	// events notifier	54	// events notifier
53	private final EventNotifier notifier;	55	private final EventNotifier notifier;
54		56
		57	// the repository (used as event source for transaction events)
		58	private final NBMDRepositoryImpl repository;
		59
55	/* -------------------------------------------------------------------- */	60	/* -------------------------------------------------------------------- */
56	/* -- Constructor (public) -------------------------------------------- */	61	/* -- Constructor (public) -------------------------------------------- */
57	/* -------------------------------------------------------------------- */	62	/* -------------------------------------------------------------------- */
58		63
59	/** Creates new TransactionMutex */	64	/** Creates new TransactionMutex */
60	public TransactionMutex(MdrStorage storage, EventNotifier notifier) {	65	public TransactionMutex(MdrStorage storage, EventNotifier notifier, NBMDRepositoryImpl repository) {
61	this.storage = storage;	66	this.storage = storage;
62	this.notifier = notifier;	67	this.notifier = notifier;
		68	this.repository = repository;
63	}	69	}
64		70
65	/* -------------------------------------------------------------------- */	71	/* -------------------------------------------------------------------- */
Lines 107-114 Link Here
107	}	113	}
108		114
109	if (writeAccess \|\| counter > 0) {	115	if (writeAccess \|\| counter > 0) {
		116	if ( counter == 0 ) {
		117	writer = thread;
		118	TransactionEvent event = new TransactionEvent(
		119	repository,
		120	TransactionEvent.EVENT_TRANSACTION_START
		121	);
		122	notifier.REPOSITORY.firePlannedChange(storage, event);
		123	}
110	counter++;	124	counter++;
111	writer = thread;
112	} else {	125	} else {
113	Counter rCount = (Counter) readers.get(thread);	126	Counter rCount = (Counter) readers.get(thread);
114	if (rCount == null) {	127	if (rCount == null) {
Lines 129-135 Link Here
129	/**	142	/**
130	* Leave a transaction. If an outermost (i.e. not nested) write	143	* Leave a transaction. If an outermost (i.e. not nested) write
131	* transaction is left, the listeners are informed and the transaction	144	* transaction is left, the listeners are informed and the transaction
132	* is committed resp. rolled back. Finally all waiting thread are	145	* is committed resp. rolled back. Finally all waiting threads are
133	* notified.	146	* notified.
134	*	147	*
135	* @param fail <code>false</code> indicates transaction	148	* @param fail <code>false</code> indicates transaction
Lines 146-156 Link Here
146	// left the last write lock -> commit/rollback and send events	159	// left the last write lock -> commit/rollback and send events
147	try {	160	try {
148	if (this.fail) {	161	if (this.fail) {
		162	TransactionEvent event = new TransactionEvent(
		163	repository,
		164	TransactionEvent.EVENT_TRANSACTION_ROLLBACK
		165	);
		166	notifier.REPOSITORY.firePlannedChange(storage, event);
149	notifier.fireCancelled();	167	notifier.fireCancelled();
150	storage.rollback();	168	storage.rollback();
151	Thread.dumpStack();	169	Thread.dumpStack();
152	System.out.println("rolled back!");	170	System.out.println("rolled back!");
153	} else {	171	} else {
		172	TransactionEvent event = new TransactionEvent(
		173	repository,
		174	TransactionEvent.EVENT_TRANSACTION_COMMIT
		175	);
		176	notifier.REPOSITORY.firePlannedChange(storage, event);
154	notifier.fireChanged();	177	notifier.fireChanged();
155	storage.commit();	178	storage.commit();
156	//System.out.println("commited");	179	//System.out.println("commited");
Lines 189-195 Link Here
189	/* -------------------------------------------------------------------- */	212	/* -------------------------------------------------------------------- */
190		213
191	/**	214	/**
192	* Instances <code>Counter</code> are integer with {@link #dec() decrement}	215	* Instances <code>Counter</code> are integers with {@link #dec() decrement}
193	* and {@link #inc() increment} methods.	216	* and {@link #inc() increment} methods.
194	*/	217	*/
195	private static class Counter {	218	private static class Counter {

Lines 26-49 Link Here

(-)src/org/netbeans/modules/mdrexplorer/looks/MDREventHandler.java (-45 / +68 lines)
26	import org.netbeans.api.looks.Look;	26	import org.netbeans.api.looks.Look;
27		27
28	/**	28	/**
		29	* Instances of <code>MDREventHandler</code> are event handlers which listen
		30	* on repository changes on behalf of {@link org.netbeans.api.looks.LookNodeSubstitutes
		31	* node substitutes}. They manage a map from repository objects to node substitutes
		32	* to be able to access the node substitute for a given repository object. Looks
		33	* have to register their node subsitutes by calling {@link #addNodeSubstitute(Look.NodeSubstitute)}
		34	* or {@link #addNodeSubstitute(Object, Look.NodeSubstitute)} from within
		35	* {@link org.netbeans.api.looks.Look#attachTo(ook.NodeSubstitute)}.
29	*	36	*
		37	* @deprecated register NodeSubstitutes directly on repository objects instead, see
		38	* <a href="http://mdr.netbeans.org/issues/show_bug.cgi?id=25186">issue 25186</a>
30	* @author Tomas Zezula	39	* @author Tomas Zezula
31	*/	40	*/
32	public class MDREventHandler implements MDRPreChangeListener {	41	public class MDREventHandler implements MDRPreChangeListener {
33		42
		43	/* --------------------------------------------------------------------- */
		44	/* -- Attributes ------------------------------------------------------- */
		45	/* --------------------------------------------------------------------- */
		46
		47	/**
		48	* Maps repository content to node substitutes.
		49	*/
34	private HashMap registeredNodeSubstitutes;	50	private HashMap registeredNodeSubstitutes;
		51
		52	/**
		53	* Map storing the parents of objects to be deleted. After an object has
		54	* been deleted, its parent node is not accessible any more. Nevertheless it
		55	* must be refreshed to reflect the deletion of the node representing the object.
		56	* Hence the parents of the objects to be deleted are stored in the map.
		57	*/
35	private HashMap pendingEvents;	58	private HashMap pendingEvents;
36	private ReferenceQueue queue;	59	private ReferenceQueue queue;
37	private MDRepository repository;	60	private MDRepository repository;
38		61
		62	/* --------------------------------------------------------------------- */
		63	/* -- Constructor ------------------------------------------------------ */
		64	/* --------------------------------------------------------------------- */
		65
39	public MDREventHandler (MDRepository repository) {	66	public MDREventHandler (MDRepository repository) {
40	this.queue = new ReferenceQueue();	67	this.queue = new ReferenceQueue();
41	this.registeredNodeSubstitutes = new HashMap();	68	this.registeredNodeSubstitutes = new HashMap();
42	this.pendingEvents = new HashMap();	69	this.pendingEvents = new HashMap();
43	this.repository = repository;	70	this.repository = repository;
44	this.repository.addListener(this);	71	this.repository.addListener(this, MDRChangeEvent.EVENTMASK_ALL);
45	}	72	}
46		73
		74	/* --------------------------------------------------------------------- */
		75	/* -- Management of NodeSubstitutes ------------------------------------ */
		76	/* --------------------------------------------------------------------- */
		77
47	public synchronized void addNodeSubstitute(Look.NodeSubstitute substitute) {	78	public synchronized void addNodeSubstitute(Look.NodeSubstitute substitute) {
48	if (substitute == null)	79	if (substitute == null)
49	return;	80	return;
Lines 56-87 Link Here
56	this.registeredNodeSubstitutes.put(key, new WeakReference(substitute,this.queue));	87	this.registeredNodeSubstitutes.put(key, new WeakReference(substitute,this.queue));
57	}	88	}
58		89
59	/** This method is called when the node was garbage collected. You shoud	90	private synchronized Look.NodeSubstitute getNodeSubstituteForObject(Object object) {
60	* unregister from all objects where this object was registered as a	91	if (object ==null)
61	* listener.	92	return null;
62	*/	93	Reference ref = (Reference) this.registeredNodeSubstitutes.get(object);
63		94	if (ref == null) {
64	/** This method gets called if a planned change (which was already announced	95	return null; // Not registered object
65	* by calling {@link #plannedChange} was cancelled (e.g. the operation that was
66	* going to perform the change failed). This method is called synchronously by
67	* the operation that tried to perform the change.<p>
68	* Any run-time exception thrown by the implementation of this method should
69	* not affect the events dispatching (i.e. it should be ignored by the event source).
70	* @param e Object describing the cancelled change (has to be the same instance
71	* as passed to the {@link #plannedChange} method).
72	*/
73	public void changeCancelled(MDRChangeEvent e) {
74	if ((e.getType() & 2) == 2) {
75	this.pendingEvents.remove(e.getSource());
76	}	96	}
		97	Look.NodeSubstitute substitute = (Look.NodeSubstitute) ref.get();
		98	return substitute;
77	}	99	}
78		100
79	/** This method gets called when a repository change is planned to occur.	101	/* --------------------------------------------------------------------- */
80	* Any operation that performs a change in MDR has to fire this notification	102	/* -- Implements org.netbeans.api.mdr.MDRPreChangeListener ------------- */
81	* synchronously on each registered pre-change listener before the change is performed.<p>	103	/* --------------------------------------------------------------------- */
82	* Any run-time exception thrown by the implementation of this method should	104
83	* not affect the events dispatching (i.e. it should be ignored by the event source).	105	/**
84	* @param e Object describing the planned change.	106	* Handles deletion events only. Stores the parents of objects to be deleted.
		107	* This is necessary to refresh parent nodes when the object to be deleted
		108	* has been deleted.
85	*/	109	*/
86	public void plannedChange(MDRChangeEvent e) {	110	public void plannedChange(MDRChangeEvent e) {
87	if ((e.getType() & ExtentEvent.EVENT_EXTENT_DELETE) == ExtentEvent.EVENT_EXTENT_DELETE) {	111	if ((e.getType() & ExtentEvent.EVENT_EXTENT_DELETE) == ExtentEvent.EVENT_EXTENT_DELETE) {
Lines 107-122 Link Here
107	}	131	}
108	}	132	}
109		133
110	/** This method gets called after a repository change is performed. This method	134	/**
111	* is called asynchronously.	135	* Removes the information stored for the pending event <code>e</code>.
112	* If a listener implements {@link MDRPreChangeListener} which is a descedant	136	* @see #plannedChange(MDRChangeEvent)
113	* of this interface, the event object passed to this method must be the same	137	*/
114	* instance as the event object previously passed to the corresponding	138	public void changeCancelled(MDRChangeEvent e) {
115	* {@link MDRPreChangeListener#plannedChange} method call of the listener.<p>	139	if ((e.getType() & 2) == 2) {
116	* Any run-time exception thrown by the implementation of this method should	140	this.pendingEvents.remove(e.getSource());
117	* not affect the events dispatching (i.e. it should be ignored by the event source).	141	}
118	*	142	}
119	* @param e Object describing the performed change.	143
		144	/**
		145	* Refreshes the nodes affected by <code>e</code>.
120	*/	146	*/
121	public void change(MDRChangeEvent e) {	147	public void change(MDRChangeEvent e) {
122	if ((e.getType() & ExtentEvent.EVENT_EXTENT_CREATE) == ExtentEvent.EVENT_EXTENT_CREATE) {	148	if ((e.getType() & ExtentEvent.EVENT_EXTENT_CREATE) == ExtentEvent.EVENT_EXTENT_CREATE) {
Lines 171-176 Link Here
171	}	197	}
172	}	198	}
173		199
		200	/* --------------------------------------------------------------------- */
		201	/* -- Clean-up dangling map entries ------------------------------------ */
		202	/* --------------------------------------------------------------------- */
		203
		204	/**
		205	* Removes entries with garbage collected values from the map associating
		206	* repository objects with node substitutes.
		207	*/
174	synchronized void flushReferenceQueue() {	208	synchronized void flushReferenceQueue() {
175	if (this.queue.poll()!=null) {	209	if (this.queue.poll()!=null) {
176	Iterator values = this.registeredNodeSubstitutes.values().iterator();	210	Iterator values = this.registeredNodeSubstitutes.values().iterator();
Lines 184-200 Link Here
184	}	218	}
185	}	219	}
186		220
187
188	private synchronized Look.NodeSubstitute getNodeSubstituteForObject(Object object) {
189	if (object ==null)
190	return null;
191	Reference ref = (Reference) this.registeredNodeSubstitutes.get(object);
192	if (ref == null) {
193	return null; // Not registered object
194	}
195	Look.NodeSubstitute substitute = (Look.NodeSubstitute) ref.get();
196	return substitute;
197	}
198		221
199		222
200	}	223	}

Lines 14-19 Link Here

(-)test/build.xml (+3 lines)
14		14
15	<project name="MDR test build script" basedir="." default="all">	15	<project name="MDR test build script" basedir="." default="all">
16		16
		17	<!-- Properties: external files -->
		18	<property name="openide.jar" location="../../openide/netbeans/lib/openide.jar"/>
		19
17	<!-- Points to directory with IDE to test-->	20	<!-- Points to directory with IDE to test-->
18	<property name="netbeans.home" location="../../nbbuild/netbeans"/>	21	<property name="netbeans.home" location="../../nbbuild/netbeans"/>
19		22

Lines 68-74 Link Here

(-)test/unit/src/org/netbeans/mdr/test/MDRTestAssociationEvents.java (-2 / +2 lines)
68		68
69	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));	69	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
70		70
71	((MDRChangeSource) repository).addListener(this);	71	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
72		72
73	Collection allMOFAssociations = testMOFPackage.refAllAssociations();	73	Collection allMOFAssociations = testMOFPackage.refAllAssociations();
74	Iterator iterAssoc = allMOFAssociations.iterator();	74	Iterator iterAssoc = allMOFAssociations.iterator();
Lines 106-112 Link Here
106		106
107	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));	107	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
108		108
109	((MDRChangeSource) repository).addListener(this);	109	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
110		110
111	Collection allMOFAssociations = testMOFPackage.refAllAssociations();	111	Collection allMOFAssociations = testMOFPackage.refAllAssociations();
112	Iterator iterAssoc = allMOFAssociations.iterator();	112	Iterator iterAssoc = allMOFAssociations.iterator();

Lines 68-74 Link Here

(-)test/unit/src/org/netbeans/mdr/test/MDRTestAssociationPreEvents.java (-2 / +2 lines)
68		68
69	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));	69	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
70		70
71	((MDRChangeSource) repository).addListener(this);	71	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
72		72
73	Collection allMOFAssociations = testMOFPackage.refAllAssociations();	73	Collection allMOFAssociations = testMOFPackage.refAllAssociations();
74	Iterator iterAssoc = allMOFAssociations.iterator();	74	Iterator iterAssoc = allMOFAssociations.iterator();
Lines 106-112 Link Here
106		106
107	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));	107	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
108		108
109	((MDRChangeSource) repository).addListener(this);	109	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
110		110
111	Collection allMOFAssociations = testMOFPackage.refAllAssociations();	111	Collection allMOFAssociations = testMOFPackage.refAllAssociations();
112	Iterator iterAssoc = allMOFAssociations.iterator();	112	Iterator iterAssoc = allMOFAssociations.iterator();




        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
        
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();

            if (!metaClass.isAbstract()) {
                log("Creating instance for class: " + metaClass.getName());
                newRefObj = generator.generateInstance(metaClass);
                ((MDRChangeSource) newRefObj).addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
                generator.addAttribute(newRefObj, true, goldenPass, false);
            } else {
                log("Abstract class: " + metaClass.getName());

        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
        
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();

                log("Creating instance for class: " + metaClass.getName());
                newRefObj = generator.generateInstance(metaClass);
                // listening on class instance and repository too
                ((MDRChangeSource) newRefObj).addListener(listener, MDRChangeEvent.EVENTMASK_ALL);                
                generator.setAttribute(newRefObj, goldenPass, false);
            } else {
                log("Abstract class: " + metaClass.getName());




        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
        
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();

                log("Creating instance for class: " + metaClass.getName());
                newRefObj = generator.generateInstance(metaClass);
                // listening on class instance and repository too
                ((MDRChangeSource) newRefObj).addListener(listener, MDRChangeEvent.EVENTMASK_ALL);                
                generator.setAttribute(newRefObj, goldenPass, true);
            } else {
                log("Abstract class: " + metaClass.getName());

        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
        
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();

            if (!metaClass.isAbstract()) {
                log("Creating instance for class: " + metaClass.getName());
                newRefObj = generator.generateInstance(metaClass);
                ((MDRChangeSource) newRefObj).addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
                generator.addAttribute(newRefObj, true, goldenPass, true);
            } else {
                log("Abstract class: " + metaClass.getName());

Lines 42-48 Link Here

(-)test/unit/src/org/netbeans/mdr/test/MDRTestExtentEvents.java (-1 / +1 lines)
42		42
43	protected void setUp() {	43	protected void setUp() {
44	super.setUp();	44	super.setUp();
45	((MDRChangeSource) repository).addListener(this);	45	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
46	}	46	}
47		47
48	protected void tearDown() {	48	protected void tearDown() {

Lines 42-48 Link Here

(-)test/unit/src/org/netbeans/mdr/test/MDRTestExtentPreEvents.java (-1 / +1 lines)
42		42
43	protected void setUp() {	43	protected void setUp() {
44	super.setUp();	44	super.setUp();
45	((MDRChangeSource) repository).addListener(this);	45	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
46	}	46	}
47		47
48	protected void tearDown() {	48	protected void tearDown() {

Lines 68-74 Link Here

(-)test/unit/src/org/netbeans/mdr/test/MDRTestInstanceEvents.java (-2 / +2 lines)
68		68
69	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));	69	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
70		70
71	((MDRChangeSource) repository).addListener(this);	71	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
72		72
73	RefObject newRefObj = null;	73	RefObject newRefObj = null;
74	Collection allMOFClasses = testMOFPackage.refAllClasses();	74	Collection allMOFClasses = testMOFPackage.refAllClasses();
Lines 118-124 Link Here
118		118
119	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));	119	EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
120		120
121	((MDRChangeSource) repository).addListener(this);	121	((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
122		122
123	RefObject newRefObj = null;	123	RefObject newRefObj = null;
124	Collection allMOFClasses = testMOFPackage.refAllClasses();	124	Collection allMOFClasses = testMOFPackage.refAllClasses();




        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
                
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();

        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
        
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();

        
        EventsDataGenerator generator = new EventsDataGenerator(repository.getExtent(PKG_NAME));
        
        ((MDRChangeSource) repository).addListener(this, MDRChangeEvent.EVENTMASK_ALL);
        
        RefObject newRefObj = null;
        Collection allMOFClasses = testMOFPackage.refAllClasses();




    
    // classifier-level attribute test
    public void test_1 () {
        ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
        StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
        
        int x, y;


    // static operator test
    public void test_2 () {
        ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
        StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
                
        ClassAClass proxyA = pkg.getClassA (); // staticFieldA (String), staticFieldB (int)

    
    // derived classifier-level attribute test
    public void test_3 () {
        ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
        StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
                        
        ClassDClass proxyD = pkg.getClassD (); // staticFieldD (String), staticDerivedField (int), op. compute

            fail();
    }
    
    // classifier-level attribute test using reflective methods
    public void test_reflective () {
        ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
        StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
        
        int x, y;
        final int MAX = 100;
        final int INT_VALUE = 678;
        Random random = new Random (0);
        
        RefClass proxyA = pkg.getClassA (); // staticFieldA (String), staticFieldB (int)
        RefClass proxyB = pkg.getClassB ();
        RefClass proxyC = pkg.getClassC (); // staticFieldC (int), op. returnParam 
        RefClass proxyD = pkg.getClassD (); // staticFieldD (String), staticDerivedField (int), op. compute
        
        if (proxyD.refGetValue("staticFieldD") != null)
            fail ();
        proxyD.refSetValue("staticFieldD",  "123");
        proxyB.refSetValue("staticFieldA", "abcdef");
        
        for (x = 0; x < MAX; x++) {
            int value = random.nextInt ();
            proxyD.refSetValue("staticFieldB", new Integer(value));
            if ( (((Integer)proxyA.refGetValue("staticFieldB")).intValue() != value) || (((Integer)proxyD.refGetValue("staticFieldB")).intValue() != value))
                fail ();            
        }
                
        proxyD.refSetValue("staticFieldC", new Integer(INT_VALUE));
        
        if (!proxyD.refGetValue("staticFieldD").equals("123"))
            fail();
        if (!proxyB.refGetValue("staticFieldA").equals("abcdef"))
            fail();
        if (((Integer)proxyD.refGetValue("staticFieldC")).intValue() != INT_VALUE)
            fail();
                
        proxyD.refSetValue("staticFieldC", new Integer(22));        
        if (!proxyB.refGetValue("staticFieldA").equals("abcdef"))
            fail();        
    }
}

Return to bug 25186

Lines 259-277 Link Here

(-)src/org/netbeans/mdr/handlers/ClassProxyHandler.java (-5 / +23 lines)
259	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */	259	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
260	/* -------------------------------------------------------------------- */	260	/* -------------------------------------------------------------------- */
261		261
262	/** Registers a listener for receiving event notifications.	262	/** Registers a listener for receiving event notifications with are
263	* @param listener Object that implements {@link Listener} interface.	263	* initially fired on this object.
		264	* @param listener Object that implements {@link MDRChangeListener} interface.
264	*/	265	*/
265	public void addListener(MDRChangeListener listener) {	266	public void addListener(MDRChangeListener listener) {
266	_getMdrStorage().getEventNotifier().CLASS.addListener(listener, this);	267	addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
		268	}
		269
		270	/** Registers a listener for receiving event notifications.
		271	* @param listener Object that implements {@link MDRChangeListener} interface.
		272	* @param mask bitmask to filter types of events the listener listens on
		273	*/
		274	public void addListener(MDRChangeListener listener, int mask) {
		275	_getMdrStorage().getEventNotifier().CLASS.addListener(listener, mask, this);
267	}	276	}
268		277
269	/** Removes listener from the list of objects registered for events notifications.	278	/** Removes listener from the list of objects registered for event notifications.
270	* @param listener Object that implements {@link Listener} interface.	279	* @param listener Object that implements {@link MDRChangeListener} interface.
271	*/	280	*/
272	public void removeListener(MDRChangeListener listener) {	281	public void removeListener(MDRChangeListener listener) {
273	_getMdrStorage().getEventNotifier().CLASS.removeListener(listener, this);	282	_getMdrStorage().getEventNotifier().CLASS.removeListener(listener, this);
274	}	283	}
		284
		285	/** Removes listener from the list of objects registered for event notifications.
		286	* @param listener Object that implements {@link MDRChangeListener} interface.
		287	* @param mask determines type of the events the listeners stops to listen on
		288	*/
		289	public void removeListener(MDRChangeListener listener, int mask) {
		290	_getMdrStorage().getEventNotifier().CLASS.removeListener(listener, mask, this);
		291	}
		292
275	/* -------------------------------------------------------------------- */	293	/* -------------------------------------------------------------------- */
276	/* -- ClassProxyHandler.CreateInstanceEvent (inner class) ------------- */	294	/* -- ClassProxyHandler.CreateInstanceEvent (inner class) ------------- */
277	/* -------------------------------------------------------------------- */	295	/* -------------------------------------------------------------------- */

Lines 391-408 Link Here

(-)src/org/netbeans/mdr/handlers/InstanceHandler.java (-5 / +22 lines)
391	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */	391	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
392	/* -------------------------------------------------------------------- */	392	/* -------------------------------------------------------------------- */
393		393
394	/** Registers a listener for receiving event notifications.	394	/** Registers a listener for receiving event notifications with are
395	* @param listener Object that implements {@link Listener} interface.	395	* initially fired on this object.
		396	* @param listener Object that implements {@link MDRChangeListener} interface.
396	*/	397	*/
397	public void addListener(MDRChangeListener listener) {	398	public void addListener(MDRChangeListener listener) {
398	_getMdrStorage().getEventNotifier().INSTANCE.addListener(listener, this);	399	addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
		400	}
		401
		402	/** Registers a listener for receiving event notifications.
		403	* @param listener Object that implements {@link MDRChangeListener} interface.
		404	* @param mask bitmask to filter types of events the listener listens on
		405	*/
		406	public void addListener(MDRChangeListener listener, int mask) {
		407	_getMdrStorage().getEventNotifier().INSTANCE.addListener(listener, mask, this);
399	}	408	}
400		409
401	/** Removes listener from the list of objects registered for events notifications.	410	/** Removes listener from the list of objects registered for event notifications.
402	* @param listener Object that implements {@link Listener} interface.	411	* @param listener Object that implements {@link MDRChangeListener} interface.
403	*/	412	*/
404	public void removeListener(MDRChangeListener listener) {	413	public void removeListener(MDRChangeListener listener) {
405	_getMdrStorage().getEventNotifier().INSTANCE.removeListener(listener, this);	414	_getMdrStorage().getEventNotifier().INSTANCE.removeListener(listener, this);
		415	}
		416
		417	/** Removes listener from the list of objects registered for event notifications.
		418	* @param listener Object that implements {@link MDRChangeListener} interface.
		419	* @param mask determines type of the events the listeners stops to listen on
		420	*/
		421	public void removeListener(MDRChangeListener listener, int mask) {
		422	_getMdrStorage().getEventNotifier().INSTANCE.removeListener(listener, mask, this);
406	}	423	}
407		424
408	/* ---------------------------------------------------------------- */	425	/* ---------------------------------------------------------------- */

Lines 387-405 Link Here

(-)src/org/netbeans/mdr/handlers/PackageProxyHandler.java (-6 / +23 lines)
387	/* -------------------------------------------------------------------- */	387	/* -------------------------------------------------------------------- */
388	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */	388	/* -- Implementation of org.netbeans.api.mdr.events.MDRChangeSource --- */
389	/* -------------------------------------------------------------------- */	389	/* -------------------------------------------------------------------- */
390		390
391	/** Registers a listener for receiving event notifications.	391	/** Registers a listener for receiving event notifications with are
392	* @param listener Object that implements {@link Listener} interface.	392	* initially fired on this object.
		393	* @param listener Object that implements {@link MDRChangeListener} interface.
393	*/	394	*/
394	public void addListener(MDRChangeListener listener) {	395	public void addListener(MDRChangeListener listener) {
395	_getMdrStorage().getEventNotifier().PACKAGE.addListener(listener, this);	396	addListener(listener, MDRChangeEvent.EVENTMASK_ALL);
396	}	397	}
397		398
398	/** Removes listener from the list of objects registered for events notifications.	399	/** Registers a listener for receiving event notifications.
399	* @param listener Object that implements {@link Listener} interface.	400	* @param listener Object that implements {@link MDRChangeListener} interface.
		401	* @param mask bitmask to filter types of events the listener listens on
		402	*/
		403	public void addListener(MDRChangeListener listener, int mask) {
		404	_getMdrStorage().getEventNotifier().PACKAGE.addListener(listener, mask, this);
		405	}
		406
		407	/** Removes listener from the list of objects registered for event notifications.
		408	* @param listener Object that implements {@link MDRChangeListener} interface.
400	*/	409	*/
401	public void removeListener(MDRChangeListener listener) {	410	public void removeListener(MDRChangeListener listener) {
402	_getMdrStorage().getEventNotifier().PACKAGE.removeListener(listener, this);	411	_getMdrStorage().getEventNotifier().PACKAGE.removeListener(listener, this);
		412	}
		413
		414	/** Removes listener from the list of objects registered for event notifications.
		415	* @param listener Object that implements {@link MDRChangeListener} interface.
		416	* @param mask determines type of the events the listeners stops to listen on
		417	*/
		418	public void removeListener(MDRChangeListener listener, int mask) {
		419	_getMdrStorage().getEventNotifier().PACKAGE.removeListener(listener, mask, this);
403	}	420	}
404		421
405	/* ---------------------------------------------------------------- */	422	/* ---------------------------------------------------------------- */

Lines 14-30 Link Here

(-)build.xml (-54 / +81 lines)
14		14
15	<project name="mdr" basedir="." default="netbeans">	15	<project name="mdr" basedir="." default="netbeans">
16		16
		17	<!-- =========================================================== -->
		18	<!-- == Properties ============================================= -->
		19	<!-- =========================================================== -->
		20
17	<property name="nbroot" location=".."/>	21	<property name="nbroot" location=".."/>
18	<property name="nbext" location="${nbroot}/nbbuild"/>	22	<property name="nbext" location="${nbroot}/nbbuild"/>
19	<property name="binroot" location="../../nbextra"/>	23	<property name="binroot" location="../../nbextra"/>
20	<property name="storepass" value="?"/>	24	<property name="storepass" value="?"/>
21	<property name="build.compiler.debug" value="true"/>	25	<property name="build.compiler.debug" value="true"/>
		26	<property name="build.compiler.deprecation" value="true"/>
22	<property name="homepage.base" value="netbeans.org"/>	27	<property name="homepage.base" value="netbeans.org"/>
23	<property name="dist.base" value="www.netbeans.org/download/nbms/40/MDR"/>	28	<property name="dist.base" value="www.netbeans.org/download/nbms/40/MDR"/>
24		29
25	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>	30	<!-- all external files and directories -->
26	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>	31	<property name="nbantext.jar" location="${nbext}/nbantext.jar"/>
27	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>	32	<property name="openide-13javac-workaround.jar" location="${nbroot}/openide/openide-13javac-workaround.jar"/>
		33	<property name="openide.jar.dir" location="${nbroot}/openide/netbeans/lib"/>
		34	<property name="xml-apis.jar" location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
		35	<property name="djava.jar" location="${binroot}/scripting/release/modules/ext/djava.jar"/>
		36	<property name="openidex.jar" location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
		37	<property name="naming.jar" location="${nbroot}/core/naming/netbeans/modules/autoload/naming.jar"/>
		38	<property name="looks.jar" location="${nbroot}/openidex/looks/netbeans/modules/autoload/looks.jar"/>
		39	<property name="standard-jar-excludes.txt" location="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
		40	<property name="mof.xml" location="jmi/mof.xml"/>
		41	<property name="standard-nbm-license.txt" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
		42
		43	<!-- =========================================================== -->
		44	<!-- == Taskdefs =============================================== -->
		45	<!-- =========================================================== -->
		46
		47	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbantext.jar}"/>
		48	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbantext.jar}"/>
		49	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar"
		50	classpath="${nbantext.jar}"/>
		51
		52	<!-- =========================================================== -->
		53	<!-- == Initialization ========================================= -->
		54	<!-- =========================================================== -->
28		55
29	<target name="init">	56	<target name="init">
30	<tstamp>	57	<tstamp>
Lines 34-72 Link Here
34	<echo message="buildnumber = ${buildnumber}"/>	61	<echo message="buildnumber = ${buildnumber}"/>
35	</target>	62	</target>
36		63
37	<!-- ===================== -->	64	<!-- =========================================================== -->
38	<!-- Compilation classpath -->	65	<!-- == Compilation classpath ================================== -->
39	<!-- ===================== -->	66	<!-- =========================================================== -->
		67
40	<path id="compile.class.path">	68	<path id="compile.class.path">
41	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>	69	<pathelement location="${openide-13javac-workaround.jar}"/>
42	<fileset dir="${nbroot}/openide/netbeans/lib">	70	<fileset dir="${openide.jar.dir}">
43	<include name="openide*.jar"/>	71	<include name="openide*.jar"/>
44	</fileset>	72	</fileset>
45	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>	73	<pathelement location="${xml-apis.jar}"/>
46	<pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>	74	<pathelement location="${djava.jar}"/>
47	<pathelement location="jmi/"/>	75	<pathelement location="jmi/"/>
48	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>	76	<pathelement location="${openidex.jar}"/>
49	</path>	77	</path>
50		78
51	<!-- ====================================== -->	79	<!-- =========================================================== -->
52	<!-- Compilation classpath for MDR-Explorer -->	80	<!-- == Compilation classpath for MDR-Explorer ================= -->
53	<!-- ====================================== -->	81	<!-- =========================================================== -->
		82
54	<path id="explorer.compile.class.path">	83	<path id="explorer.compile.class.path">
55	<pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>	84	<path refid="compile.class.path"/>
56	<fileset dir="${nbroot}/openide/netbeans/lib">	85	<pathelement location="${naming.jar}"/>
57	<include name="openide*.jar"/>	86	<pathelement location="${looks.jar}"/>
58	</fileset>
59	<pathelement location="${binroot}/core/release/lib/ext/xml-apis.jar"/>
60	<pathelement location="${binroot}/scripting/release/modules/ext/djava.jar"/>
61	<pathelement location="jmi/"/>
62	<pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
63	<pathelement location="${nbroot}/core/naming/netbeans/modules/autoload/naming.jar"/>
64	<pathelement location="${nbroot}/openidex/looks/netbeans/modules/autoload/looks.jar"/>
65	</path>	87	</path>
66		88
67	<!-- ======================== -->	89	<!-- =========================================================== -->
68	<!-- Compilation of all parts -->	90	<!-- == Compilation of all parts =============================== -->
69	<!-- ======================== -->	91	<!-- =========================================================== -->
		92
70	<target name="compile" depends="compile-src"/>	93	<target name="compile" depends="compile-src"/>
71		94
72	<target name="compile-jmi">	95	<target name="compile-jmi">
Lines 96-104 Link Here
96	</javac>	119	</javac>
97	</target>	120	</target>
98		121
99	<!-- ===================== -->	122	<!-- =========================================================== -->
100	<!-- Creating all mdr jars -->	123	<!-- == Creating all mdr jars ================================== -->
101	<!-- ===================== -->	124	<!-- =========================================================== -->
		125
102	<target name="jars" depends="init,jars-all"/>	126	<target name="jars" depends="init,jars-all"/>
103		127
104	<target name="jars-jmi" depends="compile-jmi">	128	<target name="jars-jmi" depends="compile-jmi">
Lines 106-112 Link Here
106	<mkdir dir="netbeans/modules/autoload"/>	130	<mkdir dir="netbeans/modules/autoload"/>
107	<mkdir dir="jmi/javax/jmi/model/resources"/>	131	<mkdir dir="jmi/javax/jmi/model/resources"/>
108		132
109	<copy file="jmi/mof.xml" todir="jmi/javax/jmi/model/resources"/>	133	<copy file="${mof.xml}" tofile="jmi/javax/jmi/model/resources/mof.xml"/>
110		134
111	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>	135	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
112	<copy file="manifest-mof.mf" filtering="on" tofile="manifest-mof-subst.mf"/>	136	<copy file="manifest-mof.mf" filtering="on" tofile="manifest-mof-subst.mf"/>
Lines 118-124 Link Here
118	manifest="manifest-mof-subst.mf"	142	manifest="manifest-mof-subst.mf"
119	compress="false">	143	compress="false">
120	<locale name="ja"/>	144	<locale name="ja"/>
121	<fileset dir="jmi" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	145	<fileset dir="jmi" excludesfile="${standard-jar-excludes.txt}">
122	<include name="javax/"/>	146	<include name="javax/"/>
123	<exclude name="javax/jmi/reflect/"/>	147	<exclude name="javax/jmi/reflect/"/>
124	<exclude name="javax/jmi/xmi/"/>	148	<exclude name="javax/jmi/xmi/"/>
Lines 129-135 Link Here
129	manifest="manifest-jmi-subst.mf"	153	manifest="manifest-jmi-subst.mf"
130	compress="false">	154	compress="false">
131	<locale name="ja"/>	155	<locale name="ja"/>
132	<fileset dir="jmi" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	156	<fileset dir="jmi" excludesfile="${standard-jar-excludes.txt}">
133	<include name="javax/jmi/reflect/"/>	157	<include name="javax/jmi/reflect/"/>
134	<include name="javax/jmi/xmi/"/>	158	<include name="javax/jmi/xmi/"/>
135	</fileset>	159	</fileset>
Lines 151-157 Link Here
151	<locjar jarfile="netbeans/modules/ext/nbmdr.jar"	175	<locjar jarfile="netbeans/modules/ext/nbmdr.jar"
152	compress="false">	176	compress="false">
153	<locale name="ja"/>	177	<locale name="ja"/>
154	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	178	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
155	<include name="org/netbeans/mdr/"/>	179	<include name="org/netbeans/mdr/"/>
156	<include name="javax/"/>	180	<include name="javax/"/>
157	<exclude name="org/netbeans/mdr/shell/"/>	181	<exclude name="org/netbeans/mdr/shell/"/>
Lines 165-171 Link Here
165	<locjar jarfile="apps/mdrshell.jar"	189	<locjar jarfile="apps/mdrshell.jar"
166	compress="false">	190	compress="false">
167	<locale name="ja"/>	191	<locale name="ja"/>
168	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	192	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
169	<include name="org/netbeans/mdr/shell/"/>	193	<include name="org/netbeans/mdr/shell/"/>
170	</fileset>	194	</fileset>
171	</locjar>	195	</locjar>
Lines 173-179 Link Here
173	<locjar jarfile="netbeans/modules/ext/jmiutils.jar"	197	<locjar jarfile="netbeans/modules/ext/jmiutils.jar"
174	compress="false">	198	compress="false">
175	<locale name="ja"/>	199	<locale name="ja"/>
176	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	200	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
177	<include name="org/netbeans/lib/jmi/"/>	201	<include name="org/netbeans/lib/jmi/"/>
178	</fileset>	202	</fileset>
179	</locjar>	203	</locjar>
Lines 186-192 Link Here
186	compress="false"	210	compress="false"
187	manifest="manifest-mdr-subst.mf">	211	manifest="manifest-mdr-subst.mf">
188	<locale name="ja"/>	212	<locale name="ja"/>
189	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	213	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
190	<include name="org/netbeans/modules/mdr/"/>	214	<include name="org/netbeans/modules/mdr/"/>
191	</fileset>	215	</fileset>
192	</locjar>	216	</locjar>
Lines 195-201 Link Here
195	compress="false"	219	compress="false"
196	manifest="manifest-toolkit-subst.mf">	220	manifest="manifest-toolkit-subst.mf">
197	<locale name="ja"/>	221	<locale name="ja"/>
198	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	222	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
199	<include name="org/netbeans/modules/mdrtoolkit/"/>	223	<include name="org/netbeans/modules/mdrtoolkit/"/>
200	</fileset>	224	</fileset>
201	</locjar>	225	</locjar>
Lines 205-217 Link Here
205	compress="false"	229	compress="false"
206	manifest="manifest-mdrapi-subst.mf">	230	manifest="manifest-mdrapi-subst.mf">
207	<locale name="ja"/>	231	<locale name="ja"/>
208	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	232	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
209	<include name="org/netbeans/api/"/>	233	<include name="org/netbeans/api/"/>
210	</fileset>	234	</fileset>
211	</locjar>	235	</locjar>
212	</target>	236	</target>
213		237
214	<target name="explorer-jar" depends="compile-explorer">	238	<target name="explorer-jar" depends="compile-explorer, init">
215		239
216	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>	240	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
217	<copy file="manifest-explorer.mf" filtering="on" tofile="manifest-explorer-subst.mf"/>	241	<copy file="manifest-explorer.mf" filtering="on" tofile="manifest-explorer-subst.mf"/>
Lines 220-235 Link Here
220	compress="false"	244	compress="false"
221	manifest="manifest-explorer-subst.mf">	245	manifest="manifest-explorer-subst.mf">
222	<locale name="ja"/>	246	<locale name="ja"/>
223	<fileset dir="src" excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt">	247	<fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
224	<include name="org/netbeans/modules/mdrexplorer/"/>	248	<include name="org/netbeans/modules/mdrexplorer/"/>
225	</fileset>	249	</fileset>
226	</locjar>	250	</locjar>
227		251
228	</target>	252	</target>
229		253
230	<!-- ===================== -->	254	<!-- =========================================================== -->
231	<!-- MDR-Explorer target -->	255	<!-- == MDR-Explorer target =================================== -->
232	<!-- ===================== -->	256	<!-- =========================================================== -->
		257
233	<target name="mdrexplorer" depends="explorer-jar">	258	<target name="mdrexplorer" depends="explorer-jar">
234	</target>	259	</target>
235		260
Lines 238-246 Link Here
238	<!--genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/-->	263	<!--genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/-->
239	</target>	264	</target>
240		265
241	<!-- ================= -->	266	<!-- =========================================================== -->
242	<!-- Production of NBM -->	267	<!-- == Production of NBM ====================================== -->
243	<!-- ================= -->	268	<!-- =========================================================== -->
		269
244	<target name="nbm" depends="toolkit-nbm,mdr-nbm,jmi-nbm,mof-nbm,mdrapi-nbm"/>	270	<target name="nbm" depends="toolkit-nbm,mdr-nbm,jmi-nbm,mof-nbm,mdrapi-nbm"/>
245		271
246	<target name="mdrapi-nbm" depends="netbeans">	272	<target name="mdrapi-nbm" depends="netbeans">
Lines 255-261 Link Here
255	module="netbeans/modules/autoload/mdrapi.jar"	281	module="netbeans/modules/autoload/mdrapi.jar"
256	homepage="http://mdr.${homepage.base}/"	282	homepage="http://mdr.${homepage.base}/"
257	distribution="http://${dist.base}/mdrapi.nbm">	283	distribution="http://${dist.base}/mdrapi.nbm">
258	<license file="${nbroot}/nbbuild/standard-nbm-license.txt"/>	284	<license file="${standard-nbm-license.txt}"/>
259	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	285	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
260	</makenbm>	286	</makenbm>
261	</target>	287	</target>
Lines 272-278 Link Here
272	module="netbeans/modules/mdrtoolkit.jar"	298	module="netbeans/modules/mdrtoolkit.jar"
273	homepage="http://mdr.${homepage.base}/"	299	homepage="http://mdr.${homepage.base}/"
274	distribution="http://${dist.base}/mdrtoolkit.nbm">	300	distribution="http://${dist.base}/mdrtoolkit.nbm">
275	<license file="${nbroot}/nbbuild/standard-nbm-license.txt"/>	301	<license file="${standard-nbm-license.txt}"/>
276	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	302	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
277	</makenbm>	303	</makenbm>
278	</target>	304	</target>
Lines 283-289 Link Here
283	module="netbeans/modules/mdr.jar"	309	module="netbeans/modules/mdr.jar"
284	homepage="http://mdr.${homepage.base}/"	310	homepage="http://mdr.${homepage.base}/"
285	distribution="http://${dist.base}/mdr.nbm">	311	distribution="http://${dist.base}/mdr.nbm">
286	<license file="${nbroot}/nbbuild/standard-nbm-license.txt"/>	312	<license file="${standard-nbm-license.txt}"/>
287	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	313	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
288	<exclude name="netbeans/modules/mdrtoolkit.jar"/>	314	<exclude name="netbeans/modules/mdrtoolkit.jar"/>
289	<exclude name="netbeans/modules/mdrexplorer.jar"/>	315	<exclude name="netbeans/modules/mdrexplorer.jar"/>
Lines 332-338 Link Here
332	module="netbeans/modules/mdrexplorer.jar"	358	module="netbeans/modules/mdrexplorer.jar"
333	homepage="http://mdr.${homepage.base}/"	359	homepage="http://mdr.${homepage.base}/"
334	distribution="http://${dist.base}/mdrexplorer.nbm">	360	distribution="http://${dist.base}/mdrexplorer.nbm">
335	<license file="${nbroot}/nbbuild/standard-nbm-license.txt"/>	361	<license file="${standard-nbm-license.txt}"/>
336	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	362	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
337		363
338	</makenbm>	364	</makenbm>
Lines 388-396 Link Here
388	<zip zipfile="MdrAPIs.zip" basedir="MdrAPIs"/>	414	<zip zipfile="MdrAPIs.zip" basedir="MdrAPIs"/>
389	</target>	415	</target>
390		416
391	<!-- ======================= -->	417	<!-- =========================================================== -->
392	<!-- Cleaning compiled stuff -->	418	<!-- == Cleaning compiled stuff ================================ -->
393	<!-- ======================= -->	419	<!-- =========================================================== -->
		420
394	<target name="clean" description="Removes all build products.">	421	<target name="clean" description="Removes all build products.">
395	<delete>	422	<delete>
396	<fileset dir="src">	423	<fileset dir="src">

Lines 63-68 Link Here

(-)src/org/netbeans/api/mdr/MDRepository.java (+10 lines)
63	*/	63	*/
64	public String[] getExtentNames();	64	public String[] getExtentNames();
65		65
		66	/**
		67	* Returns the object with the given MOF ID.
		68	*
		69	* @param mofId the MOF ID of the object to be returned
		70	* @return the object with the given MOF ID
		71	* @throws java.util.NoSuchElementException if there is no object with
		72	* the given MOF ID
		73	*/
		74	public RefBaseObject getByMofId(String mofId);
		75
66	/** Starts a new transaction. This method causes that the repository will be locked	76	/** Starts a new transaction. This method causes that the repository will be locked
67	* for read-only access or exclusive write access (depending on the value passed as	77	* for read-only access or exclusive write access (depending on the value passed as
68	* a parameter) and starts a new transaction. It is prefered to enclose any batch	78	* a parameter) and starts a new transaction. It is prefered to enclose any batch

Lines 28-40 Link Here

(-)src/org/netbeans/api/mdr/events/AttributeEvent.java (-4 / +4 lines)
28	/** Bitmask representing all event types related to classifier attribute changes */	28	/** Bitmask representing all event types related to classifier attribute changes */
29	public static final int EVENTMASK_CLASSATTR = 0x102FFFF;	29	public static final int EVENTMASK_CLASSATTR = 0x102FFFF;
30		30
31	/** Event type indicating that a value of a single-valued attribute is to be/was changed or	31	/** Event type indicating that a value of a single-valued instance attribute is to be/was changed or
32	* a value element of a multi-valued attribute is to be/was changed.	32	* a value element of a multi-valued instance attribute is to be/was changed.
33	*/	33	*/
34	public static final int EVENT_ATTRIBUTE_SET = 0x1010001;	34	public static final int EVENT_ATTRIBUTE_SET = 0x1010001;
35	/** Event type indicating that a value element of a multi-valued attribute is to be/was added */	35	/** Event type indicating that a value element of a multi-valued instance attribute is to be/was added */
36	public static final int EVENT_ATTRIBUTE_ADD = 0x1010002;	36	public static final int EVENT_ATTRIBUTE_ADD = 0x1010002;
37	/** Event type indicating that a value element of a multi-valued attribute is to be/was removed */	37	/** Event type indicating that a value element of a multi-valued instance attribute is to be/was removed */
38	public static final int EVENT_ATTRIBUTE_REMOVE = 0x1010004;	38	public static final int EVENT_ATTRIBUTE_REMOVE = 0x1010004;
39		39
40	/** Event type indicating that a value of a single-valued classifier attribute is to be/was changed or	40	/** Event type indicating that a value of a single-valued classifier attribute is to be/was changed or

Lines 22-33 Link Here

(-)src/org/netbeans/api/mdr/events/MDRChangeEvent.java (+24 lines)
22	* This way the event listeners can filter the events using a bitmask.	22	* This way the event listeners can filter the events using a bitmask.
23	*	23	*
24	* @author Martin Matula	24	* @author Martin Matula
		25	* @author <a href="mailto:hkrug@rationalizer.com">Holger Krug</code>.
25	*/	26	*/
26	public abstract class MDRChangeEvent extends EventObject {	27	public abstract class MDRChangeEvent extends EventObject {
27	/** Bitmask representing all possible repository event types.	28	/** Bitmask representing all possible repository event types.
28	* Can be used for registering listener to receive all kinds of events.	29	* Can be used for registering listener to receive all kinds of events.
29	*/	30	*/
30	public static final int EVENTMASK_ALL = 0x0FFFFFFF;	31	public static final int EVENTMASK_ALL = 0x0FFFFFFF;
		32
		33	/** Bitmask representing all event types which are initially fired on
		34	* associations. */
		35	public static final int EVENTMASK_ON_ASSOCIATION = AssociationEvent.EVENTMASK_ASSOCIATION;
		36	/** Bitmask representing all event types which are initially fired on
		37	* instance objects. */
		38	public static final int EVENTMASK_ON_INSTANCE = InstanceEvent.EVENT_INSTANCE_CREATE \| AttributeEvent.EVENTMASK_ATTRIBUTE;
		39	/** Bitmask representing all event types which are initially fired on
		40	* class proxies. */
		41	public static final int EVENTMASK_ON_CLASS = InstanceEvent.EVENT_INSTANCE_DELETE \| AttributeEvent.EVENTMASK_CLASSATTR;
		42	/** Bitmask representing all event types which are initially fired on
		43	* package proxies.
		44	*
		45	* <p><em>Note:</em> This bitmask is empty, because there are not
		46	* events which originate on packages. Packages receive only events
		47	* propagated from other objects. As a consequence this bitmask is
		48	* useless. It is nevertheless part of the API to achieve greater
		49	* uniformity of the API.</p>
		50	*/
		51	public static final int EVENTMASK_ON_PACKAGE = 0x0000000;
		52	/** Bitmask representing all event types which are initially fired on
		53	* repositories. */
		54	public static final int EVENTMASK_ON_REPOSITORY = ExtentEvent.EVENTMASK_EXTENT \| TransactionEvent.EVENTMASK_TRANSACTION;
31		55
32	// event type	56	// event type
33	private final int eventType;	57	private final int eventType;

Lines 18-51 Link Here

(-)src/org/netbeans/api/mdr/events/MDRChangeSource.java (-8 / +39 lines)
18	* The objects that have to be registered for event	18	* The objects that have to be registered for event
19	* notifications need to implement {@link MDRChangeListener}	19	* notifications need to implement {@link MDRChangeListener}
20	* or {@link MDRPreChangeListener} interface.<p>	20	* or {@link MDRPreChangeListener} interface.<p>
21	* The repository should distribute all the events in the following way:	21	*
		22	* <p>The repository distributes all the events recursively in the following way:
22	* <ul>	23	* <ul>
23	* <li>Each event fired on an instance is also fired on the corresponding class proxy for this instance.	24	* <li>Event fired on an instance are also fired on the corresponding class proxy for this instance.
24	* <li>Events fired on a class proxy are propagated to its immediate package proxy.	25	* <li>Events fired on a class proxy are propagated to its immediate package proxy.
25	* <li>Events fired on an association proxy are fired on all the instances affected by this event	26	* <li>Events fired on an association proxy are fired on all the instances affected by this event
26	* (e.g. instances added/removed from a link) and also it is fired on the immediate package proxy.	27	* (e.g. instances added/removed from a link) and also it is fired on the immediate package proxy.
27	* <li>Each event fired on a package proxy are propagated to its immediate package proxy.	28	* <li>Event fired on a package proxy are propagated to its immediate package proxy.
28	* If the package proxy is outermost, the event is propagated to the MDRepository that contains	29	* If the package proxy is outermost, the event is propagated to the MDRepository that contains
29	* the proxy.	30	* the proxy.
30	* </ul>	31	* </ul>
31	* All the events are propagated recursively till they reach the repository object (e.g. each	32	* Figure <b>XXX: MARTIN, PLEASE ADD THE FIGURE, I'VE CREATED</b> shows where the
		33	* events are initially fired and how they propagate.
		34	* </p>
		35	*
		36	* <p>All the events are propagated recursively till they reach the repository object (e.g. each
32	* instance event is as a result of propagation always fired on the instance itself,	37	* instance event is as a result of propagation always fired on the instance itself,
33	* on its class proxy, on its immediate package proxy, on all other package proxies containing	38	* on its class proxy, on its immediate package proxy, on all other package proxies containing
34	* the immediate package proxy to the outermost package proxy and at the end on the repository containing	39	* the immediate package proxy to the outermost package proxy and at the end on the repository containing
35	* instance).<br>	40	* instance).</p>
36	* In addition, any event is fired only once for each listener (so no matter how many objects	41	*
		42	* <p>In addition, any event is fired only once for each listener (so no matter how many objects
37	* on the event's propagation path is a listener registered on - e.g. on both	43	* on the event's propagation path is a listener registered on - e.g. on both
38	* class proxy and its instances - it receives each notification only once per event).	44	* class proxy and its instances - it receives each notification only once per event).</p>
		45	*
		46	* <p>Listeners may be added specifically for certain events only by calling
		47	* {@link #addListener(MDRChangeListener, int) addListener(MDRChangeListener, int)}.
		48	* If instead {@link #addListener(MDRChangeListener) addListener(MDRChangeListener)}
		49	* is used for listener addition and, hence, no event mask is speficied, the listener
		50	* receives all events which are propagated to the source it is registered for.
39	*	51	*
40	* @author Martin Matula	52	* @author Martin Matula
		53	* @author <a href="mailto:hkrug@rationalizer.com">Holger Krug</code>.
41	*/	54	*/
42	public interface MDRChangeSource {	55	public interface MDRChangeSource {
43	/** Registers a listener for receiving event notifications.	56
		57	/** Registers a listener for receiving event notifications using the default
		58	* event mask. The default event mask depends on the type of the change source
		59	* and filters all events which are initially fired on this object.
44	* @param listener Object that implements {@link MDRChangeListener} interface.	60	* @param listener Object that implements {@link MDRChangeListener} interface.
45	*/	61	*/
46	public void addListener(MDRChangeListener listener);	62	public void addListener(MDRChangeListener listener);
		63	/** Registers a listener for receiving notifications about events the type
		64	* of which matches <code>mask</code>.
		65	* @param listener Object that implements {@link MDRChangeListener} interface.
		66	* @param eventMask bitmask to be used in a call to {@link MdrChangeEvent#isOfType()}
		67	* to filter events based on the mask
		68	*/
		69	public void addListener(MDRChangeListener listener, int mask);
47	/** Removes listener from the list of objects registered for events notifications.	70	/** Removes listener from the list of objects registered for events notifications.
48	* @param listener Object that implements {@link MDRChangeListener} interface.	71	* @param listener Object that implements {@link MDRChangeListener} interface.
49	*/	72	*/
50	public void removeListener(MDRChangeListener listener);	73	public void removeListener(MDRChangeListener listener);
		74	/** Removes listener only for events of types matching <code>mask</code>.
		75	* If a listener is additionally registered for events of other types, it
		76	* proceeds listening on the remaining event types.
		77	* @param listener Object that implements {@link MDRChangeListener} interface.
		78	* @param mask determines the types of events the listener shall stop
		79	* to listen on
		80	*/
		81	public void removeListener(MDRChangeListener listener, int mask);
51	}	82	}

Added Link Here

(-)src/org/netbeans/api/mdr/events/TransactionEvent.java (+42 lines)
1	/*
2	* Sun Public License Notice
3	*
4	* The contents of this file are subject to the Sun Public License
5	* Version 1.0 (the "License"). You may not use this file except in
6	* compliance with the License. A copy of the License is available at
7	* http://www.sun.com/
8	*
9	* The Original Code is NetBeans. The Initial Developer of the Original
10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
11	* Microsystems, Inc. All Rights Reserved.
12	*/
13	package org.netbeans.api.mdr.events;
14
15	import javax.jmi.reflect.RefFeatured;
16	import org.netbeans.api.mdr.MDRepository;
17
18	/** Class representing MDR events related to start, commit and
19	* rollback of write transactions.
20	*
21	* @author <a href="mailto:hkrug@rationalizer.com">Holger Krug</code>.
22	*/
23	public class TransactionEvent extends MDRChangeEvent {
24
25	/** Bitmask representing all event types related to write transactions */
26	public static final int EVENTMASK_TRANSACTION = 0x011FFFF;
27
28	/** Event type indicating that a write transaction has been started. */
29	public static final int EVENT_TRANSACTION_START = 0x0110001;
30	/** Event type indicating that a write transaction has been committed. */
31	public static final int EVENT_TRANSACTION_COMMIT = 0x0110002;
32	/** Event type indicating that a write transaction has been rolled back. */
33	public static final int EVENT_TRANSACTION_ROLLBACK = 0x0110004;
34
35	/** Creates new <code>TransactionEvent</code> instance.
36	* @param source the event source, an instance of <code>MDRepository</code>.
37	* @param type the event type.
38	*/
39	public TransactionEvent(MDRepository source, int type) {
40	super(source, type);
41	}
42	}

Lines 34-90 Link Here

(-)src/org/netbeans/mdr/handlers/BaseObjectHandler.java (-74 / +195 lines)
34	* @version	34	* @version
35	*/	35	*/
36	public abstract class BaseObjectHandler extends ImplClass implements MDRObject/, OclAny/ {	36	public abstract class BaseObjectHandler extends ImplClass implements MDRObject/, OclAny/ {
		37
		38	/* --------------------------------------------------------------------- */
		39	/* -- Static attributes ------------------------------------------------ */
		40	/* --------------------------------------------------------------------- */
		41
		42	/**
		43	* Maps storage objects (instances of {@link StorableBaseObject}) to
		44	* JMI compliant handler objects (instances of {@link RefBaseObject}).
		45	*/
37	private static final Map facilityCache = new FacilityCache();	46	private static final Map facilityCache = new FacilityCache();
		47
		48	/**
		49	* Maps mof ids of meta-objects to the appropriate JMI interfaces (String => Class).
		50	*/
38	private static final Hashtable classCache = new Hashtable();	51	private static final Hashtable classCache = new Hashtable();
39		52
40	private static MDRClassLoader defaultLoader = null;	53	private static MDRClassLoader defaultLoader = null;
41	private static ClassLoaderProvider provider = null;	54	private static ClassLoaderProvider provider = null;
42
43	/** The object in strorage to delegate to
44	*/
45	// private final StorableBaseObject storableDelegate;
46	private final String mofId;
47	private final MdrStorage mdrStorage;
48	private StorableBaseObject storable;
49		55
50	protected final void _lock() {	56	/* --------------------------------------------------------------------- */
51	_lock(true);	57	/* -- Static setters/getters ------------------------------------------- */
52	}	58	/* --------------------------------------------------------------------- */
53		59
54	protected final void _lock(boolean write) {	60	public static synchronized void setClassLoaderProvider(ClassLoaderProvider provider) {
55	mdrStorage.getRepositoryMutex().enter(write);	61	BaseObjectHandler.provider = provider;
56	}	62	}
57		63
58	protected final void _unlock() {	64	public static synchronized MDRClassLoader getDefaultClassLoader() {
59	mdrStorage.getRepositoryMutex().leave();	65	if (defaultLoader == null) {
60	}	66	defaultLoader = new MDRClassLoader(provider);
61		67	}
62	protected final void _unlock(boolean fail) {	68	// System.out.println(defaultLoader.toString() + " : " + defaultLoader.getClass().getName());
63	mdrStorage.getRepositoryMutex().leave(fail);	69	return defaultLoader;
64	}	70	}
65		71
66	public final MDRepository repository() {	72	/* --------------------------------------------------------------------- */
67	return mdrStorage.getRepository();	73	/* -- Static helper methods (private) ---------------------------------- */
68	}	74	/* --------------------------------------------------------------------- */
69		75
		76	/**
		77	* Returns the handler class for JMI interface <code>ifc</code> and storage object <code>s</code>.
		78	*
		79	* @param loader the class loader for the definition of new classes
		80	* @param ifc JMI interface to be implemented by the class
		81	* @param s storage object to be wrapped by an instances of the class
		82	* @return class implementing <code>ifc</code>
		83	*/
70	private static Class getHandlerClass(MDRClassLoader loader, Class ifc, StorableBaseObject s) throws IllegalArgumentException {	84	private static Class getHandlerClass(MDRClassLoader loader, Class ifc, StorableBaseObject s) throws IllegalArgumentException {
		85	/* check if the loader may load the interface */
71	check(loader, ifc);	86	check(loader, ifc);
		87	/* try to load from cache */
72	Map cache = getLoaderCache(loader);	88	Map cache = getLoaderCache(loader);
73	String className = getName(ifc);	89	String className = getName(ifc);
74	Class result = getFromCache(cache, ifc, className);	90	Class result = getFromCache(cache, ifc, className);
75		91
76	if (result == null) {	92	if (result == null) {
77	try {	93	try {
		94	/* generate and define handler class */
78	byte[] handlerClassFile = HandlerGenerator.generateHandler(className, ifc, s);	95	byte[] handlerClassFile = HandlerGenerator.generateHandler(className, ifc, s);
79	/*	96
80	try {	97	/* [XXX] Allow the use of a system property org.netbeans.mdr.byteCodeDir, write class
81	java.io.FileOutputStream file = new java.io.FileOutputStream("e:/classes/" + className.substring(className.lastIndexOf('.') + 1) + ".class");	98	* files to that directory, if the system property is set.
82	file.write(handlerClassFile);	99	*/
83	file.close();	100	// try {
84	} catch (Exception e) {	101	// java.io.FileOutputStream file = new java.io.FileOutputStream("e:/classes/" + className.substring(className.lastIndexOf('.') + 1) + ".class");
85	e.printStackTrace();	102	// file.write(handlerClassFile);
86	}	103	// file.close();
87	*/	104	// } catch (Exception e) {
		105	// e.printStackTrace();
		106	// }
		107
88	result = loader.defineClass(className, handlerClassFile);	108	result = loader.defineClass(className, handlerClassFile);
89	} finally {	109	} finally {
90	releaseCache(cache, result, className);	110	releaseCache(cache, result, className);
Lines 94-104 Link Here
94	return result;	114	return result;
95	}	115	}
96		116
		117	/**
		118	* Returns the JMI interface to be implemented by the handler of <code>s</code>.
		119	*
		120	* @param s a storage object
		121	* @return the JMI interface for <code>s</code>
		122	*/
97	private static Class resolveClass(StorableBaseObject s) {	123	private static Class resolveClass(StorableBaseObject s) {
98	try {	124	try {
99	StorableObject metaObject = s.getMetaObject();	125	StorableObject metaObject = s.getMetaObject();
100	String suffix;	126	String suffix;
101		127
		128	/* cache lookup */
102	if (s instanceof StorableObject \|\| s instanceof StorableAssociation) {	129	if (s instanceof StorableObject \|\| s instanceof StorableAssociation) {
103	suffix = "";	130	suffix = "";
104	} else if (s instanceof StorablePackage) {	131	} else if (s instanceof StorablePackage) {
Lines 112-117 Link Here
112	String key = metaObject.getMofId() + ":" + suffix;	139	String key = metaObject.getMofId() + ":" + suffix;
113	Class result = (Class) classCache.get(key);	140	Class result = (Class) classCache.get(key);
114		141
		142	/* interface resolution */
115	if (result == null) {	143	if (result == null) {
116	try {	144	try {
117	String metaName = TagSupport.getTypeFullName(metaObject);	145	String metaName = TagSupport.getTypeFullName(metaObject);
Lines 128-139 Link Here
128	throw new DebugException();	156	throw new DebugException();
129	}	157	}
130	}	158	}
131		159
		160	/* --------------------------------------------------------------------- */
		161	/* -- Static methods (public) ------------------------------------------ */
		162	/* --------------------------------------------------------------------- */
		163
		164	/**
		165	* Frees the caches of JMI compliant handler objects (for storage objects)
		166	* and of JMI implementation classes (for meta-objects).
		167	*/
132	public static void _freeCache() {	168	public static void _freeCache() {
133	facilityCache.clear();	169	facilityCache.clear();
134	classCache.clear();	170	classCache.clear();
135	}	171	}
136		172
		173	/**
		174	* Returns JMI compliant handler object for <code>s</code>.
		175	*
		176	* @param s the storage object to be wrapped or <code>null</code>
		177	* @return handler implementing JMI interface or <code>null</code>
		178	*/
137	public static RefBaseObject getHandler(StorableBaseObject s) throws IllegalArgumentException {	179	public static RefBaseObject getHandler(StorableBaseObject s) throws IllegalArgumentException {
138	if (s == null) {	180	if (s == null) {
139	return null;	181	return null;
Lines 151-161 Link Here
151	return getHandler(s, ifc);	193	return getHandler(s, ifc);
152	}	194	}
153		195
		196	/**
		197	* Returns JMI compliant handler object for <code>s</code>.
		198	*
		199	* @param s the storage object to be wrapped or <code>null</code>
		200	* @param ifc the JMI interface to be implemented by the handler
		201	* @return handler implementing JMI interface or <code>null</code>
		202	*/
154	public static RefBaseObject getHandler(StorableBaseObject s, Class ifc) throws IllegalArgumentException {	203	public static RefBaseObject getHandler(StorableBaseObject s, Class ifc) throws IllegalArgumentException {
155	if (s == null) {	204	if (s == null) {
156	return null;	205	return null;
157	}	206	}
		207
		208	/* [XXX] For performance reasons the following piece of code should
		209	* be enabled, when it is expected that cache lookup succeeds quite
		210	* often. hkrug@rationalizer.com */
		211	// Object oldRecord;
		212	// synchronized (facilityCache) {
		213	// oldRecord = facilityCache.get(s.getMofId());
		214	// }
		215	// if ( oldRecord != null ) {
		216	// return oldRecord;
		217	// }
158		218
		219	/* load the handler class */
159	MDRClassLoader loader = getDefaultClassLoader();	220	MDRClassLoader loader = getDefaultClassLoader();
160	Class cl = getHandlerClass(loader, ifc, s);	221	Class cl = getHandlerClass(loader, ifc, s);
161		222
Lines 170-175 Link Here
170	else if (cls.equals (TransientStorableAssociation.class)) {	231	else if (cls.equals (TransientStorableAssociation.class)) {
171	cls = StorableAssociation.class;	232	cls = StorableAssociation.class;
172	}	233	}
		234	/* create handler object, if necessary */
173	Constructor cons = cl.getConstructor(new Class[] {cls});	235	Constructor cons = cl.getConstructor(new Class[] {cls});
174		236
175	synchronized (facilityCache) {	237	synchronized (facilityCache) {
Lines 196-213 Link Here
196	}	258	}
197	}	259	}
198		260
199	public static synchronized void setClassLoaderProvider(ClassLoaderProvider provider) {	261	/**
200	BaseObjectHandler.provider = provider;	262	* Returns interface <code>ifcName</code>. The interface is not generated on the
201	}	263	* fly, but must be available for loading by the default class-loader
202		264	* (see {@link #getDefaultClassLoader()}).
203	public static synchronized MDRClassLoader getDefaultClassLoader() {	265	*
204	if (defaultLoader == null) {	266	* @param ifcName name of the interface to be loaded
205	defaultLoader = new MDRClassLoader(provider);	267	* @return the interface named <code>ifcName</code>
206	}	268	*/
207	// System.out.println(defaultLoader.toString() + " : " + defaultLoader.getClass().getName());
208	return defaultLoader;
209	}
210
211	public static Class resolveInterface(String ifcName) throws ClassNotFoundException {	269	public static Class resolveInterface(String ifcName) throws ClassNotFoundException {
212	try {	270	try {
213	return Class.forName(ifcName, true, getDefaultClassLoader());	271	return Class.forName(ifcName, true, getDefaultClassLoader());
Lines 222-227 Link Here
222	}	280	}
223	}	281	}
224		282
		283	/**
		284	* Loads the class <code>implName</code> from the default class loader.
		285	*
		286	* @param implName class name
		287	* @return the class
		288	*/
225	public static Class resolveImplementation(String implName) throws ClassNotFoundException {	289	public static Class resolveImplementation(String implName) throws ClassNotFoundException {
226	try {	290	try {
227	return Class.forName(implName, true, getDefaultClassLoader());	291	return Class.forName(implName, true, getDefaultClassLoader());
Lines 238-243 Link Here
238	throw e;	302	throw e;
239	}	303	}
240	}	304	}
		305
		306	/* --------------------------------------------------------------------- */
		307	/* -- Private attributes ----------------------------------------------- */
		308	/* --------------------------------------------------------------------- */
		309
		310	// /** The object in strorage to delegate to
		311	// */
		312	// private final StorableBaseObject storableDelegate;
		313	private final String mofId;
		314	private final MdrStorage mdrStorage;
		315	private StorableBaseObject storable;
		316
		317	/* --------------------------------------------------------------------- */
		318	/* -- Constructor(s) --------------------------------------------------- */
		319	/* --------------------------------------------------------------------- */
241		320
242	/** Creates new RefBaseObjectHandler */	321	/** Creates new RefBaseObjectHandler */
243	protected BaseObjectHandler(StorableBaseObject storable) {	322	protected BaseObjectHandler(StorableBaseObject storable) {
Lines 255-291 Link Here
255	this.storable = null;	334	this.storable = null;
256	}	335	}
257	}	336	}
258		337
259	public final StorableBaseObject _getDelegate() {	338	/* --------------------------------------------------------------------- */
260	/*	339	/* -- Transaction related methods -------------------------------------- */
261	StorableBaseObject storable = (StorableBaseObject) storableDelegate.get();	340	/* --------------------------------------------------------------------- */
262	if (storable == null) {	341
263	try {	342	protected final void _lock() {
264	storable = mdrStorage.getObject(mofId);	343	_lock(true);
265	storableDelegate = new SoftReference(storable);
266	} catch (StorageException e) {
267	throw new DebugException("Storage exception: " + e);
268	}
269	}
270	*/
271	try {
272	if (this.storable != null)
273	return this.storable;
274	else
275	return mdrStorage.getObject(mofId);
276	} catch (StorageBadRequestException e) {
277	throw new InvalidObjectException(null, "Object with MOFID " + mofId + " no longer exists.");
278	} catch (StorageException e) {
279	throw new DebugException(e.toString());
280	}
281	//return storableDelegate;
282	}	344	}
283		345
284	protected final MdrStorage _getMdrStorage() {	346	protected final void _lock(boolean write) {
285	return mdrStorage;	347	mdrStorage.getRepositoryMutex().enter(write);
		348	}
		349
		350	protected final void _unlock() {
		351	mdrStorage.getRepositoryMutex().leave();
286	}	352	}
287		353
288	// Overriding the java.lang.object methods -----------------------------------	354	protected final void _unlock(boolean fail) {
		355	mdrStorage.getRepositoryMutex().leave(fail);
		356	}
		357
		358	/* --------------------------------------------------------------------- */
		359	/* -- Implements org.netbeans.api.mdr.MDRObject ------------------------ */
		360	/* --------------------------------------------------------------------- */
		361
		362	public final MDRepository repository() {
		363	return mdrStorage.getRepository();
		364	}
		365
		366	/* --------------------------------------------------------------------- */
		367	/* -- Extends java.lang.Object ----------------------------------------- */
		368	/* --------------------------------------------------------------------- */
289		369
290	public final boolean equals(Object obj) {	370	public final boolean equals(Object obj) {
291	if (obj instanceof BaseObjectHandler) {	371	if (obj instanceof BaseObjectHandler) {
Lines 316-323 Link Here
316	public final int hashCode() {	396	public final int hashCode() {
317	return refMofId().hashCode();	397	return refMofId().hashCode();
318	}	398	}
319		399
320	// Implementation of the RefBaseObject ---------------------------------------	400	/* --------------------------------------------------------------------- */
		401	/* -- Implements javax.jmi.reflect.RefBaseObject ----------------------- */
		402	/* --------------------------------------------------------------------- */
321		403
322	public final RefObject refMetaObject() {	404	public final RefObject refMetaObject() {
323	try {	405	try {
Lines 360-369 Link Here
360	else return _verify(new ArrayList());	442	else return _verify(new ArrayList());
361	}	443	}
362		444
		445	/* --------------------------------------------------------------------- */
		446	/* -- --------------------------------------------------- */
		447	/* --------------------------------------------------------------------- */
		448
		449	public final StorableBaseObject _getDelegate() {
		450	/*
		451	StorableBaseObject storable = (StorableBaseObject) storableDelegate.get();
		452	if (storable == null) {
		453	try {
		454	storable = mdrStorage.getObject(mofId);
		455	storableDelegate = new SoftReference(storable);
		456	} catch (StorageException e) {
		457	throw new DebugException("Storage exception: " + e);
		458	}
		459	}
		460	*/
		461	try {
		462	if (this.storable != null)
		463	return this.storable;
		464	else
		465	return mdrStorage.getObject(mofId);
		466	} catch (StorageBadRequestException e) {
		467	throw new InvalidObjectException(null, "Object with MOFID " + mofId + " no longer exists.");
		468	} catch (StorageException e) {
		469	throw new DebugException(e.toString());
		470	}
		471	//return storableDelegate;
		472	}
		473
		474	protected final MdrStorage _getMdrStorage() {
		475	return mdrStorage;
		476	}
		477
		478	/* --------------------------------------------------------------------- */
		479	/* -- Methods to be overridden by sub-classes -------------------------- */
		480	/* --------------------------------------------------------------------- */
		481
363	protected abstract Collection _recursiveVerify(Collection violations, Set visited);	482	protected abstract Collection _recursiveVerify(Collection violations, Set visited);
364	protected abstract Collection _verify(Collection violations);	483	protected abstract Collection _verify(Collection violations);
365		484
366	// private classes ---------------------------------------------	485	/* --------------------------------------------------------------------- */
		486	/* -- FacilityCache (static inner class) ------------------------------- */
		487	/* --------------------------------------------------------------------- */
367		488
368	/** Weak cache for created Handlers	489	/** Weak cache for created Handlers
369	*/	490	*/

Lines 19-24 Link Here

(-)src/org/netbeans/mdr/handlers/StructGenerator.java (-4 / +5 lines)
19	import java.util.*;	19	import java.util.*;
20		20
21	/**	21	/**
		22	* [XXX]: put this class into correct package !
22	*	23	*
23	* @author mmatula	24	* @author mmatula
24	* @version	25	* @version
Lines 32-43 Link Here
32		33
33	private static final String CONSTRUCTOR_DESCRIPTOR = "(Ljava/util/List;Ljava/util/Map;Ljava/util/List;)V";	34	private static final String CONSTRUCTOR_DESCRIPTOR = "(Ljava/util/List;Ljava/util/Map;Ljava/util/List;)V";
34		35
35	private StructGenerator(String className, Class ifc) {	36	private StructGenerator(String className, Class ifc, Class superClass) {
36	super(className, ifc, StructImpl.class);	37	super(className, ifc, superClass);
37	}	38	}
38		39
39	public static byte[] generateStruct(final String name, Class ifc) {	40	public static byte[] generateStruct(final String name, Class ifc, Class superClass) {
40	StructGenerator gen = new StructGenerator(name, ifc);	41	StructGenerator gen = new StructGenerator(name, ifc, superClass);
41	final byte[] classFile = gen.generateClassFile();	42	final byte[] classFile = gen.generateClassFile();
42		43
43	return classFile;	44	return classFile;

Lines 1-11 Link Here

(-)src/org/netbeans/mdr/handlers/StructImpl.java (-34 / +87 lines)
1	/*	1	/*
2	* Sun Public License Notice	2	* Sun Public License Notice
3	*	3	*
4	* The contents of this file are subject to the Sun Public License	4	* The contents of this file are subject to the Sun Public License
5	* Version 1.0 (the "License"). You may not use this file except in	5	* Version 1.0 (the "License"). You may not use this file except in
6	* compliance with the License. A copy of the License is available at	6	* compliance with the License. A copy of the License is available at
7	* http://www.sun.com/	7	* http://www.sun.com/
8	*	8	*
9	* The Original Code is NetBeans. The Initial Developer of the Original	9	* The Original Code is NetBeans. The Initial Developer of the Original
10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun	10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
11	* Microsystems, Inc. All Rights Reserved.	11	* Microsystems, Inc. All Rights Reserved.
Lines 22-39 Link Here
22	import org.netbeans.mdr.storagemodel.*;	22	import org.netbeans.mdr.storagemodel.*;
23		23
24	/**	24	/**
		25	* Abstract base class for generated structure implementations.
		26	*
		27	* <p>[XXX]: Replacing this class by a repository parameter is not yet
		28	* implemented. The problem is, that in {@link #newInstance(Class, List, Map, List)}
		29	* there is no access to the <code>MdrStorage</code> which holds this parameter.</p>
25	*	30	*
26	* @author mmatula	31	* @author mmatula
27	* @version	32	* @version
28	*/	33	*/
29	public abstract class StructImpl extends ImplClass implements RefStruct {	34	public abstract class StructImpl extends ImplClass implements RefStruct {
30	private final List fields;	35
31	// field values	36	/* -------------------------------------------------------------------- */
32	private final Map values;	37	/* -- Factory methods (static) ---------------------------------------- */
33	// fully qualified name of metaobject	38	/* -------------------------------------------------------------------- */
34	private final List qualifiedName;	39
35		40	/**
36	private static Class getStructClass(MDRClassLoader loader, Class ifc) throws IllegalArgumentException {	41	* Returns the structure implementation implementing <code>ifc</code>.
		42	*
		43	* @param loader the class-loader for the definition of the implementation class
		44	* @param ifc the interface to be implementated by the implementation class
		45	* @param superClass the super class for structure implementations
		46	* @return a class implementing <code>ifc</code>
		47	*/
		48	private static Class getStructClass(MDRClassLoader loader, Class ifc, Class superClass) throws IllegalArgumentException {
37	check(loader, ifc);	49	check(loader, ifc);
38	Map cache = getLoaderCache(loader);	50	Map cache = getLoaderCache(loader);
39	String className = getName(ifc);	51	String className = getName(ifc);
Lines 41-47 Link Here
41		53
42	if (result == null) {	54	if (result == null) {
43	try {	55	try {
44	byte[] structClassFile = StructGenerator.generateStruct(className, ifc);	56	byte[] structClassFile = StructGenerator.generateStruct(className, ifc, superClass);
45	result = loader.defineClass(className, structClassFile);	57	result = loader.defineClass(className, structClassFile);
46	} finally {	58	} finally {
47	releaseCache(cache, result, className);	59	releaseCache(cache, result, className);
Lines 51-56 Link Here
51	return result;	63	return result;
52	}	64	}
53		65
		66	private static Class getStructClass(MDRClassLoader loader, Class ifc) throws IllegalArgumentException {
		67	return getStructClass(loader, ifc, StructImpl.class);
		68	}
		69
54	public static RefStruct newInstance(DatatypeDescriptor dataType, Object fieldValues[]) {	70	public static RefStruct newInstance(DatatypeDescriptor dataType, Object fieldValues[]) {
55	try {	71	try {
56	HashMap values = new HashMap(fieldValues.length, 1);	72	HashMap values = new HashMap(fieldValues.length, 1);
Lines 70-119 Link Here
70	}	86	}
71	}	87	}
72		88
		89	/**
		90	* @param ifc the specific JMI interface for the structure type
		91	* @param fields list of field names
		92	* @param values maps field names to field values
		93	* @param qualifiedName fully qualified name of the structure type
		94	*/
73	public static RefStruct newInstance(Class ifc, List fields, Map values, List qualifiedName) {	95	public static RefStruct newInstance(Class ifc, List fields, Map values, List qualifiedName) {
74	MDRClassLoader loader = BaseObjectHandler.getDefaultClassLoader();	96	MDRClassLoader loader = BaseObjectHandler.getDefaultClassLoader();
75	Class cl = getStructClass(loader, ifc);	97	Class cl = getStructClass(loader, ifc, StructImpl.class);
76		98
77	try {	99	try {
78	Constructor cons = cl.getConstructor(new Class[] {List.class, Map.class, List.class});	100	Constructor cons = cl.getConstructor(new Class[] {List.class, Map.class, List.class});
79	RefStruct struct = (RefStruct) cons.newInstance(new Object[] {fields, values, qualifiedName});	101	RefStruct struct = (RefStruct) cons.newInstance(new Object[] {fields, values, qualifiedName});
80		102
81	return struct;	103	return struct;
82	} catch (NoSuchMethodException e) {	104	} catch (NoSuchMethodException e) {
83	e.printStackTrace();	105	e.printStackTrace();
84	throw new DebugException(e.toString());	106	throw new DebugException(e.toString());
85	} catch (IllegalAccessException e) {	107	} catch (IllegalAccessException e) {
86	e.printStackTrace();	108	e.printStackTrace();
87	throw new DebugException(e.toString());	109	throw new DebugException(e.toString());
88	} catch (InstantiationException e) {	110	} catch (InstantiationException e) {
89	e.printStackTrace();	111	e.printStackTrace();
90	throw new DebugException(e.toString());	112	throw new DebugException(e.toString());
91	} catch (InvocationTargetException e) {	113	} catch (InvocationTargetException e) {
92	e.printStackTrace();	114	e.printStackTrace();
93	throw new DebugException(e.toString());	115	throw new DebugException(e.toString());
94	}	116	}
95	}	117	}
96		118
		119	/* -------------------------------------------------------------------- */
		120	/* -- Attributes (private) -------------------------------------------- */
		121	/* -------------------------------------------------------------------- */
		122
		123	/**
		124	* Field names
		125	*/
		126	private final List fields;
		127	/**
		128	* Field names => values
		129	*/
		130	private final Map values;
		131	/**
		132	* Fully qualified name of metaobject
		133	*/
		134	private final List qualifiedName;
		135
		136	/* -------------------------------------------------------------------- */
		137	/* -- Constructor (protected) ----------------------------------------- */
		138	/* -------------------------------------------------------------------- */
		139
97	/** Creates new StructHandler */	140	/** Creates new StructHandler */
98	protected StructImpl(List fields, Map values, List qualifiedName) {	141	protected StructImpl(List fields, Map values, List qualifiedName) {
99	this.values = values;	142	this.values = values;
100	this.qualifiedName = Collections.unmodifiableList(qualifiedName);	143	this.qualifiedName = qualifiedName;
101	this.fields = Collections.unmodifiableList(fields);	144	this.fields = fields;
102	}	145	}
103		146
104	// --- handler methods	147	/* -------------------------------------------------------------------- */
105		148	/* -- Methods to be called by generated classes ----------------------- */
		149	/* -------------------------------------------------------------------- */
		150
106	protected Object handleGet(String memberName) {	151	protected Object handleGet(String memberName) {
107	return refGetValue(memberName);	152	return refGetValue(memberName);
108	}	153	}
109		154
110	// --- implementation of RefStruct interface -------------------------------	155	/* -------------------------------------------------------------------- */
111		156	/* -- Implements of javax.jmi.reflect.RefStruct ----------------------- */
		157	/* -------------------------------------------------------------------- */
		158
112	public Object refGetValue(String memberName) {	159	public Object refGetValue(String memberName) {
113	if (values.containsKey(memberName)) {	160	if (values.containsKey(memberName)) {
114	return values.get(memberName);	161	return values.get(memberName);
115	} else {	162	} else {
116	throw new DebugException("Wrong item name: " + memberName);	163	throw new InvalidNameException(memberName);
117	}	164	}
118	}	165	}
119		166
Lines 124-130 Link Here
124	public List refTypeName() {	171	public List refTypeName() {
125	return this.qualifiedName;	172	return this.qualifiedName;
126	}	173	}
127		174
		175	/* -------------------------------------------------------------------- */
		176	/* -- Extends java.lang.Object ---------------------------------------- */
		177	/* -------------------------------------------------------------------- */
		178
		179	// [XXX]: hashCode() must be implemented, too !
		180
128	public boolean equals(Object other) {	181	public boolean equals(Object other) {
129	// check whether other is instance of the same structure	182	// check whether other is instance of the same structure
130	if ((other instanceof RefStruct) && ((RefStruct) other).refTypeName().equals(qualifiedName)) {	183	if ((other instanceof RefStruct) && ((RefStruct) other).refTypeName().equals(qualifiedName)) {

Lines 1-17 Link Here

(-)src/org/netbeans/mdr/shell/Main.java (-5 / +43 lines)
1	/*	1	/*
2	* Sun Public License Notice	2	* Sun Public License Notice
3	*	3	*
4	* The contents of this file are subject to the Sun Public License	4	* The contents of this file are subject to the Sun Public License
5	* Version 1.0 (the "License"). You may not use this file except in	5	* Version 1.0 (the "License"). You may not use this file except in
6	* compliance with the License. A copy of the License is available at	6	* compliance with the License. A copy of the License is available at
7	* http://www.sun.com/	7	* http://www.sun.com/
8	*	8	*
9	* The Original Code is NetBeans. The Initial Developer of the Original	9	* The Original Code is NetBeans. The Initial Developer of the Original
10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun	10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
11	* Microsystems, Inc. All Rights Reserved.	11	* Microsystems, Inc. All Rights Reserved.
12	*/	12	*/
13	package org.netbeans.mdr.shell;	13	package org.netbeans.mdr.shell;
14		14
		15	import java.io.FileInputStream;
		16	import java.io.FileNotFoundException;
		17	import java.io.InputStream;
		18
15	import java.util.Collection;	19	import java.util.Collection;
16	import java.util.ArrayList;	20	import java.util.ArrayList;
17	import java.util.Iterator;	21	import java.util.Iterator;
Lines 29-40 Link Here
29	import javax.jmi.reflect.*;	33	import javax.jmi.reflect.*;
30		34
31	public class Main extends Object {	35	public class Main extends Object {
32	public static void main( String[] args ) {	36
		37	/**
		38	* Resources names of the standard library files
		39	*/
		40	public static String[] STANDARD_LIBS = new String[] { "resources/start.ms", "resources/ext.ms" };
		41
		42	/**
		43	* Command line interface of the MDRShell. The MDRShell is a
		44	* <em>Dynamic Java</em> shell with preprocessor. Before user input
		45	* is processed the files <code>start.ms</code> and <code>ext.ms</code>
		46	* in the package <code>org.netbeans.mdr.shell.resources</code> and the
		47	* files given as command line arguments are processed.
		48	*
		49	* @param args a list of file names read into the shell
		50	* @throws FileNotFoundException if one of the arguments does not denote a
		51	* valid file name
		52	* @throws SecurityException if there is no read access to a file given as
		53	* argument
		54	*/
		55	public static void main( String[] args ) throws FileNotFoundException {
		56	/* the input streams */
		57	InputStream[] iss = new InputStream[STANDARD_LIBS.length+args.length+1];
		58
		59	/* standard library files */
		60	for ( int i=0; i<STANDARD_LIBS.length; i++ ) {
		61	iss[i] = Main.class.getResourceAsStream(STANDARD_LIBS[i]);
		62	}
		63	/* files given as arguments */
		64	for ( int i=0; i<args.length; i++ ) {
		65	iss[STANDARD_LIBS.length+i] = new FileInputStream(args[i]);
		66	}
		67	/* System.in for user input */
		68	iss[STANDARD_LIBS.length+args.length] = System.in;
		69
33	// Create and run the shell	70	// Create and run the shell
34	new Shell().run( null );	71
		72	new Shell().run( iss );
35	//System.out.println("saving data...");	73	//System.out.println("saving data...");
36	MDRManager.getDefault().shutdownAll();	74	MDRManager.getDefault().shutdownAll();
37		75
38	Log.out.unindent();	76	Log.out.unindent();
39	}	77	}
40	}	78	}

Lines 23-30 Link Here

(-)src/org/netbeans/mdr/storagemodel/CompositeCollection.java (-8 / +41 lines)
23	import org.netbeans.mdr.util.*;	23	import org.netbeans.mdr.util.*;
24		24
25	/**	25	/**
26	* Instances of <code>CompositeCollection</code> are collections uniting several	26	* Instances of <code>CompositeCollection</code> are immutable collections uniting
27	* other collections. The methods of this class must be called in the following	27	* several other collections. The methods of this class must be called in the following
28	* order:	28	* order:
29	*	29	*
30	* <p><ol>	30	* <p><ol>
Lines 32-41 Link Here
32	* <li>{@link addCollection(Collection} to add a collection forming a part of	32	* <li>{@link addCollection(Collection} to add a collection forming a part of
33	* the current collection</li>	33	* the current collection</li>
34	* <li>any accessor method</li>	34	* <li>any accessor method</li>
35	* </ol>	35	* </ol></p>
36	*	36	*
37	* It is not allowed to add further collections after any of the accessors has	37	* <p>It is not allowed to add further collections after any of the accessors has
38	* been called.	38	* been called.</p>
		39	*
		40	* <p>Because the collections added using @link addCollection(Collection} are added
		41	* as is and their members are accessed only, when to be returned by methods of
		42	* this class resp. its {@link Iterator}, instances of <code>CompositeCollection</code>
		43	* are live if and only if all of the composed collections are live.</p>
		44	*
		45	* <p><b>[XXX]:</b> Put this class into <code>org.netbeans.mdr.util</code>
		46	* package.</p>
39	*	47	*
40	* @author mm109185	48	* @author mm109185
41	*/	49	*/
Lines 44-56 Link Here
44	private final ArrayList innerCollections = new ArrayList();	52	private final ArrayList innerCollections = new ArrayList();
45	private volatile boolean canChange = true;	53	private volatile boolean canChange = true;
46		54
47	CompositeCollection() {	55	public CompositeCollection() {
48	}	56	}
49		57
50	/**	58	/**
51	* Adds a new collection. Can only be called before any accessor call.	59	* Adds a new collection. Can only be called before any accessor call.
52	*/	60	*/
53	void addCollection(Collection collection) {	61	public void addCollection(Collection collection) {
54	if (canChange) {	62	if (canChange) {
55	innerCollections.add(collection);	63	innerCollections.add(collection);
56	} else {	64	} else {
Lines 122-151 Link Here
122	public Object[] toArray() {	130	public Object[] toArray() {
123	return toArray(new Object[0]);	131	return toArray(new Object[0]);
124	}	132	}
125		133
		134	/**
		135	* operation not supported
		136	*/
126	public void clear() {	137	public void clear() {
127	throw new UnsupportedOperationException();	138	throw new UnsupportedOperationException();
128	}	139	}
129		140
		141	/**
		142	* operation not supported
		143	*/
130	public boolean addAll(Collection collection) {	144	public boolean addAll(Collection collection) {
131	throw new UnsupportedOperationException();	145	throw new UnsupportedOperationException();
132	}	146	}
133		147
		148	/**
		149	* operation not supported
		150	*/
134	public boolean remove(Object obj) {	151	public boolean remove(Object obj) {
135	throw new UnsupportedOperationException();	152	throw new UnsupportedOperationException();
136	}	153	}
137		154
		155	/**
		156	* operation not supported
		157	*/
138	public boolean add(Object obj) {	158	public boolean add(Object obj) {
139	throw new UnsupportedOperationException();	159	throw new UnsupportedOperationException();
140	}	160	}
141		161
		162	/**
		163	* operation not supported
		164	*/
142	public boolean retainAll(Collection collection) {	165	public boolean retainAll(Collection collection) {
143	throw new UnsupportedOperationException();	166	throw new UnsupportedOperationException();
144	}	167	}
145		168
		169	/**
		170	* operation not supported
		171	*/
146	public boolean removeAll(Collection collection) {	172	public boolean removeAll(Collection collection) {
147	throw new UnsupportedOperationException();	173	throw new UnsupportedOperationException();
148	}	174	}
		175
		176	/* --------------------------------------------------------------------- */
		177	/* -- CompositeIterator (inner class) ---------------------------------- */
		178	/* --------------------------------------------------------------------- */
149		179
150	protected class CompositeIterator implements Iterator {	180	protected class CompositeIterator implements Iterator {
151	private final Iterator innerIterators;	181	private final Iterator innerIterators;
Lines 174-179 Link Here
174	return result;	204	return result;
175	}	205	}
176		206
		207	/**
		208	* operation not supported
		209	*/
177	public void remove() {	210	public void remove() {
178	throw new UnsupportedOperationException();	211	throw new UnsupportedOperationException();
179	}	212	}

Lines 48-54 Link Here

(-)src/org/netbeans/mdr/storagemodel/MdrStorage.java (-22 / +179 lines)
48	/* -------------------------------------------------------------------- */	48	/* -------------------------------------------------------------------- */
49	/* -- Private static constants ---------------------------------------- */	49	/* -- Private static constants ---------------------------------------- */
50	/* -------------------------------------------------------------------- */	50	/* -------------------------------------------------------------------- */
51		51
52	private static final int STORAGE_VERSION = 12;	52	private static final int STORAGE_VERSION = 12;
53		53
54	// names of global storage indexes	54	// names of global storage indexes
Lines 156-161 Link Here
156	/* -- Transient support ---*/	156	/* -- Transient support ---*/
157	private long transientSerialNumber = 0;	157	private long transientSerialNumber = 0;
158		158
		159	/**
		160	* The default super-class for package proxy implementations.
		161	*/
		162	private Class packageProxyHandlerClass = null;
		163
		164	/**
		165	* The default super-class for class proxy implementations.
		166	*/
		167	private Class classProxyHandlerClass = null;
		168
		169	/**
		170	* The default super-class for instance implementations.
		171	*/
		172	private Class instanceHandlerClass = null;
		173
		174	/**
		175	* The default super-class for association implementations.
		176	*/
		177	private Class associationHandlerClass = null;
		178
		179	/**
		180	* The super-class for structure implementations.
		181	*/
		182	private Class structureHandlerClass = null;
		183
		184	/** The constructor parameters */
		185	private Map params;
		186
159	/* -- boot specific stuff --------------------------------------------- */	187	/* -- boot specific stuff --------------------------------------------- */
160		188
161	/**	189	/**
Lines 169-175 Link Here
169	/** boot association proxies */	197	/** boot association proxies */
170	private Collection bootAssociations = null;	198	private Collection bootAssociations = null;
171		199
172
173	/* -------------------------------------------------------------------- */	200	/* -------------------------------------------------------------------- */
174	/* -- Setters/Getters (public) ---------------------------------------- */	201	/* -- Setters/Getters (public) ---------------------------------------- */
175	/* -------------------------------------------------------------------- */	202	/* -------------------------------------------------------------------- */
Lines 199-219 Link Here
199	}	226	}
200		227
201	/* -------------------------------------------------------------------- */	228	/* -------------------------------------------------------------------- */
		229	/* -- Getters for names of implementation classes --------------------- */
		230	/* -------------------------------------------------------------------- */
		231
		232	/**
		233	* Returns the class to be used as base class for package proxy
		234	* implementations.
		235	*/
		236	Class getPackageProxyHandlerClass() throws ClassNotFoundException {
		237	if (packageProxyHandlerClass == null) {
		238	synchronized ( this ) {
		239	if (packageProxyHandlerClass == null) {
		240	// String className = (String) params.get("PackageProxyHandler");
		241	// if ( className != null ) {
		242	// try {
		243	// packageProxyHandlerClass = BaseObjectHandler.resolveImplementation(className);
		244	// } catch (ClassNotFoundException e) {
		245	// e.printStackTrace();
		246	// }
		247	// }
		248	// if ( packageProxyHandlerClass == null ) {
		249	packageProxyHandlerClass = PackageProxyHandler.class;
		250	// }
		251	}
		252	}
		253	}
		254	return packageProxyHandlerClass;
		255	}
		256
		257	/**
		258	* Returns the default class to be used as base class for class proxy
		259	* implementations.
		260	*/
		261	Class getClassProxyHandlerClass() throws ClassNotFoundException {
		262	if (classProxyHandlerClass == null) {
		263	synchronized(this) {
		264	if (classProxyHandlerClass == null) {
		265	// String className = (String) params.get("ClassProxyHandler");
		266	// if ( className != null ) {
		267	// try {
		268	// classProxyHandlerClass = BaseObjectHandler.resolveImplementation(className);
		269	// } catch (ClassNotFoundException e) {
		270	// e.printStackTrace();
		271	// }
		272	// }
		273	// if ( classProxyHandlerClass == null ) {
		274	classProxyHandlerClass = ClassProxyHandler.class;
		275	// }
		276	}
		277	}
		278	}
		279	return classProxyHandlerClass;
		280	}
		281
		282	/**
		283	* Returns the default class to be used as base class for instance
		284	* implementations.
		285	*/
		286	Class getInstanceHandlerClass() throws ClassNotFoundException {
		287	if (instanceHandlerClass == null) {
		288	synchronized(this) {
		289	if (instanceHandlerClass == null) {
		290	// String className = (String) params.get("InstanceHandler");
		291	// if ( className != null ) {
		292	// try {
293	// instanceHandlerClass = BaseObjectHandler.resolveImplementation(className);
294	// } catch (ClassNotFoundException e) {
295	// e.printStackTrace();
296	// }
297	// }
298	// if ( instanceHandlerClass == null ) {
299	instanceHandlerClass = InstanceHandler.class;
300	// }
301	}
302	}
303	}
304	return instanceHandlerClass;
305	}
306
307	/**
308	* Returns the default class to be used as base class for association proxy
309	* implementations.
310	*/
311	Class getAssociationHandlerClass() throws ClassNotFoundException {
312	if (associationHandlerClass == null) {
313	synchronized(this) {
314	if (associationHandlerClass == null) {
315	// String className = (String) params.get("AssociationHandler");
316	// if ( className != null ) {
317	// try {
318	// associationHandlerClass = BaseObjectHandler.resolveImplementation(className);
319	// } catch (ClassNotFoundException e) {
320	// e.printStackTrace();
321	// }
322	// }
323	// if ( associationHandlerClass == null ) {
324	associationHandlerClass = AssociationHandler.class;
325	// }
326	}
327	}
328	}
329	return associationHandlerClass;
330	}
331
332	/**
333	* Returns the class to be used as base class for structure
334	* implementations.
335	*/
336	public Class getStructureHandlerClass() throws ClassNotFoundException {
337	if (structureHandlerClass == null) {
338	synchronized(this) {
339	if (structureHandlerClass == null) {
340	// String className = (String) params.get("StructureHandler");
341	// if ( className != null ) {
342	// try {
343	// structureHandlerClass = BaseObjectHandler.resolveImplementation(className);
344	// } catch (ClassNotFoundException e) {
345	// e.printStackTrace();
346	// }
347	// }
348	// if ( structureHandlerClass == null ) {
349	structureHandlerClass = StructImpl.class;
350	// }
351	}
352	}
353	}
354	return structureHandlerClass;
355	}
356
357	/* -------------------------------------------------------------------- */
202	/* -- Constructor (public) -------------------------------------------- */	358	/* -- Constructor (public) -------------------------------------------- */
203	/* -------------------------------------------------------------------- */	359	/* -------------------------------------------------------------------- */
204		360
205	/** Creates a new <code>MdrStorage</code> using factory <code>storageClass</code>	361	/** Creates a new <code>MdrStorage</code> using factory <code>storageFactoryClassName</code>
206	* and parameters <code>properties</code>. Creates a default storage, if the	362	* and parameters <code>params</code>. Creates a default storage, if the
207	* <code>storageClass</code> is not a	363	* <code>storageFactoryClassName</code> is not a
208	* {@link org.netbeans.mdr.persistence.StorageFactory} or cannot be instantiated.	364	* {@link org.netbeans.mdr.persistence.StorageFactory} or cannot be instantiated.
209	*	365	*
210	* @param repository	366	* @param repository
211	* @param storageClass fully qualified name of class implementing	367	* @param storageFactoryClassName fully qualified name of class implementing
212	* {@link org.netbeans.mdr.persistence.StorageFactory}	368	* {@link org.netbeans.mdr.persistence.StorageFactory}
213	* @param properties parameters for storage creation	369	* @param params parameters for storage creation
214	* @exception DebugException if the storage cannot be created	370	* @exception DebugException if the storage cannot be created
215	*/	371	*/
216	public MdrStorage(NBMDRepositoryImpl repository, String storageClass, Map properties) {	372	public MdrStorage(NBMDRepositoryImpl repository, String storageFactoryClassName, Map params) {
217	this.storages = new HashMap();	373	this.storages = new HashMap();
218	this.nullMofId = new HashMap();	374	this.nullMofId = new HashMap();
219	this.objects = new HashMap();	375	this.objects = new HashMap();
Lines 223-232 Link Here
223	this.valuesObjects = new HashMap();	379	this.valuesObjects = new HashMap();
224		380
225	this.repository = repository;	381	this.repository = repository;
		382
		383	this.params = params;
226	StorageFactory storageFactory = null;	384	StorageFactory storageFactory = null;
227	try {	385	try {
228	// try to instantiate storage factory (its class name was passed as storageClass argument)	386	// try to instantiate storage factory (its class name was passed as storageClass argument)
229	Class storageFactoryClass = Class.forName(storageClass);	387	Class storageFactoryClass = Class.forName(storageFactoryClassName);
230	// does the class implement StorageFactory interface?	388	// does the class implement StorageFactory interface?
231	if (StorageFactory.class.isAssignableFrom(storageFactoryClass)) {	389	if (StorageFactory.class.isAssignableFrom(storageFactoryClass)) {
232	// yes - create new instance	390	// yes - create new instance
Lines 234-240 Link Here
234	} else {	392	} else {
235	// no - throw exception	393	// no - throw exception
236	// (this exception will not be propagated - it will be caught immediately - see following lines)	394	// (this exception will not be propagated - it will be caught immediately - see following lines)
237	throw new Exception("class "+storageClass+" does not implement StorageFactory");	395	throw new Exception("class "+storageFactoryClassName+" does not implement StorageFactory");
238	}	396	}
239	} catch (Exception e) {	397	} catch (Exception e) {
240	// in case the passed StorageFactory class could not be created, create default implementation	398	// in case the passed StorageFactory class could not be created, create default implementation
Lines 246-252 Link Here
246		404
247	try {	405	try {
248	// create storage passing the parameters to the factory method	406	// create storage passing the parameters to the factory method
249	this.bootStorage = storageFactory.createStorage(properties);	407	this.bootStorage = storageFactory.createStorage(params);
250	// cache the NULL MOFID of the boot storage	408	// cache the NULL MOFID of the boot storage
251	this.bootNullMofId = storageFactory.createNullMOFID();	409	this.bootNullMofId = storageFactory.createNullMOFID();
252	} catch (StorageException e) {	410	} catch (StorageException e) {
Lines 256-262 Link Here
256		414
257	// create the utilities for storage management	415	// create the utilities for storage management
258	eventNotifier = new EventNotifier();	416	eventNotifier = new EventNotifier();
259	repositoryMutex = new TransactionMutex(this, eventNotifier);	417	repositoryMutex = new TransactionMutex(this, eventNotifier, repository);
260	}	418	}
261		419
262	/* -------------------------------------------------------------------- */	420	/* -------------------------------------------------------------------- */
Lines 329-335 Link Here
329	/* -- Methods for initialization and reinitialization (public/private) */	487	/* -- Methods for initialization and reinitialization (public/private) */
330	/* -------------------------------------------------------------------- */	488	/* -------------------------------------------------------------------- */
331		489
332
333	/** Initializes MdrStorage instance.	490	/** Initializes MdrStorage instance.
334	* This method is called by the {@link org.netbeans.mdr.NBMDRepositoryImpl repository}	491	* This method is called by the {@link org.netbeans.mdr.NBMDRepositoryImpl repository}
335	* during its initialization. It initializes resp. creates the boot storage.	492	* during its initialization. It initializes resp. creates the boot storage.
Lines 910-916 Link Here
910	*	1067	*
911	* @param context	1068	* @param context
912	* @param indexName	1069	* @param indexName
913	* @return the index for the given attribute or <code>null</code> */	1070	* @return the index for the given attribute or <code>null</code> */
914	private MultivaluedIndex getAdditionalIndex(String context, String indexName) {	1071	private MultivaluedIndex getAdditionalIndex(String context, String indexName) {
915	try {	1072	try {
916	Storage storage = getStorageByMofId(context);	1073	Storage storage = getStorageByMofId(context);
Lines 1234-1240 Link Here
1234	Hashtable temp = new Hashtable();	1391	Hashtable temp = new Hashtable();
1235	Object key;	1392	Object key;
1236	String extent = getContextOutermostPackage(mofContext).getMofId();	1393	String extent = getContextOutermostPackage(mofContext).getMofId();
1237		1394
1238	// rebuild attribute indexes	1395	// rebuild attribute indexes
1239	SinglevaluedIndex attributeIndexes = bootStorage.getSinglevaluedIndex(PREFIX_ATTR_INDEXES_BY_NAME + extent);	1396	SinglevaluedIndex attributeIndexes = bootStorage.getSinglevaluedIndex(PREFIX_ATTR_INDEXES_BY_NAME + extent);
1240	String oldValue;	1397	String oldValue;
Lines 1255-1261 Link Here
1255	}	1412	}
1256	bootStorage.dropIndex(oldAttributeIndex.getName());	1413	bootStorage.dropIndex(oldAttributeIndex.getName());
1257	}	1414	}
1258	*/	1415	*/
1259		1416
1260	Object key;	1417	Object key;
1261	String newValue;	1418	String newValue;
Lines 1515-1521 Link Here
1515	private String getContextAssocEndIndexName(String context, String assocMofId, int end) {	1672	private String getContextAssocEndIndexName(String context, String assocMofId, int end) {
1516	return PREFIX_ASSOC_END + context + ":" + assocMofId + end;	1673	return PREFIX_ASSOC_END + context + ":" + assocMofId + end;
1517	}	1674	}
1518		1675
1519	public Storage getStorageByMofId(String mofId) {	1676	public Storage getStorageByMofId(String mofId) {
1520	String storageId = getStorageIdFromMofId(mofId);	1677	String storageId = getStorageIdFromMofId(mofId);
1521	if (storageId == null) {	1678	if (storageId == null) {
Lines 1564-1576 Link Here
1564		1721
1565	/ Transient support /	1722	/ Transient support /
1566	void registerTransientObjectsContainer(String mofId, TransientStorableClass tsc) {	1723	void registerTransientObjectsContainer(String mofId, TransientStorableClass tsc) {
1567	org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex tir = (org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex)	1724	org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex tir = (org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex)
1568	this.objects.get (org.netbeans.mdr.storagemodel.transientimpl.MOFID.TRANSIENT_STORAGE_PREFIX);	1725	this.objects.get(org.netbeans.mdr.storagemodel.transientimpl.MOFID.TRANSIENT_STORAGE_PREFIX);
1569	if (tir == null) {	1726	if (tir == null) {
1570	tir = new org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex ();	1727	tir = new org.netbeans.mdr.storagemodel.transientimpl.TransientObjectResolverIndex();
1571	this.objects.put (org.netbeans.mdr.storagemodel.transientimpl.MOFID.TRANSIENT_STORAGE_PREFIX, tir);	1728	this.objects.put(org.netbeans.mdr.storagemodel.transientimpl.MOFID.TRANSIENT_STORAGE_PREFIX, tir);
1572	}	1729	}
1573	tir.register (mofId, tsc);	1730	tir.register(mofId, tsc);
1574	}	1731	}
1575		1732
1576	void unregisterTransientObjectsContainer(String mofId) throws StorageException {	1733	void unregisterTransientObjectsContainer(String mofId) throws StorageException {

Lines 150-156 Link Here

(-)src/org/netbeans/mdr/storagemodel/StorableAssociation.java (-18 / +156 lines)
150	if (((Boolean) getMetaObject().getAttribute(MOFConstants.SH_MODEL_ASSOCIATION_IS_DERIVED)).booleanValue() \|\| TagSupport.getTagValue(getMetaObject(), INTERCEPTABLE_TAG_ID, "").equals("true"))	150	if (((Boolean) getMetaObject().getAttribute(MOFConstants.SH_MODEL_ASSOCIATION_IS_DERIVED)).booleanValue() \|\| TagSupport.getTagValue(getMetaObject(), INTERCEPTABLE_TAG_ID, "").equals("true"))
151	return BaseObjectHandler.resolveImplementation(TagSupport.getImplFullName(getMetaObject(), TagSupport.ASSOCIATION));	151	return BaseObjectHandler.resolveImplementation(TagSupport.getImplFullName(getMetaObject(), TagSupport.ASSOCIATION));
152	else	152	else
153	return AssociationHandler.class;	153	return getMdrStorage().getAssociationHandlerClass();
154	}	154	}
155		155
156	/** Returns multiplicity of the first association end.	156	/** Returns multiplicity of the first association end.
Lines 246-271 Link Here
246	}	246	}
247		247
248	/**	248	/**
		249	* Returns immutable, live collection of all links managed by this association
		250	* proxy.
		251	*
249	* @throws StorageException	252	* @throws StorageException
250	* @return	253	* @return immutable, live collection of all links
251	*/	254	*/
252	public Collection getAllLinks() throws StorageException {	255	public Collection getAllLinks() throws StorageException {
253	ArrayList allLinks = new ArrayList ();	256	return new LinkSetCollection();
254
255	for (Iterator it = bIndex.keySet().iterator (); it.hasNext();) {
256	String a = (String) it.next();
257	if (isMultivaluedB()) {
258	Collection bees = getMdrStorage().getObjectsFromIndex((MultivaluedIndex) bIndex, a);
259	for (Iterator it2 = bees.iterator (); it2.hasNext();){
260	AssociationLink oneLink = new AssociationLink((StorableObject) getMdrStorage().getObject(a), (StorableObject) it2.next());
261	allLinks.add(oneLink);
262	}
263	} else {
264	AssociationLink oneLink = new AssociationLink((StorableObject) getMdrStorage().getObject(a), (StorableObject) getMdrStorage().getObjectFromIndexIfExists((SinglevaluedIndex) bIndex, a));
265	allLinks.add(oneLink);
266	}
267	}
268	return Collections.unmodifiableCollection(allLinks);
269	}	257	}
270		258
271	/**	259	/**
Lines 567-571 Link Here
567	e.printStackTrace();	555	e.printStackTrace();
568	throw new RuntimeException();	556	throw new RuntimeException();
569	}	557	}
		558	}
		559
		560	/* --------------------------------------------------------------------- */
		561	/* -- LinkSetCollection (inner class) ---------------------------------- */
		562	/* --------------------------------------------------------------------- */
		563
		564	protected class LinkSetCollection extends AbstractCollection {
		565
		566	public Iterator iterator() {
		567	return new LinkSetIterator();
		568	}
		569
		570	public int size() {
		571	int size = 0;
		572	LinkSetIterator it = new LinkSetIterator();
		573	it.initCheck();
		574	while (it.b != null) {
		575	size++;
		576	it.fetchNext();
		577	}
		578	return size;
		579	}
		580	}
		581
		582	/* --------------------------------------------------------------------- */
		583	/* -- LinkSetIterator (inner class) ------------------------------------ */
		584	/* --------------------------------------------------------------------- */
		585
		586	protected class LinkSetIterator implements Iterator {
		587
		588	boolean initialized = false;
		589
		590	/**
		591	* Iterator through all instances at the a-side of this association or
		592	* <code>null</code> before the first access or if a storage problem
		593	* occured.
		594	*/
		595	Iterator as = null;
		596
		597	/**
		598	* MOF ID of the current instance at the a side. <code>null</code>
		599	* only before the first call to <code>fetchNext()</code>.
		600	*/
		601	String aID = null;
		602
		603	/**
		604	* Object with ID <code>aID</code> or <code>null</code> if not yet
		605	* retrieved.
		606	*/
		607	StorableObject a = null;
		608
		609	/**
		610	* If the association if multi-valued at b's end, <code>bs</code>
		611	* contains the iterator for the b's associated with the current a.
		612	* Shall only be accessed inside <code>fetchNext()</code>.
		613	*/
		614	Iterator bs = null;
		615
		616	/**
		617	* The current b object, <code>null</code> initially and after the
		618	* last link has been retrieved.
		619	*/
		620	StorableObject b = null;
		621
622	private void initCheck() {
623	if ( ! initialized ) {
624	initialized = true;
625	try {
626	as = bIndex.keySet().iterator();
627	} catch ( StorageException se ) {
628	// [XXX]: probably throw a DebugException here
629	as = null;
630	}
631	fetchNext();
632	}
633	}
634
635	private void fetchNext() {
636	if ( as == null ) {
637	return;
638	}
639	b = null;
640	// check if there is yet another b for the current a
641	if ( bs != null ) {
642	if ( bs.hasNext() ) {
643	b = (StorableObject) bs.next();
644	return;
645	}
646	}
647
648	try {
649	// fetch the next a
650	while ( as.hasNext() ) {
651	aID = (String) as.next();
652	a = null;
653	// fetch the first b for the given a, if exists
654	if ( isMultivaluedB() ) {
655	bs = getMdrStorage().getObjectsFromIndex((MultivaluedIndex) bIndex, aID).iterator();
656	if ( bs.hasNext() ) {
657	b = (StorableObject) bs.next();
658	}
659	} else {
660	b = (StorableObject) getMdrStorage().getObjectFromIndexIfExists((SinglevaluedIndex) bIndex, aID);
661	}
662	// check, if a b was found, return, if yes
663	if ( b != null ) {
664	return;
665	}
666	}
667	} catch (StorageException se) {
668	// [XXX]: probably throw a DebugException here
669	as = null;
670	b = null;
671	}
672
673	// there are not more links !
674	return;
675	}
676
677	public boolean hasNext() {
678	initCheck();
679	return b != null;
680	}
681
682	public Object next() {
683	initCheck();
684	if ( b == null ) {
685	throw new NoSuchElementException();
686	}
687	if ( a == null ) {
688	try {
689	a = (StorableObject) getMdrStorage().getObject(aID);
690	} catch (StorageException se) {
691	// {XXX]: better exception handling
692	se.printStackTrace();
693	throw new DebugException();
694	}
695	}
696	AssociationLink link = new AssociationLink(a,b);
697	fetchNext();
698	return link;
699	}
700
701	/**
702	* operation not supported
703	*/
704	public void remove() {
705	throw new UnsupportedOperationException();
706	}
707
570	}	708	}
571	}	709	}

Lines 158-164 Link Here

(-)test/build-qa-functional.xml (-2 / +2 lines)
158	<echo message="Using jars classpath for compilation."/>	158	<echo message="Using jars classpath for compilation."/>
159	<!-- this classpath will be used for compiling tests against jars -->	159	<!-- this classpath will be used for compiling tests against jars -->
160	<path id="compiletest.classpath">	160	<path id="compiletest.classpath">
161	<pathelement location="../../openide/netbeans/lib/openide.jar"/>	161	<pathelement location="${openide.jar}"/>
162	<pathelement location="../netbeans/modules/mdr.jar"/>	162	<pathelement location="../netbeans/modules/mdr.jar"/>
163	<pathelement location="../netbeans/modules/mdrtoolkit.jar"/>	163	<pathelement location="../netbeans/modules/mdrtoolkit.jar"/>
164	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>	164	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>
Lines 204-210 Link Here
204	<echo message="Using jars classpath."/>	204	<echo message="Using jars classpath."/>
205	<!-- this classpath will be used for executing tests against jars -->	205	<!-- this classpath will be used for executing tests against jars -->
206	<path id="codetest.classpath">	206	<path id="codetest.classpath">
207	<pathelement location="../../openide/netbeans/lib/openide.jar"/>	207	<pathelement location="${openide.jar}"/>
208	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>	208	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>
209	<pathelement location="../netbeans/modules/ext/nbmdr.jar"/>	209	<pathelement location="../netbeans/modules/ext/nbmdr.jar"/>
210	<pathelement location="../netbeans/modules/mdr.jar"/>	210	<pathelement location="../netbeans/modules/mdr.jar"/>

Lines 158-164 Link Here

(-)test/build-unit.xml (-2 / +2 lines)
158	<echo message="Using jars classpath for compilation."/>	158	<echo message="Using jars classpath for compilation."/>
159	<!-- this classpath will be used for compiling tests against jars -->	159	<!-- this classpath will be used for compiling tests against jars -->
160	<path id="compiletest.classpath">	160	<path id="compiletest.classpath">
161	<pathelement location="../../openide/netbeans/lib/openide.jar"/>	161	<pathelement location="${openide.jar}"/>
162	<pathelement location="../netbeans/modules/mdr.jar"/>	162	<pathelement location="../netbeans/modules/mdr.jar"/>
163	<pathelement location="../netbeans/modules/mdrtoolkit.jar"/>	163	<pathelement location="../netbeans/modules/mdrtoolkit.jar"/>
164	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>	164	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>
Lines 207-213 Link Here
207	<echo message="Using jars classpath."/>	207	<echo message="Using jars classpath."/>
208	<!-- this classpath will be used for executing tests against jars -->	208	<!-- this classpath will be used for executing tests against jars -->
209	<path id="codetest.classpath">	209	<path id="codetest.classpath">
210	<pathelement location="../../openide/netbeans/lib/openide.jar"/>	210	<pathelement location="${openide.jar}"/>
211	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>	211	<pathelement location="../netbeans/modules/ext/jmiutils.jar"/>
212	<pathelement location="../netbeans/modules/ext/nbmdr.jar"/>	212	<pathelement location="../netbeans/modules/ext/nbmdr.jar"/>
213	<pathelement location="../netbeans/modules/mdr.jar"/>	213	<pathelement location="../netbeans/modules/mdr.jar"/>

Lines 61-67 Link Here

(-)test/unit/src/org/netbeans/mdr/test/StaticFeaturesTest.java (-3 / +43 lines)
61		61
62	// classifier-level attribute test	62	// classifier-level attribute test
63	public void test_1 () {	63	public void test_1 () {
64	ModelPackage modelPackage = loadMOFModel ("StaticFeatures.xml", "model");	64	ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
65	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");	65	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
66		66
67	int x, y;	67	int x, y;
Lines 102-108 Link Here
102		102
103	// static operator test	103	// static operator test
104	public void test_2 () {	104	public void test_2 () {
105	ModelPackage modelPackage = loadMOFModel ("StaticFeatures.xml", "model");	105	ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
106	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");	106	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
107		107
108	ClassAClass proxyA = pkg.getClassA (); // staticFieldA (String), staticFieldB (int)	108	ClassAClass proxyA = pkg.getClassA (); // staticFieldA (String), staticFieldB (int)
Lines 142-148 Link Here
142		142
143	// derived classifier-level attribute test	143	// derived classifier-level attribute test
144	public void test_3 () {	144	public void test_3 () {
145	ModelPackage modelPackage = loadMOFModel ("StaticFeatures.xml", "model");	145	ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
146	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");	146	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
147		147
148	ClassDClass proxyD = pkg.getClassD (); // staticFieldD (String), staticDerivedField (int), op. compute	148	ClassDClass proxyD = pkg.getClassD (); // staticFieldD (String), staticDerivedField (int), op. compute
Lines 151-154 Link Here
151	fail();	151	fail();
152	}	152	}
153		153
		154	// classifier-level attribute test using reflective methods
		155	public void test_reflective () {
		156	ModelPackage modelPackage = loadMOFModel ("staticFeatures.xml", "model");
		157	StaticFeaturesPackage pkg = (StaticFeaturesPackage) createExtent (findMofPackage (modelPackage, "StaticFeatures"), "staticFeatures");
		158
		159	int x, y;
		160	final int MAX = 100;
		161	final int INT_VALUE = 678;
		162	Random random = new Random (0);
		163
		164	RefClass proxyA = pkg.getClassA (); // staticFieldA (String), staticFieldB (int)
		165	RefClass proxyB = pkg.getClassB ();
		166	RefClass proxyC = pkg.getClassC (); // staticFieldC (int), op. returnParam
		167	RefClass proxyD = pkg.getClassD (); // staticFieldD (String), staticDerivedField (int), op. compute
		168
		169	if (proxyD.refGetValue("staticFieldD") != null)
		170	fail ();
		171	proxyD.refSetValue("staticFieldD", "123");
		172	proxyB.refSetValue("staticFieldA", "abcdef");
		173
		174	for (x = 0; x < MAX; x++) {
		175	int value = random.nextInt ();
		176	proxyD.refSetValue("staticFieldB", new Integer(value));
		177	if ( (((Integer)proxyA.refGetValue("staticFieldB")).intValue() != value) \|\| (((Integer)proxyD.refGetValue("staticFieldB")).intValue() != value))
		178	fail ();
		179	}
		180
		181	proxyD.refSetValue("staticFieldC", new Integer(INT_VALUE));
		182
		183	if (!proxyD.refGetValue("staticFieldD").equals("123"))
		184	fail();
		185	if (!proxyB.refGetValue("staticFieldA").equals("abcdef"))
		186	fail();
		187	if (((Integer)proxyD.refGetValue("staticFieldC")).intValue() != INT_VALUE)
		188	fail();
		189
		190	proxyD.refSetValue("staticFieldC", new Integer(22));
		191	if (!proxyB.refGetValue("staticFieldA").equals("abcdef"))
		192	fail();
		193	}
154	}	194	}