? j2se74373.patch
? src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SECompositePanelProvider.java
Index: arch.xml
===================================================================
RCS file: /cvs/java/j2seproject/arch.xml,v
retrieving revision 1.10
diff -u -r1.10 arch.xml
--- arch.xml	10 Jan 2006 16:24:21 -0000	1.10
+++ arch.xml	11 Apr 2006 09:22:40 -0000
@@ -1054,15 +1054,21 @@
             <hint>
             As this is some kind of intermodule dependency, it is a kind of API.
             Please describe it and classify according to 
-            <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+                <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
             common stability categories</a>.
             </hint>
         </question>
 -->
  <answer id="resources-read">
-  <p>
-   No.
-  </p>
+    <api group="layer" name="J2SEProjectCustomizer" type="export" category="official">
+     <p>
+       "J2SEProject/Customizer" folder's content is used to construct the project's customizer.
+       It's content is expected to be <code>ProjectCustomizer.CompositeCategoryProvider</code> instances.
+       The lookup passed to the panels contains an instance of <code>Project</code> and <code>org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties</code>
+       Please note that the latter is not part of any public APIs and you need implementation dependency to make use of it.
+     </p>
+    </api>
+
  </answer>
 
 
@@ -1097,6 +1103,62 @@
  <answer id="security-policy">
   <p>
    No.
+  </p>
+ </answer>
+
+
+
+
+<!--
+        <question id="arch-where" when="impl">
+            Where one can find sources for your module?
+            <hint>
+                Please provide link to the CVS web client at
+                http://www.netbeans.org/download/source_browse.html
+                or just use tag defaultanswer generate='here'
+            </hint>
+        </question>
+-->
+ <answer id="arch-where">
+  <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+        <question id="compat-deprecation" when="init">
+            How the introduction of your project influences functionality
+            provided by previous version of the product?
+            <hint>
+            If you are planning to deprecate/remove/change any existing APIs,
+            list them here accompanied with the reason explaining why you
+            are doing so.
+            </hint>
+        </question>
+-->
+ <answer id="compat-deprecation">
+  <p>
+   XXX no answer for compat-deprecation
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-ant-tasks" when="impl">
+            Do you define or register any ant tasks that other can use?
+            
+            <hint>
+            If you provide an ant task that users can use, you need to be very
+            careful about its syntax and behaviour, as it most likely forms an
+	          API for end users and as there is a lot of end users, their reaction
+            when such API gets broken can be pretty strong.
+            </hint>
+        </question>
+-->
+ <answer id="exec-ant-tasks">
+  <p>
+   XXX no answer for exec-ant-tasks
   </p>
  </answer>
 
Index: src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties,v
retrieving revision 1.79
diff -u -r1.79 Bundle.properties
--- src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties	7 Oct 2005 11:01:34 -0000	1.79
+++ src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties	11 Apr 2006 09:22:40 -0000
@@ -13,21 +13,21 @@
 LBL_Customizer_Title=Project Properties - {0}
 
 # Configuration node labels
-LBL_Config_BuildCategory=Build
-LBL_Config_RunCategory=Run X
-LBL_Config_ProjectDependencies=Required Projects X
+J2SEProject/Customizer/BuildCategory=Build
+#LBL_Config_RunCategory=Run X
+#LBL_Config_ProjectDependencies=Required Projects X
 LBL_Config_Libraries=Libraries
 LBL_Config_Sources=Sources
 LBL_Config_Build=Compiling
-LBL_Config_BuildTests=Compiling Tests X
+#LBL_Config_BuildTests=Compiling Tests X
 LBL_Config_Jar=Packaging
 LBL_Config_Javadoc=Documenting
 LBL_Config_Run=Run
-LBL_Config_Test=Running Tests X
-LBL_Config_Debug=Running in Debugger X
+#LBL_Config_Test=Running Tests X
+#LBL_Config_Debug=Running in Debugger X
 
 LBL_Config_WebServiceClients=Web Service Clients
-LBL_Config_WebServices=Web Services
+J2SEProject/Customizer/WebServiceCategory=Web Services
 
 # Panels
 
Index: src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerLibraries.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerLibraries.java,v
retrieving revision 1.14
diff -u -r1.14 CustomizerLibraries.java
--- src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerLibraries.java	9 Nov 2005 15:06:16 -0000	1.14
+++ src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerLibraries.java	11 Apr 2006 09:22:40 -0000
@@ -36,7 +36,7 @@
  *
  * @author  phrebejk
  */
