Attachment #85728 for bug #111361

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

Lines 88-94 Link Here

(-)a/j2me.cdc.platform/nbproject/project.xml (-1 / +1 lines)
88	<compile-dependency/>	88	<compile-dependency/>
89	<run-dependency>	89	<run-dependency>
90	<release-version>1</release-version>	90	<release-version>1</release-version>
91	<specification-version>1.7</specification-version>	91	<specification-version>1.14</specification-version>
92	</run-dependency>	92	</run-dependency>
93	</dependency>	93	</dependency>
94	<dependency>	94	<dependency>

Lines 52-54 Link Here

(-)a/j2me.cdc.platform/src/org/netbeans/modules/j2me/cdc/platform/Bundle.properties (+1 lines)
52		52
53	#CDCInstallImpl	53	#CDCInstallImpl
54	TXT_CDCPlatform=Java ME CDC Platform Emulator	54	TXT_CDCPlatform=Java ME CDC Platform Emulator
		55	cdc=Java ME Connected Devices




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.Repository;
import org.openide.filesystems.URLMapper;
import org.openide.modules.SpecificationVersion;
import org.openide.util.NbBundle;


/**


    public Specification getSpecification() {
        if (spec == null) {
            String name = NbBundle.getMessage(CDCPlatform.class, PLATFORM_CDC);
            spec = new Specification (name, PLATFORM_CDC, new SpecificationVersion(getClassVersion())); //NOI18N
        }
        return spec;
    }

Lines 87-92 Link Here

(-)a/java.j2seplatform/nbproject/project.xml (+1 lines)
87	<compile-dependency/>	87	<compile-dependency/>
88	<run-dependency>	88	<run-dependency>
89	<release-version>1</release-version>	89	<release-version>1</release-version>
		90	<specification-version>1.14</specification-version>
90	</run-dependency>	91	</run-dependency>
91	</dependency>	92	</dependency>
92	<dependency>	93	<dependency>

Lines 67-69 Link Here

(-)a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/Bundle.properties (+2 lines)
67	#Util	67	#Util
68	MSG_BrokenExtension=A nonexistent Java extension {0} on {1}	68	MSG_BrokenExtension=A nonexistent Java extension {0} on {1}
69		69
		70	#J2SEPlatformImpl
		71	j2se=Java SE

Lines 58-63 Link Here

(-)a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformImpl.java (-1 / +3 lines)
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.URLMapper;	59	import org.openide.filesystems.URLMapper;
60	import org.openide.ErrorManager;	60	import org.openide.ErrorManager;
		61	import org.openide.util.NbBundle;
61		62
62	/**	63	/**
63	* Implementation of the JavaPlatform API class, which serves proper	64	* Implementation of the JavaPlatform API class, which serves proper
Lines 313-319 Link Here
313		314
314	public Specification getSpecification() {	315	public Specification getSpecification() {
315	if (spec == null) {	316	if (spec == null) {
316	spec = new Specification (PLATFORM_J2SE, Util.getSpecificationVersion(this)); //NOI18N	317	String name = NbBundle.getMessage (J2SEPlatformImpl.class, PLATFORM_J2SE);
		318	spec = new Specification (name, PLATFORM_J2SE, Util.getSpecificationVersion(this)); //NOI18N
317	}	319	}
318	return spec;	320	return spec;
319	}	321	}




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="Specification.displayName">
            <api name="general"/>
            <summary></summary>
            <version major="1" minor="14"/>
            <date day="3" month="8" year="2009"/>
            <author login="tboudreau"/>
            <compatibility addition="yes"/>
            <description>
                <p>
                    Added Specification.getDisplayName() and constructors
                    for Specification which take a display name argument.
                </p>
            </description>
            <issue number="111361"/>
        </change>

        <change id="JavaPlatformManager.defaultPlatform">
            <api name="general"/>

Lines 1-6 Link Here

(-)a/java.platform/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.java.platform/1	2	OpenIDE-Module: org.netbeans.modules.java.platform/1
3	OpenIDE-Module-Specification-Version: 1.13	3	OpenIDE-Module-Specification-Version: 1.14
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/platform/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/platform/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/java/platform/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/java/platform/resources/layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false




 */
