Attachment #29713 for bug #74648

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 74648
Collapse All | Expand All




    <!-- 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>

Lines 11-17 Link Here

(-)nbproject/project.properties (-1 / +1 lines)
11		11
12	is.autoload=true	12	is.autoload=true
13	javac.source=1.5	13	javac.source=1.5
14	spec.version.base=1.18.0	14	spec.version.base=1.20.0
15		15
16	javadoc.title=J2EE Server API	16	javadoc.title=J2EE Server API
17	javadoc.overview=${basedir}/api/doc/overview.html	17	javadoc.overview=${basedir}/api/doc/overview.html

Lines 13-25 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/plugins/api/UISupport.java (+59 lines)
13		13
14	package org.netbeans.modules.j2ee.deployment.plugins.api;	14	package org.netbeans.modules.j2ee.deployment.plugins.api;
15		15
		16	import java.awt.Image;
		17	import java.beans.BeanInfo;
16	import java.util.WeakHashMap;	18	import java.util.WeakHashMap;
17	import javax.swing.Action;	19	import javax.swing.Action;
18	import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;	20	import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;
19	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;	21	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
20	import org.netbeans.modules.j2ee.deployment.impl.ui.ServerRegistryNode;	22	import org.netbeans.modules.j2ee.deployment.impl.ui.ServerRegistryNode;
21	import org.netbeans.modules.j2ee.deployment.impl.ui.actions.*;	23	import org.netbeans.modules.j2ee.deployment.impl.ui.actions.*;
		24	import org.openide.filesystems.Repository;
		25	import org.openide.loaders.DataFolder;
22	import org.openide.nodes.Node;	26	import org.openide.nodes.Node;
		27	import org.openide.util.Utilities;
23	import org.openide.windows.IOProvider;	28	import org.openide.windows.IOProvider;
24	import org.openide.windows.InputOutput;	29	import org.openide.windows.InputOutput;
25		30
Lines 33-40 Link Here
33		38
34	private static final WeakHashMap ioWeakMap = new WeakHashMap();	39	private static final WeakHashMap ioWeakMap = new WeakHashMap();
35		40
		41	/**
		42	* Server icon constants.
		43	*
		44	* @since 1.20
		45	*/
		46	public enum ServerIcon {
		47	EJB_ARCHIVE, WAR_ARCHIVE, EAR_ARCHIVE,
		48	EJB_FOLDER, EAR_FOLDER, WAR_FOLDER,
		49	EJB_OPENED_FOLDER, EAR_OPENED_FOLDER, WAR_OPENED_FOLDER,
		50	};
		51
36	/** Do not allow to create instances of this class */	52	/** Do not allow to create instances of this class */
37	private UISupport() {	53	private UISupport() {
		54	}
		55
		56	/**
		57	* Returns the specified icon.
		58	*
		59	* @return The specified icon.
		60	*
		61	* @since 1.20
		62	*/
		63	public static Image getIcon(ServerIcon serverIcon) {
		64	switch (serverIcon) {
		65	case EJB_ARCHIVE :
		66	return Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/ejb.png"); // NOI18N
		67	case WAR_ARCHIVE :
		68	return Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/war.png"); // NOI18N
		69	case EAR_ARCHIVE :
		70	return Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/ear.png"); // NOI18N
		71	default :
		72	return computeIcon(serverIcon);
		73	}
		74	}
		75
		76	private static Image computeIcon(ServerIcon serverIcon) {
		77	// get the default folder icon
		78	Node folderNode = DataFolder.findFolder(Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();
		79	Image folder;
		80	if (serverIcon == ServerIcon.EJB_OPENED_FOLDER \|\| serverIcon == ServerIcon.WAR_OPENED_FOLDER
		81	\|\| serverIcon == ServerIcon.EAR_OPENED_FOLDER) {
		82	folder = folderNode.getOpenedIcon(BeanInfo.ICON_COLOR_16x16);
		83	} else {
		84	folder = folderNode.getIcon(BeanInfo.ICON_COLOR_16x16);
		85	}
		86	Image badge;
		87	if (serverIcon == ServerIcon.EJB_FOLDER \|\| serverIcon == ServerIcon.EJB_OPENED_FOLDER) {
		88	badge = Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/ejbBadge.png"); // NOI18N
		89	} else if (serverIcon == ServerIcon.WAR_FOLDER \|\| serverIcon == ServerIcon.WAR_OPENED_FOLDER) {
		90	badge = Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/warBadge.png"); // NOI18N
		91	} else if (serverIcon == ServerIcon.EAR_FOLDER \|\| serverIcon == ServerIcon.EAR_OPENED_FOLDER) {
		92	badge = Utilities.loadImage("org/netbeans/modules/j2ee/deployment/impl/ui/resources/earBadge.png" ); // NOI18N
		93	} else {
		94	return null;
		95	}
		96	return Utilities.mergeImages(folder, badge, 7, 7);
38	}	97	}
39		98
40	/**	99	/**

Return to bug 74648

Lines 80-85 Link Here

(-)apichanges.xml (+17 lines)
80	<!-- ACTUAL CHANGES BEGIN HERE: -->	80	<!-- ACTUAL CHANGES BEGIN HERE: -->
81		81
82	<changes>	82	<changes>
		83	<change id="serverIcons">
		84	<api name="plugins"/>
		85	<summary>
		86	Added support for getting the default server icons.
		87	</summary>
		88	<version major="1" minor="20"/>
		89	<date day="9" month="4" year="2006"/>
		90	<author login="sherold"/>
		91	<compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
		92	<description>
		93	<p>
		94	Added support for getting the default server icons for
		95	EAR, EJB, WAR archives and their respective containers (folders).
		96	</p>
		97	</description>
		98	<class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="UISupport"/>
		99	</change>
83	<change id="antDeployment">	100	<change id="antDeployment">
84	<api name="j2eeserver"/>	101	<api name="j2eeserver"/>
85	<summary>	102	<summary>