-public class CustomizerLibraries extends JPanel implements HelpCtx.Provider, ListDataListener, CustomizerProviderImpl.SubCategoryProvider {
+public class CustomizerLibraries extends JPanel implements HelpCtx.Provider, ListDataListener {
     
     public static final String COMPILE = "COMPILE";  //NOI18N
     public static final String RUN = "RUN";          //NOI18N
@@ -45,7 +45,7 @@
     
     private final J2SEProjectProperties uiProperties;    
     
-    public CustomizerLibraries( J2SEProjectProperties uiProperties ) {
+    public CustomizerLibraries( J2SEProjectProperties uiProperties, CustomizerProviderImpl.SubCategoryProvider subcat ) {
         this.uiProperties = uiProperties;        
         initComponents();        
         
@@ -118,6 +118,9 @@
             } 
         });
         testBroken();
+        if (J2SECompositePanelProvider.LIBRARIES.equals(subcat.getCategory())) {
+            showSubCategory(subcat.getSubcategory());
+        }
         
         uiProperties.JAVAC_CLASSPATH_MODEL.addListDataListener( this );
         uiProperties.JAVAC_TEST_CLASSPATH_MODEL.addListDataListener( this );
@@ -182,7 +185,7 @@
     }
     
     
-    public void showSubCategory (String name) {
+    private void showSubCategory (String name) {
         if (name.equals(COMPILE)) {
             jTabbedPane1.setSelectedIndex (0);
         }        
Index: src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerProviderImpl.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerProviderImpl.java,v
retrieving revision 1.5
diff -u -r1.5 CustomizerProviderImpl.java
--- src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerProviderImpl.java	20 Aug 2005 08:10:13 -0000	1.5
+++ src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerProviderImpl.java	11 Apr 2006 09:22:40 -0000
@@ -38,7 +38,9 @@
 import org.netbeans.spi.project.ui.CustomizerProvider;
 import org.netbeans.spi.project.ui.support.ProjectCustomizer;
 import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
+import org.openide.util.lookup.Lookups;
 
 
 /** Customization of J2SE project
@@ -63,6 +65,8 @@
     // Option command names
     private static final String COMMAND_OK = "OK";          // NOI18N
     private static final String COMMAND_CANCEL = "CANCEL";  // NOI18N
+
+    public static final String CUSTOMIZER_FOLDER_PATH = "J2SEProject/Customizer"; //NO18N
     
     private static Map /*<Project,Dialog>*/project2Dialog = new HashMap(); 
     
@@ -87,181 +91,29 @@
         
         Dialog dialog = (Dialog)project2Dialog.get (project);
         if ( dialog != null ) {            
-            dialog.show ();
+            dialog.setVisible(true);
             return;
         }
         else {
-            J2SEProjectProperties uiProperties = new J2SEProjectProperties( (J2SEProject)project, updateHelper, evaluator, refHelper, genFileHelper );        
-            init( uiProperties );
+            J2SEProjectProperties uiProperties = new J2SEProjectProperties( (J2SEProject)project, updateHelper, evaluator, refHelper, genFileHelper );
+            Lookup context = Lookups.fixed(new Object[] {
+                project,
+                uiProperties,
+                new SubCategoryProvider(preselectedCategory, preselectedSubCategory)
+            });
 
             OptionListener listener = new OptionListener( project, uiProperties );
-            // HelpCtx helpCtx = new HelpCtx( "org.netbeans.modules.java.j2seproject.ui.customizer.J2SECustomizer" );
-            if (preselectedCategory != null && preselectedSubCategory != null) {
-                for (int i=0; i<categories.length; i++ ) {
-                    if (preselectedCategory.equals(categories[i].getName())) {
-                        JComponent component = panelProvider.create (categories[i]);
-                        if (component instanceof SubCategoryProvider) {
-                            ((SubCategoryProvider)component).showSubCategory(preselectedSubCategory);
-                        }
-                        break;
-                    }
-                }
-            }
-            dialog = ProjectCustomizer.createCustomizerDialog( categories, panelProvider, preselectedCategory, listener, null );
+            dialog = ProjectCustomizer.createCustomizerDialog( CUSTOMIZER_FOLDER_PATH, context, preselectedCategory, listener, null );
             dialog.addWindowListener( listener );
             dialog.setTitle( MessageFormat.format(                 
                     NbBundle.getMessage( CustomizerProviderImpl.class, "LBL_Customizer_Title" ), // NOI18N 
                     new Object[] { ProjectUtils.getInformation(project).getDisplayName() } ) );
 
             project2Dialog.put(project, dialog);
-            dialog.show();
+            dialog.setVisible(true);
         }
     }    
     
-    // Names of categories
-    private static final String BUILD_CATEGORY = "BuildCategory";
-    private static final String RUN_CATEGORY = "RunCategory";
-    
-    private static final String GENERAL = "General";
-    private static final String SOURCES = "Sources";
-    private static final String LIBRARIES = "Libraries";
-    
-    private static final String BUILD = "Build";
-    private static final String BUILD_TESTS = "BuildTests";
-    private static final String JAR = "Jar";
-    private static final String JAVADOC = "Javadoc";
-    private static final String RUN = "Run";    
-    private static final String RUN_TESTS = "RunTests";
-    
-    private static final String WEBSERVICECLIENTS = "WebServiceClients";
-    private static final String WEBSERVICE_CATEGORY = "WebServiceCategory";
-    
-    private void init( J2SEProjectProperties uiProperties ) {
-        
-        ResourceBundle bundle = NbBundle.getBundle( CustomizerProviderImpl.class );
-    
-        /*
-        ProjectCustomizer.Category general = ProjectCustomizer.Category.create( 
-                BUILD, 
-                bundle.getString( "LBL_Config_Build" ), 
-                null, 
-                null );        
-        */
-        
-        
-        ProjectCustomizer.Category sources = ProjectCustomizer.Category.create(
-                SOURCES,
-                bundle.getString ("LBL_Config_Sources"),
-                null,
-                null);
-        
-        ProjectCustomizer.Category libraries = ProjectCustomizer.Category.create (
-                LIBRARIES,
-                bundle.getString( "LBL_Config_Libraries" ), // NOI18N
-                null,
-                null );
-        
-        ProjectCustomizer.Category build = ProjectCustomizer.Category.create(
-                BUILD, 
-                bundle.getString( "LBL_Config_Build" ), // NOI18N
-                null,
-                null);
-        ProjectCustomizer.Category jar = ProjectCustomizer.Category.create(
-                JAR,
-                bundle.getString( "LBL_Config_Jar" ), // NOI18N
-                null,
-                null );
-        ProjectCustomizer.Category javadoc = ProjectCustomizer.Category.create(
-                JAVADOC,
-                bundle.getString( "LBL_Config_Javadoc" ), // NOI18N
-                null,
-                null );
-        
-        ProjectCustomizer.Category run = ProjectCustomizer.Category.create(
-                RUN,
-                bundle.getString( "LBL_Config_Run" ), // NOI18N
-                null,
-                null );    
-        ProjectCustomizer.Category runTests = ProjectCustomizer.Category.create(
-                RUN_TESTS,
-                bundle.getString( "LBL_Config_Test" ), // NOI18N
-                null,
-                null);
-
-        ProjectCustomizer.Category buildCategory = ProjectCustomizer.Category.create(
-                BUILD_CATEGORY,
-                bundle.getString( "LBL_Config_BuildCategory" ), // NOI18N
-                null,
-                new ProjectCustomizer.Category[] { build, jar, javadoc }  );
-                
-        ProjectCustomizer.Category clients = ProjectCustomizer.Category.create(
-                WEBSERVICECLIENTS,
-                bundle.getString( "LBL_Config_WebServiceClients" ), // NOI18N
-                null,
-                null);
-                
-        ProjectCustomizer.Category webServices = ProjectCustomizer.Category.create(
-                WEBSERVICE_CATEGORY,
-                bundle.getString( "LBL_Config_WebServices" ), // NOI18N
-                null,
-                new ProjectCustomizer.Category[] { clients } );
-                
-        categories = new ProjectCustomizer.Category[] { 
-                sources,
-                libraries,        
-                buildCategory,
-                run,  
-                webServices
-        };
-                
-        List serviceClientsSettings = null;
-        WebServicesClientSupport clientSupport = WebServicesClientSupport.getWebServicesClientSupport(project.getProjectDirectory());
-        if (clientSupport != null) {
-            serviceClientsSettings = clientSupport.getServiceClients();
-        }
-                
-        categories = new ProjectCustomizer.Category[] { 
-                sources,
-                libraries,        
-                buildCategory,
-                run,  
-                webServices
-        };        
-        
-        Map panels = new HashMap();
-        panels.put( sources, new CustomizerSources( uiProperties ) );
-        panels.put( libraries, new CustomizerLibraries( uiProperties ) );
-        panels.put( build, new CustomizerCompile( uiProperties ) );
-        panels.put( jar, new CustomizerJar( uiProperties ) );
-        panels.put( javadoc, new CustomizerJavadoc( uiProperties ) );
-        panels.put( run, new CustomizerRun( uiProperties ) ); 
-        
-        if(serviceClientsSettings != null && serviceClientsSettings.size() > 0) {
-            panels.put( clients, new CustomizerWSClientHost( uiProperties, serviceClientsSettings ));
-        } else {
-            panels.put( clients, new NoWebServiceClientsPanel());
-        }
-        panelProvider = new PanelProvider( panels );
-        
-    }
-    
-    private static class PanelProvider implements ProjectCustomizer.CategoryComponentProvider {
-        
-        private JPanel EMPTY_PANEL = new JPanel();
-        
-        private Map /*<Category,JPanel>*/ panels;
-        
-        PanelProvider( Map panels ) {
-            this.panels = panels;            
-        }
-        
-        public JComponent create( ProjectCustomizer.Category category ) {
-            JComponent panel = (JComponent)panels.get( category );
-            return panel == null ? EMPTY_PANEL : panel;
-        }
-                        
-    }
-    
     /** Listens to the actions on the Customizer's option buttons */
     private class OptionListener extends WindowAdapter implements ActionListener {
     
@@ -282,7 +134,7 @@
             // Close & dispose the the dialog
             Dialog dialog = (Dialog)project2Dialog.get( project );
             if ( dialog != null ) {
-                dialog.hide();
+                dialog.setVisible(false);
                 dialog.dispose();
             }
         }        
@@ -298,14 +150,28 @@
             //may not be called
             Dialog dialog = (Dialog)project2Dialog.get( project );
             if ( dialog != null ) {
-                dialog.hide ();
+                dialog.setVisible(false);
                 dialog.dispose();
             }
         }
     }
     