public final class Specification {

    private final String displayName;
    private final String name;
    private final SpecificationVersion version;
    private final Profile[] profiles;


    /**

     * @param version of the specification e.g. 1.4
     */
    public Specification (String name, SpecificationVersion version) {
        this (name, name, version, null);
    }

    /**
     * Creates new SDK Specification
     * @param name of the specification e.g J2SE
     * @param version of the specification e.g. 1.4
     * @param profiles of the Java SDK (may be null)
     */
    public Specification (String name, SpecificationVersion version, Profile[] profiles) {
        this (name, name, version, profiles);
    }

    /**
     * Creates a new SDK Specification
     * @param displayName The display name (i.e. Java ME vs J2ME, the official
     * specification name)
     * @param name The programmatic, official name of the specification
     * @param version The version
     * @since 1.14
     */
    public Specification (String displayName, String name, SpecificationVersion version) {
        this (displayName, name, version, null);
    }

    /**
     * Creates a new SDK Specification
     * @param displayName The display name (i.e. Java ME vs J2ME, the official
     * specification name)
     * @param name The programmatic, official name of the specification
     * @param version The version
     * @param profiles profiles of the Java SDK (may be null)
     * @since 1.14
     */
    public Specification (String displayName, String name, SpecificationVersion version, Profile[] profiles) {
        this.name = displayName;
        this.version = version;
        this.profiles = profiles;
        this.displayName = name;
    }

    /**

    }

    /**
     * Get the display name of the specification (e.g. &quot;Java ME&quot; for
     * j2me.
     * 
     * @return
     * @since 1.14
     */
    public final String getDisplayName() {
        return this.displayName;
    }

    /**
     * Returns the version of the Java specification e.g 1.4
     * @return instance of SpecificationVersion
     */




    
    private static class PlatformCategoriesDescriptor implements Comparable<PlatformCategoriesDescriptor> {
        private final String categoryName;
        private final String displayName;
        private final List<Node> platforms;
        private boolean changed = false;
        
        private PlatformCategoriesDescriptor(String categoryName, String displayName) {
            assert categoryName != null;
            this.categoryName = categoryName;
            this.displayName = displayName;
            this.platforms = new ArrayList<Node>();
        }

        public String getName () {
            return this.categoryName;
        }

        public String getDisplayName() {
            return displayName;
        }
        
