Index: apichanges.xml
===================================================================
RCS file: /cvs/j2eeserver/apichanges.xml,v
--- apichanges.xml	8 Apr 2006 23:45:51 -0000	1.16.6.3.2.4
+++ apichanges.xml	9 Apr 2006 11:03:55 -0000
@@ -80,6 +80,23 @@ 
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="serverIcons">
+            <api name="plugins"/>
+            <summary>
+                Added support for getting the default server icons.
+            </summary>
+            <version major="1" minor="20"/>
+            <date day="9" month="4" year="2006"/>
+            <author login="sherold"/>
+            <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+            <description>
+                <p>
+                    Added support for getting the default server icons for
+                    EAR, EJB, WAR archives and their respective containers (folders).
+                </p>
+            </description>
+            <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="UISupport"/>
+        </change>
         <change id="antDeployment">
             <api name="j2eeserver"/>
             <summary>
Index: nbproject/project.properties
===================================================================
RCS file: /cvs/j2eeserver/nbproject/project.properties,v
--- nbproject/project.properties	9 Apr 2006 09:09:36 -0000	1.9.34.5
+++ nbproject/project.properties	9 Apr 2006 11:03:55 -0000
@@ -11,7 +11,7 @@ 
 
 is.autoload=true
 javac.source=1.5
-spec.version.base=1.18.0
+spec.version.base=1.20.0
 
 javadoc.title=J2EE Server API
 javadoc.overview=${basedir}/api/doc/overview.html
Index: src/org/netbeans/modules/j2ee/deployment/plugins/api/UISupport.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/UISupport.java,v
--- src/org/netbeans/modules/j2ee/deployment/plugins/api/UISupport.java	16 Aug 2005 13:34:06 -0000	1.2
+++ src/org/netbeans/modules/j2ee/deployment/plugins/api/UISupport.java	9 Apr 2006 11:03:56 -0000
@@ -13,13 +13,18 @@ 
 
 package org.netbeans.modules.j2ee.deployment.plugins.api;
 
+import java.awt.Image;
+import java.beans.BeanInfo;
 import java.util.WeakHashMap;
 import javax.swing.Action;
 import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;
 import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
 import org.netbeans.modules.j2ee.deployment.impl.ui.ServerRegistryNode;
 import org.netbeans.modules.j2ee.deployment.impl.ui.actions.*;
+import org.openide.filesystems.Repository;
+import org.openide.loaders.DataFolder;
 import org.openide.nodes.Node;
+import org.openide.util.Utilities;
 import org.openide.windows.IOProvider;
 import org.openide.windows.InputOutput;
 
@@ -33,8 +38,62 @@ 
     
     private static final WeakHashMap ioWeakMap = new WeakHashMap();
     
+    /**
+     * Server icon constants.
+     *
+     * @since 1.20
+     */
+    public enum ServerIcon { 
+        EJB_ARCHIVE, WAR_ARCHIVE, EAR_ARCHIVE,     
+        EJB_FOLDER, EAR_FOLDER, WAR_FOLDER,
+        EJB_OPENED_FOLDER, EAR_OPENED_FOLDER, WAR_OPENED_FOLDER,
+    };
+    
     /** Do not allow to create instances of this class */
     private UISupport() {
+    }
+    
+    /**
+     * Returns the specified icon.
+     *
+     * @return The specified icon.
+     *
+     * @since 1.20
+     */
+    public static Image getIcon(ServerIcon serverIcon) {
+        switch (serverIcon) {
+            case EJB_ARCHIVE :
+                return Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/ejb.png"); // NOI18N
+            case WAR_ARCHIVE :
+                return Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/war.png"); // NOI18N
+            case EAR_ARCHIVE :
+                return Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/ear.png"); // NOI18N
+            default :
+                return computeIcon(serverIcon);
+        }
+    }
+    
+    private static Image computeIcon(ServerIcon serverIcon) {
+        // get the default folder icon
+        Node folderNode = DataFolder.findFolder(Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();
+        Image folder;
+        if (serverIcon == ServerIcon.EJB_OPENED_FOLDER || serverIcon == ServerIcon.WAR_OPENED_FOLDER 
+                || serverIcon == ServerIcon.EAR_OPENED_FOLDER) {
+            folder = folderNode.getOpenedIcon(BeanInfo.ICON_COLOR_16x16);
+        } else {
+            folder = folderNode.getIcon(BeanInfo.ICON_COLOR_16x16);
+        }
+        Image badge;
+        if (serverIcon == ServerIcon.EJB_FOLDER || serverIcon == ServerIcon.EJB_OPENED_FOLDER) {
+            badge = Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/ejbBadge.png"); // NOI18N
+        } else if (serverIcon == ServerIcon.WAR_FOLDER || serverIcon == ServerIcon.WAR_OPENED_FOLDER) {
+            badge = Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/warBadge.png"); // NOI18N
+        } else if (serverIcon == ServerIcon.EAR_FOLDER || serverIcon == ServerIcon.EAR_OPENED_FOLDER) {
+            badge = Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/earBadge.png" ); // NOI18N
+        } else {
+            return null;
+        }
+        return Utilities.mergeImages(folder, badge, 7, 7);
     }
     
     /**