-    static interface SubCategoryProvider {
-        public void showSubCategory (String name);
+    static final class SubCategoryProvider {
+
+        private String subcategory;
+
+        private String category;
+
+        SubCategoryProvider(String category, String subcategory) {
+            this.category = category;
+            this.subcategory = subcategory;
+        }
+        public String getCategory() {
+            return category;
+        }
+        public String getSubcategory() {
+            return subcategory;
+        }
     }
    
                             
Index: src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml,v
retrieving revision 1.15
diff -u -r1.15 layer.xml
--- src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml	30 Nov 2005 18:55:26 -0000	1.15
+++ src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml	11 Apr 2006 09:22:40 -0000
@@ -65,4 +65,55 @@
             <file name="CopyLibs.xml" url="CopyLibs.xml"/>
         </folder>
     </folder>
+    <folder name="J2SEProject">
+        <folder name="Customizer">
+            <file name="Sources.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createSources"/>
+            </file>
+            <attr name="Sources.instance/Libraries.instance" boolvalue="true"/>
+            <file name="Libraries.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createLibraries"/>
+            </file>
+            <attr name="Libraries.instance/BuildCategory" boolvalue="true"/>
+            <folder name="BuildCategory">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.Bundle"/>
+                <file name="Build.instance">
+                    <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createBuild"/>
+                </file>
+                <attr name="Build.instance/Jar.instance" boolvalue="true"/>
+                <file name="Jar.instance">
+                    <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createJar"/>
+                </file>
+                <attr name="Jar.instance/Javadoc.instance" boolvalue="true"/>
+                <file name="Javadoc.instance">
+                    <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createJavadoc"/>
+                </file>
+            </folder>
+            <attr name="BuildCategory/Run.instance" boolvalue="true"/>
+            <file name="Run.instance">
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createRun"/>
+            </file>
+            <attr name="Run.instance/WebServiceCategory" boolvalue="true"/>
+            <folder name="WebServiceCategory">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.Bundle"/>
+                <file name="Client.instance">
+                    <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider"/>
+                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.ui.support.ProjectCustomizer.CompositeCategoryProvider"/>
+                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seproject.ui.customizer.J2SECompositePanelProvider.createWebServiceClients"/>
+                </file>
+            </folder>
+        </folder>
+    </folder>
 </filesystem>