        public List<Node> getPlatform () {                        
            if (changed) {

        }
        
        public @Override String getDisplayName() {
            return desc.getDisplayName ();
        }
        
        public @Override Image getIcon(int type) {

                                platformType = platformType.toUpperCase(Locale.ENGLISH);
                                PlatformCategoriesDescriptor platforms = categories.get(platformType);
                                if (platforms == null ) {
                                    platforms = new PlatformCategoriesDescriptor (platformType, platform.getSpecification().getDisplayName());
                                    categories.put (platformType, platforms);
                                }
                                platforms.add (node);

Lines 107-113 Link Here

(-)a/javacard.project/nbproject/project.xml (-9 / +9 lines)
107	<compile-dependency/>	107	<compile-dependency/>
108	<run-dependency>	108	<run-dependency>
109	<release-version>1</release-version>	109	<release-version>1</release-version>
110	<specification-version>1.9.1</specification-version>	110	<specification-version>1.14</specification-version>
111	</run-dependency>	111	</run-dependency>
112	</dependency>	112	</dependency>
113	<dependency>	113	<dependency>
Lines 208-213 Link Here
208	</run-dependency>	208	</run-dependency>
209	</dependency>	209	</dependency>
210	<dependency>	210	<dependency>
		211	<code-name-base>org.netbeans.modules.simple.project.templates</code-name-base>
		212	<build-prerequisite/>
		213	<compile-dependency/>
		214	<run-dependency>
		215	<specification-version>1.0</specification-version>
		216	</run-dependency>
		217	</dependency>
		218	<dependency>
211	<code-name-base>org.netbeans.modules.spi.actions</code-name-base>	219	<code-name-base>org.netbeans.modules.spi.actions</code-name-base>
212	<build-prerequisite/>	220	<build-prerequisite/>
213	<compile-dependency/>	221	<compile-dependency/>
Lines 338-351 Link Here
338	<specification-version>6.20</specification-version>	346	<specification-version>6.20</specification-version>
339	</run-dependency>	347	</run-dependency>
340	</dependency>	348	</dependency>
341	<dependency>
342	<code-name-base>org.netbeans.modules.simple.project.templates</code-name-base>
343	<build-prerequisite/>
344	<compile-dependency/>
345	<run-dependency>
346	<specification-version>1.0</specification-version>
347	</run-dependency>
348	</dependency>
349	</module-dependencies>	349	</module-dependencies>
350	<test-dependencies>	350	<test-dependencies>
351	<test-type>	351	<test-type>

Lines 142-145 Link Here

(-)a/javacard.project/src/org/netbeans/modules/javacard/platform/Bundle.properties (-1 / +1 lines)
142	all=<html>All <font color=''!controlShadow''>({0})	142	all=<html>All <font color=''!controlShadow''>({0})
143	STEP_TITLE_VALIDATE_PLATFORM=Validate Platform	143	STEP_TITLE_VALIDATE_PLATFORM=Validate Platform
144	STEP_TITLE_DEFINE_DEVICE=Define Default Device	144	STEP_TITLE_DEFINE_DEVICE=Define Default Device
145		145	jcre=Java Card

Lines 170-177 Link Here

(-)a/javacard.project/src/org/netbeans/modules/javacard/platform/JavacardPlatformImpl.java (-2 / +3 lines)
170	String platformVersion = props.getProperty(JavacardPlatformKeyNames.PLATFORM_MAJORVERSION, "1") + "." + //NOI18N	170	String platformVersion = props.getProperty(JavacardPlatformKeyNames.PLATFORM_MAJORVERSION, "1") + "." + //NOI18N
171	props.getProperty(JavacardPlatformKeyNames.PLATFORM_MINORVERSION, "0"); //NOI18N	171	props.getProperty(JavacardPlatformKeyNames.PLATFORM_MINORVERSION, "0"); //NOI18N
172	SpecificationVersion specVer = new SpecificationVersion (platformVersion);	172	SpecificationVersion specVer = new SpecificationVersion (platformVersion);
173	Specification result = profile == null ? new Specification (JavacardPlatformKeyNames.PLATFORM_SPECIFICATION_NAME, specVer) :	173	String name = NbBundle.getMessage (JavacardPlatformImpl.class, "jcre");
174	new Specification (JavacardPlatformKeyNames.PLATFORM_SPECIFICATION_NAME, specVer, new Profile[] { profile });	174	Specification result = profile == null ? new Specification (name, JavacardPlatformKeyNames.PLATFORM_SPECIFICATION_NAME, specVer) :
		175	new Specification (name, JavacardPlatformKeyNames.PLATFORM_SPECIFICATION_NAME, specVer, new Profile[] { profile });
175	return result;	176	return result;
176	}	177	}
177		178

Lines 276-278 Link Here

(-)a/mobility.cldcplatform/src/org/netbeans/modules/mobility/cldcplatform/Bundle.properties (+2 lines)
276	MNE_PlatformHome=F	276	MNE_PlatformHome=F
277	AD_PlatformName=N/A	277	AD_PlatformName=N/A
278	AD_PlatformHome=N/A	278	AD_PlatformHome=N/A
		279
		280	j2me=Java ME

Lines 418-424 Link Here

(-)a/mobility.cldcplatform/src/org/netbeans/modules/mobility/cldcplatform/J2MEPlatform.java (-1 / +4 lines)
418	for (int j=0; j<profiles.length; j++)	418	for (int j=0; j<profiles.length; j++)
419	profs.add(profiles[j]);	419	profs.add(profiles[j]);
420	}	420	}
421	spec = new Specification(SPECIFICATION_NAME, null, profs.toArray(new Profile[profs.size()]));	421	String specName = NbBundle.getMessage(J2MEPlatform.class,
		422	SPECIFICATION_NAME);
		423	spec = new Specification(specName, SPECIFICATION_NAME, null,
		424	profs.toArray(new Profile[profs.size()]));
