diff -bB --exclude=CVS --exclude=*~ -ruP mdr/src/org/netbeans/lib/jmi/mapping/ClassFileMapper.java mdr-new/org/netbeans/lib/jmi/mapping/ClassFileMapper.java
--- mdr/src/org/netbeans/lib/jmi/mapping/ClassFileMapper.java	Mon May  6 11:32:00 2002
+++ mdr-new/org/netbeans/lib/jmi/mapping/ClassFileMapper.java	Mon May  6 18:00:57 2002
@@ -76,34 +76,34 @@
     }
     
     // generates interfaces for a given class
-    void classTemplate(javax.jmi.model.MofClass objClass) throws IOException {
+    protected void classTemplate(javax.jmi.model.MofClass objClass) throws IOException {
         new ClassProxyGenerator(objClass).generate();
         new ClassInstanceGenerator(objClass).generate();
     }
     
     // generates interface for a given association
-    void associationTemplate(Association objAssociation) throws IOException {
+    protected void associationTemplate(Association objAssociation) throws IOException {
         new AssociationGenerator(objAssociation).generate();
     }
     
     // generates interface for a given package
-    void packageTemplate(MofPackage objPackage) throws IOException {
+    protected void packageTemplate(MofPackage objPackage) throws IOException {
         new PackageGenerator(objPackage).generate();
     }
     
     //generates class for an exception
-    void exceptionTemplate(MofException objException) throws IOException {
+    protected void exceptionTemplate(MofException objException) throws IOException {
         new ExceptionGenerator(objException).generate();
     }
     
     // generates class for an enumeration
-    void enumerationTemplate(EnumerationType objEnumeration) throws IOException {
+    protected void enumerationTemplate(EnumerationType objEnumeration) throws IOException {
         new EnumerationGenerator(objEnumeration).generate();
         new EnumerationImplGenerator(objEnumeration).generate();
     }
     
     // generates interface for a structure
-    void structureTemplate(StructureType objStructure) throws IOException {
+    protected void structureTemplate(StructureType objStructure) throws IOException {
         new StructureGenerator(objStructure).generate();
     }
     
diff -bB --exclude=CVS --exclude=*~ -ruP mdr/src/org/netbeans/lib/jmi/mapping/GenericMapper.java mdr-new/org/netbeans/lib/jmi/mapping/GenericMapper.java
--- mdr/src/org/netbeans/lib/jmi/mapping/GenericMapper.java	Mon May  6 11:32:00 2002
+++ mdr-new/org/netbeans/lib/jmi/mapping/GenericMapper.java	Mon May  6 17:57:09 2002
@@ -209,21 +209,21 @@
     // template methods -----------------------------------------------------------------------------------------------------
     
     // generates interfaces for a given class (class interface and class proxy interface)
-    abstract void classTemplate(javax.jmi.model.MofClass objClass) throws IOException;
+    protected abstract void classTemplate(javax.jmi.model.MofClass objClass) throws IOException;
 
     // generates interface for a given association
-    abstract void associationTemplate(Association objAssociation) throws IOException;
+    protected abstract void associationTemplate(Association objAssociation) throws IOException;
     
-    abstract void packageTemplate(MofPackage objPackage) throws IOException;
+    protected abstract void packageTemplate(MofPackage objPackage) throws IOException;
     
     // generates class for an exception
-    abstract void exceptionTemplate(MofException objException) throws IOException;
+    protected abstract void exceptionTemplate(MofException objException) throws IOException;
     
     // generates class for an enumeration
-    abstract void enumerationTemplate(EnumerationType objEnumeration) throws IOException;
+    protected abstract void enumerationTemplate(EnumerationType objEnumeration) throws IOException;
 
     // generates interface for a structure
-    abstract void structureTemplate(StructureType objStructure) throws IOException;
+    protected abstract void structureTemplate(StructureType objStructure) throws IOException;
 
     // public ---------------------------------------------------------------------------------------------------------------
 
diff -bB --exclude=CVS --exclude=*~ -ruP mdr/src/org/netbeans/lib/jmi/mapping/JavaMapper.java mdr-new/org/netbeans/lib/jmi/mapping/JavaMapper.java
--- mdr/src/org/netbeans/lib/jmi/mapping/JavaMapper.java	Mon May  6 11:44:52 2002
+++ mdr-new/org/netbeans/lib/jmi/mapping/JavaMapper.java	Mon May  6 18:01:27 2002
@@ -380,7 +380,7 @@
     }
 
     // generates interfaces for a given class (class interface and class proxy interface)
-    void classTemplate(javax.jmi.model.MofClass objClass) throws IOException {
+    protected void classTemplate(javax.jmi.model.MofClass objClass) throws IOException {
         Collection ancestors = new ArrayList();
         Collection supertypes = objClass.getSupertypes();
         Collection elements = objClass.getContents();
@@ -506,7 +506,7 @@
     }
 
     // generates interface for a given association
-    void associationTemplate(Association objAssociation) throws IOException {
+    protected void associationTemplate(Association objAssociation) throws IOException {
         Collection contents = objAssociation.getContents();
         AssociationEnd[] ends = new AssociationEnd[2];
         Object element;
@@ -555,7 +555,7 @@
     }
 
     // generates interface for a given package
-    void packageTemplate(MofPackage objPackage) throws IOException {
+    protected void packageTemplate(MofPackage objPackage) throws IOException {
         Collection elements;
         ModelElement element;
         Collection ancestors = new ArrayList();
@@ -609,7 +609,7 @@
     }
 
     // generates class for an exception
-    void exceptionTemplate(MofException objException) throws IOException {
+    protected void exceptionTemplate(MofException objException) throws IOException {
         Collection contents = objException.getContents();
         ArrayList params = new ArrayList();
         ArrayList codeConstr = new ArrayList();
@@ -688,7 +688,7 @@
         return exceptionName.endsWith("Exception") ? exceptionName : exceptionName + "Exception";
     }
    
-    void enumerationTemplate(EnumerationType objEnumeration) throws IOException {
+    protected void enumerationTemplate(EnumerationType objEnumeration) throws IOException {
         // generate interface for EnumerationType
         String packageName = TagProvider.getTypePrefix(objEnumeration);
         String ifcName = TagProvider.getSubstName(objEnumeration);
@@ -793,7 +793,7 @@
         classFooter(ifcName, false);
     }
     
-    void structureTemplate(StructureType objStructure) throws IOException {
+    protected void structureTemplate(StructureType objStructure) throws IOException {
         String memberName;
 
         // generate interface for StructuredType