422	}	425	}
423	return spec;	426	return spec;
424	}	427	}

Lines 113-119 Link Here

(-)a/mobility.project/nbproject/project.xml (-1 / +1 lines)
113	<compile-dependency/>	113	<compile-dependency/>
114	<run-dependency>	114	<run-dependency>
115	<release-version>1</release-version>	115	<release-version>1</release-version>
116	<specification-version>1.3.1</specification-version>	116	<specification-version>1.14</specification-version>
117	</run-dependency>	117	</run-dependency>
118	</dependency>	118	</dependency>
119	<dependency>	119	<dependency>

Return to bug 111361

Lines 477-494 Link Here

(-)a/java.platform/src/org/netbeans/modules/java/platform/ui/PlatformsCustomizer.java (-4 / +10 lines)
477		477
478	private static class PlatformCategoriesDescriptor implements Comparable<PlatformCategoriesDescriptor> {	478	private static class PlatformCategoriesDescriptor implements Comparable<PlatformCategoriesDescriptor> {
479	private final String categoryName;	479	private final String categoryName;
		480	private final String displayName;
480	private final List<Node> platforms;	481	private final List<Node> platforms;
481	private boolean changed = false;	482	private boolean changed = false;
482		483
483	public PlatformCategoriesDescriptor (String categoryName) {	484	private PlatformCategoriesDescriptor(String categoryName, String displayName) {
484	assert categoryName != null;	485	assert categoryName != null;
485	this.categoryName = categoryName;	486	this.categoryName = categoryName;
		487	this.displayName = displayName;
486	this.platforms = new ArrayList<Node>();	488	this.platforms = new ArrayList<Node>();
487	}	489	}
488		490
489	public String getName () {	491	public String getName () {
490	return this.categoryName;	492	return this.categoryName;
491	}	493	}
		494
		495	public String getDisplayName() {
		496	return displayName;
		497	}
492		498
493	public List<Node> getPlatform () {	499	public List<Node> getPlatform () {
494	if (changed) {	500	if (changed) {
Lines 563-569 Link Here
563	}	569	}
564		570
565	public @Override String getDisplayName() {	571	public @Override String getDisplayName() {
566	return this.getName ();	572	return desc.getDisplayName ();
567	}	573	}
568		574
569	public @Override Image getIcon(int type) {	575	public @Override Image getIcon(int type) {
Lines 606-612 Link Here
606	platformType = platformType.toUpperCase(Locale.ENGLISH);	612	platformType = platformType.toUpperCase(Locale.ENGLISH);
607	PlatformCategoriesDescriptor platforms = categories.get(platformType);	613	PlatformCategoriesDescriptor platforms = categories.get(platformType);
608	if (platforms == null ) {	614	if (platforms == null ) {
609	platforms = new PlatformCategoriesDescriptor (platformType);	615	platforms = new PlatformCategoriesDescriptor (platformType, platform.getSpecification().getDisplayName());
610	categories.put (platformType, platforms);	616	categories.put (platformType, platforms);
611	}	617	}
612	platforms.add (node);	618	platforms.add (node);

Lines 104-109 Link Here

(-)a/java.platform/apichanges.xml (+15 lines)
104	<!-- ACTUAL CHANGES BEGIN HERE: -->	104	<!-- ACTUAL CHANGES BEGIN HERE: -->
105		105
106	<changes>	106	<changes>
		107	<change id="Specification.displayName">
		108	<api name="general"/>
		109	<summary></summary>
		110	<version major="1" minor="14"/>
		111	<date day="3" month="8" year="2009"/>
		112	<author login="tboudreau"/>
		113	<compatibility addition="yes"/>
		114	<description>
		115	<p>
		116	Added Specification.getDisplayName() and constructors
		117	for Specification which take a display name argument.
		118	</p>
		119	</description>
		120	<issue number="111361"/>
		121	</change>
107		122
108	<change id="JavaPlatformManager.defaultPlatform">	123	<change id="JavaPlatformManager.defaultPlatform">
109	<api name="general"/>	124	<api name="general"/>

Lines 47-55 Link Here

(-)a/java.platform/src/org/netbeans/api/java/platform/Specification.java (-6 / +44 lines)
47	*/	47	*/
48	public final class Specification {	48	public final class Specification {
49		49
50	private String name;	50	private final String displayName;
51	private SpecificationVersion version;	51	private final String name;
52	private Profile[] profiles;	52	private final SpecificationVersion version;
		53	private final Profile[] profiles;
53		54
54		55
55	/**	56	/**
Lines 58-76 Link Here
58	* @param version of the specification e.g. 1.4	59	* @param version of the specification e.g. 1.4
59	*/	60	*/
60	public Specification (String name, SpecificationVersion version) {	61	public Specification (String name, SpecificationVersion version) {
61	this (name, version, null);	62	this (name, name, version, null);
62	}	63	}
63		64
64	/**	65	/**
65	* Creates new SDK Specification	66	* Creates new SDK Specification
66	* @param name of the specification e.g J2SE	67	* @param name of the specification e.g J2SE
67	* @param version of the specification e.g. 1.4	68	* @param version of the specification e.g. 1.4
68	* @param profiles of the Java SDK	69	* @param profiles of the Java SDK (may be null)
69	*/	70	*/
70	public Specification (String name, SpecificationVersion version, Profile[] profiles) {	71	public Specification (String name, SpecificationVersion version, Profile[] profiles) {
71	this.name = name;	72	this (name, name, version, profiles);
		73	}
		74
		75	/**
		76	* Creates a new SDK Specification
		77	* @param displayName The display name (i.e. Java ME vs J2ME, the official
		78	* specification name)
		79	* @param name The programmatic, official name of the specification
		80	* @param version The version
		81	* @since 1.14
		82	*/
		83	public Specification (String displayName, String name, SpecificationVersion version) {
		84	this (displayName, name, version, null);
		85	}
		86
		87	/**
		88	* Creates a new SDK Specification
		89	* @param displayName The display name (i.e. Java ME vs J2ME, the official
		90	* specification name)
		91	* @param name The programmatic, official name of the specification
		92	* @param version The version
		93	* @param profiles profiles of the Java SDK (may be null)
		94	* @since 1.14
		95	*/
		96	public Specification (String displayName, String name, SpecificationVersion version, Profile[] profiles) {
		97	this.name = displayName;
72	this.version = version;	98	this.version = version;
73	this.profiles = profiles;	99	this.profiles = profiles;
		100	this.displayName = name;
74	}	101	}
75		102
76	/**	103	/**
Lines 82-87 Link Here
82	}	109	}
83		110
84	/**	111	/**
		112	* Get the display name of the specification (e.g. "Java ME" for
		113	* j2me.
		114	*
		115	* @return
		116	* @since 1.14
		117	*/
		118	public final String getDisplayName() {
		119	return this.displayName;
		120	}
		121
		122	/**
85	* Returns the version of the Java specification e.g 1.4	123	* Returns the version of the Java specification e.g 1.4
86	* @return instance of SpecificationVersion	124	* @return instance of SpecificationVersion
87	*/	125	*/