Attachment #109625 for bug #243215

View | Details | Raw Unified | Return to bug 243215
Collapse All | Expand All




         <sequence minOccurs="1" maxOccurs="unbounded">
            <element ref="jadDescriptorsProvider"/>
         </sequence>
         <attribute name="vendorSpec">
            <annotation>
               <documentation>
                  Indicate if the JAD attributes is vendor specific, if so set this attribute to &quot;true&quot;, otherwise set to &quot;false&quot; or do not set.
               </documentation>
            </annotation>
            <simpleType>
               <restriction base="string">
                  <enumeration value="true">
                  </enumeration>
                  <enumeration value="false">
                  </enumeration>
               </restriction>
            </simpleType>
         </attribute>
         <attribute name="vendorSpecTester" type="string">
            <annotation>
               <documentation>
                  the required implementation class of the &lt;code&gt;org.eclipse.mtj.ui.jadEditor.IVendorSpecTester&lt;/code&gt; interface that will be used to test whether the device belongs to the vendor.
               </documentation>
               <appInfo>
                  <meta.attribute kind="java" basedOn=":org.eclipse.mtj.ui.jadEditor.IVendorSpecTester"/>
               </appInfo>
            </annotation>
         </attribute>
         <attribute name="pageID" type="string" use="required">
            <annotation>
               <documentation>




         <attribute name="class" type="string" use="required">
            <annotation>
               <documentation>
                  the page&apos;s implementation class, must public and extends &lt;code&gt;org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage&lt;/code&gt; with a zero-argument constructor.
the page&apos;s implementation class, must public and extends &lt;code&gt;org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage&lt;/code&gt; with a zero-argument constructor.

If you want to add a property page to the editor, the class  &lt;code&gt;org.eclipse.mtj.ui.jadEditor.JADPropertiesEditorPage&lt;/code&gt; provide a convient implementation, you may extend from it.
               </documentation>

               </appInfo>
            </annotation>
         </attribute>
         <attribute name="vendorSpec">
            <annotation>
               <documentation>
                  Indicate if the JAD attributes is vendor specific, if so set this attribute to &quot;true&quot;, otherwise set to &quot;false&quot; or do not set.
               </documentation>
            </annotation>
            <simpleType>
               <restriction base="string">
                  <enumeration value="true">
                  </enumeration>
                  <enumeration value="false">
                  </enumeration>
               </restriction>
            </simpleType>
         </attribute>
         <attribute name="vendorSpecTester" type="string">
            <annotation>
               <documentation>
                  the required implementation class of the &lt;code&gt;org.eclipse.mtj.ui.jadEditor.IVendorSpecTester&lt;/code&gt; interface that will be used to test whether the device belongs to the vendor.
               </documentation>
               <appInfo>
                  <meta.attribute kind="java" basedOn=":org.eclipse.mtj.ui.jadEditor.IVendorSpecTester"/>
               </appInfo>
            </annotation>
         </attribute>
         <attribute name="priority" type="string">
            <annotation>
               <documentation>

Lines 197-207 Link Here

(-)src/org/eclipse/mtj/ui/jadEditor/AbstractJADEditorPage.java (-7 / +7 lines)
197	String propertyName, Object data) {	197	String propertyName, Object data) {
198	//do nothing	198	//do nothing
199	}	199	}
200	/**	200	// /**
201	*	201	// *
202	* @return the relevant midlet suite device	202	// * @return the relevant midlet suite device
203	*/	203	// */
204	public IDevice getProjectDevice(){	204	// public IDevice getProjectDevice(){
205	return ((JADFormEditor)this.getEditor()).getProjectDevice();	205	// return ((JADFormEditor)this.getEditor()).getProjectDevice();
206	}	206	// }
207	}	207	}




/**
 * Copyright (c) 2003,2008 Sybase Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Gang Ma 		(Sybase) - Initial implementation
 *     
 */
package org.eclipse.mtj.ui.jadEditor;

import org.eclipse.mtj.core.model.device.IDevice;

/**
 * This interface should be implemented by vendors who want to add vendor 
 * specific things such as vendor specific JAD Editor pages,JAD attributes, 
 * the implementation will be used to test if the device user used meet 
 * the vendor's requirements 
 * @author gma
 *
 */
public interface IVendorSpecTester {
	/**
	 * this method is used to test whether the device user used is
	 * vendor specific
	 * @param device TODO
	 * @return
	 */
	public boolean isVendorSpec(IDevice device);
}

Lines 318-325 Link Here

(-)src/org/eclipse/mtj/ui/jadEditor/JADPropertiesEditorPage.java (-2 / +2 lines)
318	* @return	318	* @return
319	*/	319	*/
320	protected DescriptorPropertyDescription[] doGetDescriptors() {	320	protected DescriptorPropertyDescription[] doGetDescriptors() {
321	IDevice device = ((JADFormEditor)this.getEditor()).getProjectDevice();	321	// IDevice device = ((JADFormEditor)this.getEditor()).getProjectDevice();
322	return JADAttributesRegistry.getJADAttrDescriptorsByPage(getId(), device);	322	return JADAttributesRegistry.getJADAttrDescriptorsByPage(getId());
323	}	323	}
324		324
325		325

Lines 11-17 Link Here

(-)src/org/eclipse/mtj/ui/jadEditor/IJADDescriptorsProvider.java (-3 / +1 lines)
11	*/	11	*/
12	package org.eclipse.mtj.ui.jadEditor;	12	package org.eclipse.mtj.ui.jadEditor;
13		13
14	import org.eclipse.mtj.core.model.device.IDevice;
15	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;	14	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;
16		15
17	/**	16	/**
Lines 26-33 Link Here
26	public interface IJADDescriptorsProvider {	25	public interface IJADDescriptorsProvider {
27	/**	26	/**
28	*	27	*
29	* @param device TODO
30	* @return array off DescriptorPropertyDescription	28	* @return array off DescriptorPropertyDescription
31	*/	29	*/
32	DescriptorPropertyDescription[] getDescriptorPropertyDescriptions(IDevice device);	30	DescriptorPropertyDescription[] getDescriptorPropertyDescriptions();
33	}	31	}




import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage;
import org.eclipse.mtj.ui.jadEditor.IVendorSpecTester;

/**
 * class wrapped IConfigurationElement instance for jadEditorPages

 */
public class JADEditorPageConfigElement {
	private static final String JAD_EDITOR_PAGE_CLASS = "class";
//	private static final String VENDOR_SPEC_ATTR = "vendorSpec";
//	private static final String VENDOR_SPEC_TESTER = "vendorSpecTester";
	private static final String ATTR_PRIORITY = "priority";
	
	private IConfigurationElement element;

	
	private IConfigurationElement element;
//	private AbstractJADEditorPage page;
//	private IVendorSpecTester vendorSpecTester;
	
	public JADEditorPageConfigElement(
			IConfigurationElement jadAttrElement) {

		
	}
	
//	public IVendorSpecTester getVendorSpecTester() throws CoreException {
//		if (vendorSpecTester == null) {
//			vendorSpecTester = (IVendorSpecTester) element
//					.createExecutableExtension(VENDOR_SPEC_TESTER);
//		}
//		return vendorSpecTester;
//	}
//	
//	public boolean isVendorSpec(){
//		String value = element.getAttribute(VENDOR_SPEC_ATTR);
//		return value == null?false:"true".equalsIgnoreCase(value);
//	}
	
	/**
     * Return the priority of this element.




 *     Craig Setera (EclipseME) - Initial implementation
 *     Diego Sandin (Motorola)  - Refactoring package name to follow eclipse
 *                                standards
 *     Diego Sandin (Motorola)  - Added source view page
 *     Gang Ma      (Sybase)	- Refactoring the editor to support expansibility                    
 */
package org.eclipse.mtj.ui.internal.editor.jad.form;


     */
    protected void addPages() {
    	JADEditorPageConfigElement[] pageElements = getAllEditorPageConfigElements();
		
		// sort the page elements according to the page element's priority
		Arrays.sort(pageElements, new Comparator<JADEditorPageConfigElement>() {
			public int compare(JADEditorPageConfigElement o1,

		for (int i = 0; i < pageElements.length; i++) {
			try {
				JADEditorPageConfigElement element = pageElements[i];
//				if (element.isVendorSpec()
//						&& !element.getVendorSpecTester().isVendorSpec(
//								projectDevice))
//					continue;
				AbstractJADEditorPage page = element.getJADEditorPage();
				page.setEditor(this);
				addPage(page);


        
    }
//    /**
//	 * get the project's device
//	 * 
//	 * @return
//	 */
//    public IDevice getProjectDevice(){
//		IProject project = getJadFile().getProject();
//		IJavaProject javaProject = JavaCore.create(project);
//        IMidletSuiteProject midletProject = MidletSuiteFactory
//                .getMidletSuiteProject(javaProject);
//        
//        return midletProject.getDevice();
//	}
    private JADEditorPageConfigElement[] getAllEditorPageConfigElements(){
    	if(jadEditorPageConfigElements == null){
    		jadEditorPageConfigElements = readAllVendorSpecJADAttributes();

Lines 11-17 Link Here

(-)src/org/eclipse/mtj/ui/internal/editor/jad/form/OTAJADDescriptorsProvider.java (-2 / +1 lines)
11	*/	11	*/
12	package org.eclipse.mtj.ui.internal.editor.jad.form;	12	package org.eclipse.mtj.ui.internal.editor.jad.form;
13		13
14	import org.eclipse.mtj.core.model.device.IDevice;
15	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;	14	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;
16	import org.eclipse.mtj.core.model.jad.IJADConstants;	15	import org.eclipse.mtj.core.model.jad.IJADConstants;
17	import org.eclipse.mtj.ui.MTJUIStrings;	16	import org.eclipse.mtj.ui.MTJUIStrings;
Lines 51-57 Link Here
51		50
52		51
53		52
54	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions(IDevice device) {	53	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions() {
55	return OTA_DESCRIPTORS;	54	return OTA_DESCRIPTORS;
56	}	55	}
57		56




import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;
import org.eclipse.mtj.ui.internal.MTJUIPlugin;
import org.eclipse.mtj.ui.jadEditor.IJADDescriptorsProvider;
import org.eclipse.mtj.ui.jadEditor.IVendorSpecTester;

/**
 * Provide registry functionality for getting JAD attributes according to the
 * specify device and editor page.
 * 
 * @author gma
 * 

	 */
	public static final String JAD_ATTRIBUTE_EXTENSION = "jadAttributes";

//	/**
//	 * use to store JAD Attributes configElements for different devices.
//	 */
//	private static Map<IDevice, JADAttributesConfigElement[]> deviceVendorJADAttrMap = new HashMap<IDevice, JADAttributesConfigElement[]>();

	/**
	 * use to store generic JAD attributes(not vendor specific) for each page.

	 * @return the vendor specific JAD descriptors
	 */
	public static DescriptorPropertyDescription[] getJADAttrDescriptorsByPage(
			String pageID) {
		JADAttributesConfigElement[] relatedElements = getRelatedAttrElements(pageID);
		DescriptorPropertyDescription[] resultAttributes = getDescriptorsFromElements(relatedElements);
		return resultAttributes;
	}

	/**
	 * return the related jadAttributes configElements
	 */
	private static JADAttributesConfigElement[] getRelatedAttrElements(
			String pageID) {
		JADAttributesConfigElement[] genericElements = null;
		// JADAttributesConfigElement[] vendorSpecElements = null;
		// JADAttributesConfigElement[] resultElements = null;
		// get the page's generic JAD attribute descriptors
		if (!genericPageJADAttrMap.containsKey(pageID)) {
			genericPageJADAttrMap.put(pageID, getGenericElements(pageID));

		}
		genericElements = genericPageJADAttrMap.get(pageID);
		// get the page's vendor specific JAD attributes descriptors
		// vendorSpecElements = getVendorSpecElements(pageID,device);
		//		
		// resultElements = new
		// JADAttributesConfigElement[genericElements.length+vendorSpecElements.length];
		// System.arraycopy(genericElements, 0, resultElements, 0,
		// genericElements.length);
		// System.arraycopy(vendorSpecElements, 0, resultElements,
		// genericElements.length, vendorSpecElements.length);

		// return resultElements;
		return genericElements;
	}

//	/**
//	 * 
//	 * @param pageID
//	 *            the JAD Editor page's ID
//	 * @param device
//	 *            the device used
//	 * @return the vendor specific jadAttributes configElements for specific
//	 *         page
//	 */
//	private static JADAttributesConfigElement[] getVendorSpecElements(
//			String pageID, IDevice device) {
//		if (!deviceVendorJADAttrMap.containsKey(device)) {
//			JADAttributesConfigElement[] elements = getAllJADAttributeElements();
//			elements = filterElementsByDevice(elements, device);
//			deviceVendorJADAttrMap.put(device, elements);
//		}
//		JADAttributesConfigElement[] allSpecVendorElements = deviceVendorJADAttrMap
//				.get(device);
//
//		return filterElementsByPage(allSpecVendorElements, pageID);
//
//	}

	/**
	 * 
	 * @param pageID
	 *            the JAD Editor page's ID
	 * @return the generic jadAttributes configElements for specific page
	 * 		the generic jadAttributes configElements for specific page
	 */
	private static JADAttributesConfigElement[] getGenericElements(String pageID) {
		JADAttributesConfigElement[] elements = getAllJADAttributeElements();
		return filterElementsByPageAndVendorSpec(elements, pageID, true);

	}
	private static JADAttributesConfigElement[] filterElementsByDevice(JADAttributesConfigElement[] elements,IDevice device){
		return filterElements(elements,device,null,false);
	}

//	private static JADAttributesConfigElement[] filterElementsByDevice(
//			JADAttributesConfigElement[] elements, IDevice device) {
//		return filterElements(elements, device, null, false);
//	}
//
//	private static JADAttributesConfigElement[] filterElementsByPage(
//			JADAttributesConfigElement[] elements, String pageID) {
//		return filterElements(elements, null, pageID, false);
//	}

	private static JADAttributesConfigElement[] filterElementsByPageAndVendorSpec(
			JADAttributesConfigElement[] elements, String pageID,
			boolean excludeVendorSpec) {
		return filterElements(elements, null, pageID, excludeVendorSpec);
	}

	private static JADAttributesConfigElement[] filterElements(
			JADAttributesConfigElement[] elements, IDevice device,
			String pageID, boolean excludeVendorSpec) {
	
	private static JADAttributesConfigElement[] filterElements(JADAttributesConfigElement[] elements,IDevice device,String pageID,boolean excludeVendorSpec){
		ArrayList<JADAttributesConfigElement> resultDescriptorList = new ArrayList<JADAttributesConfigElement>();
		for (int i = 0; i < elements.length; i++) {
			JADAttributesConfigElement element = elements[i];

		for (int i = 0; i < elements.length; i++) {
			JADAttributesConfigElement element = elements[i];
			boolean satisfied = true;
			if (device != null)
				satisfied &= element.isVendorSpec()
						&& isDeviceMatchVendor(device, element);
			if (pageID != null)
				satisfied &= element.getAttributesShowPage().equalsIgnoreCase(
						pageID);
			if (excludeVendorSpec)
				satisfied &= !element.isVendorSpec();

			if (satisfied)
				resultDescriptorList.add(element);

		}
		return resultDescriptorList.toArray(new JADAttributesConfigElement[0]);
	}

	/**
	 * judge whether the configuration element is for the device
	 * 

	 */
	private static boolean isDeviceMatchVendor(IDevice device,
			JADAttributesConfigElement element) {
		// IVendorSpecTester vendorSpecTester = null;
		// try {
		// vendorSpecTester = element.getVendorSpecTester();
		// } catch (CoreException e) {
		// }
		// boolean matched = false;
		// if (vendorSpecTester != null) {
		// try {
		// matched = vendorSpecTester.isVendorSpec(device);
		// } catch (Exception e) {
		// matched = false;
		// MTJCorePlugin
		// .log(IStatus.WARNING,
		// "Errors happens while judging the device has vendor specifc JAD
		// attributes",
		// e);
		// }
		// }
		// return matched;
		return true;
	}

	/**
	 * 
	 * @param elements
	 *            config elements
	 * @param pageID
	 *            editor page ID
	 * @param device
	 *            target device
	 * 
	 * @return DescriptorPropertyDescription array
	 */
	private static DescriptorPropertyDescription[] getDescriptorsFromElements(
			JADAttributesConfigElement[] elements) {
		ArrayList<DescriptorPropertyDescription> descriptorList = new ArrayList<DescriptorPropertyDescription>();
		for (int i = 0; i < elements.length; i++) {
			JADAttributesConfigElement element = elements[i];

				IJADDescriptorsProvider provider = element
						.getJadDescriptorsProvider();
				DescriptorPropertyDescription[] descriptorArray = provider
						.getDescriptorPropertyDescriptions();
				descriptorList.addAll(Arrays.asList(descriptorArray));

			} catch (Exception e) {
				MTJCorePlugin
						.log(
								IStatus.WARNING,
								"Errors happens while judging the device has vendor specifc JAD attributes",
								e);
			}

			}
		}

		return descriptorList
				.toArray(new DescriptorPropertyDescription[descriptorList
						.size()]);
	}
	

	private static JADAttributesConfigElement[] getAllJADAttributeElements() {
		if (allJADAttrElements == null) {

	 * 
	 */
	static class JADAttributesConfigElement {
		private static final String VENDOR_SPEC_TESTER = "vendorSpecTester";
		private static final String JAD_DESCRIPTOR_PROVIDER_ELEMENT = "jadDescriptorsProvider";
		private static final String JAD_DESCRIPTOR_PROVIDER_CLASS = "class";
		private static final String JAD_ATTR_SHOW_PAGE = "pageID";

		private static final String VENDOR_SPEC_ATTR = "vendorSpec";

		private IConfigurationElement element;
		// private IVendorSpecTester vendorSpecTester;
		private IJADDescriptorsProvider jadDescriptorsProvider;

		public JADAttributesConfigElement(IConfigurationElement jadAttrElement) {

			this.element = jadAttrElement;
		}

		// public IVendorSpecTester getVendorSpecTester() throws CoreException {
		// if (vendorSpecTester == null) {
		// vendorSpecTester = (IVendorSpecTester) element
		// .createExecutableExtension(VENDOR_SPEC_TESTER);
		// }
		// return vendorSpecTester;
		// }

		public IJADDescriptorsProvider getJadDescriptorsProvider()
				throws CoreException {

		public String getAttributesShowPage() {
			return element.getAttribute(JAD_ATTR_SHOW_PAGE);
		}

		public boolean isVendorSpec() {
			String value = element.getAttribute(VENDOR_SPEC_ATTR);
			return value == null ? false : "true".equalsIgnoreCase(value);
		}

	}

Lines 14-20 Link Here

(-)src/org/eclipse/mtj/ui/internal/editor/jad/form/RequiredJADDesciptorsProvider.java (-2 / +1 lines)
14	import org.eclipse.core.runtime.CoreException;	14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.IStatus;	15	import org.eclipse.core.runtime.IStatus;
16	import org.eclipse.mtj.core.internal.MTJCorePlugin;	16	import org.eclipse.mtj.core.internal.MTJCorePlugin;
17	import org.eclipse.mtj.core.model.device.IDevice;
18	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;	17	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;
19	import org.eclipse.mtj.core.model.jad.IJADConstants;	18	import org.eclipse.mtj.core.model.jad.IJADConstants;
20	import org.eclipse.mtj.core.model.library.LibrarySpecification;	19	import org.eclipse.mtj.core.model.library.LibrarySpecification;
Lines 116-122 Link Here
116	return namesAndValues;	115	return namesAndValues;
117	}	116	}
118		117
119	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions(IDevice device) {	118	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions() {
120	return REQUIRED_DESCRIPTORS;	119	return REQUIRED_DESCRIPTORS;
121	}	120	}
122		121

Lines 11-17 Link Here

(-)src/org/eclipse/mtj/ui/internal/editor/jad/form/OptionalJADDescriptorsProvider.java (-2 / +1 lines)
11	*/	11	*/
12	package org.eclipse.mtj.ui.internal.editor.jad.form;	12	package org.eclipse.mtj.ui.internal.editor.jad.form;
13		13
14	import org.eclipse.mtj.core.model.device.IDevice;
15	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;	14	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;
16	import org.eclipse.mtj.core.model.jad.IJADConstants;	15	import org.eclipse.mtj.core.model.jad.IJADConstants;
17	import org.eclipse.mtj.ui.MTJUIStrings;	16	import org.eclipse.mtj.ui.MTJUIStrings;
Lines 62-68 Link Here
62		61
63		62
64		63
65	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions(IDevice device) {	64	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions() {
66	return OPTIONAL_DESCRIPTORS;	65	return OPTIONAL_DESCRIPTORS;
67	}	66	}
68		67

Lines 11-17 Link Here

(-)src/org/eclipse/mtj/toolkit/uei/jadEditor/MotoJADDesciptorsProvider.java (-3 / +1 lines)
11	*/	11	*/
12	package org.eclipse.mtj.toolkit.uei.jadEditor;	12	package org.eclipse.mtj.toolkit.uei.jadEditor;
13		13
14	import org.eclipse.mtj.core.model.device.IDevice;
15	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;	14	import org.eclipse.mtj.core.model.jad.DescriptorPropertyDescription;
16	import org.eclipse.mtj.ui.jadEditor.IJADDescriptorsProvider;	15	import org.eclipse.mtj.ui.jadEditor.IJADDescriptorsProvider;
17	import org.eclipse.mtj.ui.jadEditor.ListDescriptorPropertyDescription;	16	import org.eclipse.mtj.ui.jadEditor.ListDescriptorPropertyDescription;
Lines 59-66 Link Here
59		58
60	};	59	};
61		60
62	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions(	61	public DescriptorPropertyDescription[] getDescriptorPropertyDescriptions() {
63	IDevice device) {
64	return MOTO_JAD_DESCRIPTORS;	62	return MOTO_JAD_DESCRIPTORS;
65		63
66	}	64	}




/**
 * Copyright (c) 2003,2008 Sybase Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Gang Ma 		(Sybase) - Initial implementation
 *     
 */
package org.eclipse.mtj.toolkit.uei.jadEditor;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.eclipse.mtj.core.model.device.IDevice;
import org.eclipse.mtj.ui.jadEditor.IVendorSpecTester;
/**
 * simple implementation of IVendorSpecTester, used to test whether the device belongs
 * to motorola.
 * @author gma
 *
 */
public class MotoSpecTester implements IVendorSpecTester {

	private static final String MOTO_DEVICE_MATCHEXPRESSION = "moto*";
	
	public boolean isVendorSpec(IDevice device) {
		Pattern matchPattern = Pattern.compile(MOTO_DEVICE_MATCHEXPRESSION);
		Matcher matcher = matchPattern.matcher(device.getGroupName().toLowerCase());
		
		return matcher.find();
	}

}




import org.eclipse.ui.PlatformUI;

/**
 * Nokia S60 specific JAD editor page.
 * 
 * @author gma
 * 
 */
public class NokiaSpecPropertiesEditorPage extends JADPropertiesEditorPage {

	public static final String ID = "nokiaSpecific";
	public static final String TITLE = "Nokia specific";

	private static final String NOKIA_S40_UPDATE = "Nokia-Update";

	private static final String NOKIA_S60_CATEGORY = "Nokia-MIDlet-Category";
	private static final String NOKIA_S60_CATEGORY_LBL = "Nokia-MIDlet-Category:";

	private static final String NOKIA_S60_ORIGIN_DISPLAY_SIZE_LBL = "Nokia-MIDlet-Original-Display-Size:";
	private static final String NOKIA_S60_TARGET_DISPLAY_SIZE = "Nokia-MIDlet-Target-Display-Size";
	private static final String NOKIA_S60_TARGET_DISPLAY_SIZE_LBL = "Nokia-MIDlet-Target-Display-Size:";

	private static final String NOKIA_S40_UPDATE_LBL = "Nokia-Update:";

	private static final DescriptorPropertyDescription[] NOKIA_S60_JAD_DESCRIPTORS = new DescriptorPropertyDescription[] {

			new DescriptorPropertyDescription(NOKIA_S60_ORIGIN_DISPLAY_SIZE,
					NOKIA_S60_TARGET_DISPLAY_SIZE_LBL,
					DescriptorPropertyDescription.DATATYPE_STRING) };

	private static final DescriptorPropertyDescription[] NOKIA_S40_JAD_DESCRIPTORS = new DescriptorPropertyDescription[] { new DescriptorPropertyDescription(
			NOKIA_S40_UPDATE, NOKIA_S40_UPDATE_LBL,
			DescriptorPropertyDescription.DATATYPE_STRING)

			DescriptorPropertyDescription.DATATYPE_STRING)

	};

	public NokiaSpecPropertiesEditorPage() {
		super(ID, TITLE);
	}

	/**
	 * return array of DescriptorPropertyDescription
	 */
	@Override
	protected DescriptorPropertyDescription[] doGetDescriptors() {
		
		return NOKIA_S60_JAD_DESCRIPTORS;
    protected DescriptorPropertyDescription[] doGetDescriptors() {
		IDevice device = getProjectDevice();
		String toolKitName = device.getGroupName();
		if (toolKitName.toLowerCase().indexOf("series 40") != -1) {
			return NOKIA_S40_JAD_DESCRIPTORS;
		} else if (toolKitName.toLowerCase().indexOf("series 60") != -1) {
			return NOKIA_S60_JAD_DESCRIPTORS;
		}
		
	}
    
    /**
     * @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionTitle()
     */
    protected String getSectionTitle() {
        return "Nokia Specific Properties";
    }

	/**
	 * @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionTitle()
	 */
	protected String getSectionTitle() {
		return "Nokia Specific Properties";
	}

	/**
	 * @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionDescription()
	 */
	protected String getSectionDescription() {
		return "Nokia specific JAD properties can be specified on this page";
	}

	protected void addContextHelp(Composite c) {
		PlatformUI.getWorkbench().getHelpSystem().setHelp(c,
				"org.eclipse.mtj.ui.help_NokiaJADPropertiesEditorPage");
	}
}




/**
 * Copyright (c) 2003,2008 Sybase Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Gang Ma 		(Sybase) - Initial implementation
 *     
 */
package org.eclipse.mtj.toolkit.uei.jadEditor;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.eclipse.mtj.core.model.device.IDevice;
import org.eclipse.mtj.ui.jadEditor.IVendorSpecTester;
/**
 * simple implementation of IVendorSpecTester, used to test whether the device belongs
 * to Nokia.
 * @author gma
 *
 */
public class NokiaSpecTester implements IVendorSpecTester {

	private static final String Nokia_S40_MATCHEXPRESSION = "series 40*";
	private static final String Nokia_S60_MATCHEXPRESSION = "series 60*";
	
	public boolean isVendorSpec(IDevice device) {
		String toolkitName = device.getGroupName();
		Pattern s40MatchPattern = Pattern.compile(Nokia_S40_MATCHEXPRESSION);
		Pattern s60MatchPattern = Pattern.compile(Nokia_S60_MATCHEXPRESSION);
		Matcher matcher1 = s40MatchPattern.matcher(toolkitName.toLowerCase());
		Matcher matcher2 = s60MatchPattern.matcher(toolkitName.toLowerCase());
		
		return matcher1.find()||matcher2.find();
	}

}




   <extension
          point="org.eclipse.mtj.ui.jadEditorPages">
       <jadEditorPage
       		vendorSpec="true"
       		vendorSpecTester="org.eclipse.mtj.toolkit.uei.jadEditor.MotoSpecTester"
       		class="org.eclipse.mtj.toolkit.uei.jadEditor.MotoSpecPropertiesEditorPage"
       		/>
    </extension>

    <extension
          point="org.eclipse.mtj.ui.jadEditorPages">
       <jadEditorPage
       		vendorSpec="true"
       		vendorSpecTester="org.eclipse.mtj.toolkit.uei.jadEditor.NokiaSpecTester"
       		class="org.eclipse.mtj.toolkit.uei.jadEditor.NokiaSpecPropertiesEditorPage"
       		priority="70"
       		/>
    </extension>


Return to bug 243215

Lines 47-77 Link Here

(-)schema/jadAttributes.exsd (-25 lines)
47	<sequence minOccurs="1" maxOccurs="unbounded">	47	<sequence minOccurs="1" maxOccurs="unbounded">
48	<element ref="jadDescriptorsProvider"/>	48	<element ref="jadDescriptorsProvider"/>
49	</sequence>	49	</sequence>
50	<attribute name="vendorSpec">
51	<annotation>
52	<documentation>
53	Indicate if the JAD attributes is vendor specific, if so set this attribute to "true", otherwise set to "false" or do not set.
54	</documentation>
55	</annotation>
56	<simpleType>
57	<restriction base="string">
58	<enumeration value="true">
59	</enumeration>
60	<enumeration value="false">
61	</enumeration>
62	</restriction>
63	</simpleType>
64	</attribute>
65	<attribute name="vendorSpecTester" type="string">
66	<annotation>
67	<documentation>
68	the required implementation class of the <code>org.eclipse.mtj.ui.jadEditor.IVendorSpecTester</code> interface that will be used to test whether the device belongs to the vendor.
69	</documentation>
70	<appInfo>
71	<meta.attribute kind="java" basedOn=":org.eclipse.mtj.ui.jadEditor.IVendorSpecTester"/>
72	</appInfo>
73	</annotation>
74	</attribute>
75	<attribute name="pageID" type="string" use="required">	50	<attribute name="pageID" type="string" use="required">
76	<annotation>	51	<annotation>
77	<documentation>	52	<documentation>

Lines 47-54 Link Here

(-)schema/jadEditorPages.exsd (-27 / +1 lines)
47	<attribute name="class" type="string" use="required">	47	<attribute name="class" type="string" use="required">
48	<annotation>	48	<annotation>
49	<documentation>	49	<documentation>
50		50	the page's implementation class, must public and extends <code>org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage</code> with a zero-argument constructor.
51	the page's implementation class, must public and extends <code>org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage</code> with a zero-argument constructor.
52		51
53	If you want to add a property page to the editor, the class <code>org.eclipse.mtj.ui.jadEditor.JADPropertiesEditorPage</code> provide a convient implementation, you may extend from it.	52	If you want to add a property page to the editor, the class <code>org.eclipse.mtj.ui.jadEditor.JADPropertiesEditorPage</code> provide a convient implementation, you may extend from it.
54	</documentation>	53	</documentation>
Lines 57-87 Link Here
57	</appInfo>	56	</appInfo>
58	</annotation>	57	</annotation>
59	</attribute>	58	</attribute>
60	<attribute name="vendorSpec">
61	<annotation>
62	<documentation>
63	Indicate if the JAD attributes is vendor specific, if so set this attribute to "true", otherwise set to "false" or do not set.
64	</documentation>
65	</annotation>
66	<simpleType>
67	<restriction base="string">
68	<enumeration value="true">
69	</enumeration>
70	<enumeration value="false">
71	</enumeration>
72	</restriction>
73	</simpleType>
74	</attribute>
75	<attribute name="vendorSpecTester" type="string">
76	<annotation>
77	<documentation>
78	the required implementation class of the <code>org.eclipse.mtj.ui.jadEditor.IVendorSpecTester</code> interface that will be used to test whether the device belongs to the vendor.
79	</documentation>
80	<appInfo>
81	<meta.attribute kind="java" basedOn=":org.eclipse.mtj.ui.jadEditor.IVendorSpecTester"/>
82	</appInfo>
83	</annotation>
84	</attribute>
85	<attribute name="priority" type="string">	59	<attribute name="priority" type="string">
86	<annotation>	60	<annotation>
87	<documentation>	61	<documentation>

Lines 1-32 Link Here

(-)src/org/eclipse/mtj/ui/jadEditor/IVendorSpecTester.java (-32 lines)
1	/**
2	* Copyright (c) 2003,2008 Sybase Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Gang Ma (Sybase) - Initial implementation
10	*
11	*/
12	package org.eclipse.mtj.ui.jadEditor;
13
14	import org.eclipse.mtj.core.model.device.IDevice;
15
16	/**
17	* This interface should be implemented by vendors who want to add vendor
18	* specific things such as vendor specific JAD Editor pages,JAD attributes,
19	* the implementation will be used to test if the device user used meet
20	* the vendor's requirements
21	* @author gma
22	*
23	*/
24	public interface IVendorSpecTester {
25	/**
26	* this method is used to test whether the device user used is
27	* vendor specific
28	* @param device TODO
29	* @return
30	*/
31	public boolean isVendorSpec(IDevice device);
32	}

Lines 10-16 Link Here

(-)src/org/eclipse/mtj/ui/internal/editor/jad/form/JADFormEditor.java (-19 / +20 lines)
10	* Craig Setera (EclipseME) - Initial implementation	10	* Craig Setera (EclipseME) - Initial implementation
11	* Diego Sandin (Motorola) - Refactoring package name to follow eclipse	11	* Diego Sandin (Motorola) - Refactoring package name to follow eclipse
12	* standards	12	* standards
13	* Diego Sandin (Motorola) - Added source view page	13	* Diego Sandin (Motorola) - Added source view page
		14	* Gang Ma (Sybase) - Refactoring the editor to support expansibility
14	*/	15	*/
15	package org.eclipse.mtj.ui.internal.editor.jad.form;	16	package org.eclipse.mtj.ui.internal.editor.jad.form;
16		17
Lines 89-95 Link Here
89	*/	90	*/
90	protected void addPages() {	91	protected void addPages() {
91	JADEditorPageConfigElement[] pageElements = getAllEditorPageConfigElements();	92	JADEditorPageConfigElement[] pageElements = getAllEditorPageConfigElements();
92	IDevice projectDevice = getProjectDevice();	93
93	// sort the page elements according to the page element's priority	94	// sort the page elements according to the page element's priority
94	Arrays.sort(pageElements, new Comparator<JADEditorPageConfigElement>() {	95	Arrays.sort(pageElements, new Comparator<JADEditorPageConfigElement>() {
95	public int compare(JADEditorPageConfigElement o1,	96	public int compare(JADEditorPageConfigElement o1,
Lines 101-110 Link Here
101	for (int i = 0; i < pageElements.length; i++) {	102	for (int i = 0; i < pageElements.length; i++) {
102	try {	103	try {
103	JADEditorPageConfigElement element = pageElements[i];	104	JADEditorPageConfigElement element = pageElements[i];
104	if (element.isVendorSpec()	105	// if (element.isVendorSpec()
105	&& !element.getVendorSpecTester().isVendorSpec(	106	// && !element.getVendorSpecTester().isVendorSpec(
106	projectDevice))	107	// projectDevice))
107	continue;	108	// continue;
108	AbstractJADEditorPage page = element.getJADEditorPage();	109	AbstractJADEditorPage page = element.getJADEditorPage();
109	page.setEditor(this);	110	page.setEditor(this);
110	addPage(page);	111	addPage(page);
Lines 123-141 Link Here
123		124
124		125
125	}	126	}
126	/**	127	// /**
127	* get the project's device	128	// * get the project's device
128	*	129	// *
129	* @return	130	// * @return
130	*/	131	// */
131	public IDevice getProjectDevice(){	132	// public IDevice getProjectDevice(){
132	IProject project = getJadFile().getProject();	133	// IProject project = getJadFile().getProject();
133	IJavaProject javaProject = JavaCore.create(project);	134	// IJavaProject javaProject = JavaCore.create(project);
134	IMidletSuiteProject midletProject = MidletSuiteFactory	135	// IMidletSuiteProject midletProject = MidletSuiteFactory
135	.getMidletSuiteProject(javaProject);	136	// .getMidletSuiteProject(javaProject);
136		137	//
137	return midletProject.getDevice();	138	// return midletProject.getDevice();
138	}	139	// }
139	private JADEditorPageConfigElement[] getAllEditorPageConfigElements(){	140	private JADEditorPageConfigElement[] getAllEditorPageConfigElements(){
140	if(jadEditorPageConfigElements == null){	141	if(jadEditorPageConfigElements == null){
141	jadEditorPageConfigElements = readAllVendorSpecJADAttributes();	142	jadEditorPageConfigElements = readAllVendorSpecJADAttributes();

Lines 18-33 Link Here

(-)src/org/eclipse/mtj/toolkit/uei/jadEditor/NokiaSpecPropertiesEditorPage.java (-42 / +38 lines)
18	import org.eclipse.ui.PlatformUI;	18	import org.eclipse.ui.PlatformUI;
19		19
20	/**	20	/**
21	* Nokia specific JAD editor page.	21	* Nokia S60 specific JAD editor page.
		22	*
22	* @author gma	23	* @author gma
23	*	24	*
24	*/	25	*/
25	public class NokiaSpecPropertiesEditorPage extends JADPropertiesEditorPage {	26	public class NokiaSpecPropertiesEditorPage extends JADPropertiesEditorPage {
26		27
27	public static final String ID = "nokiaSpecific";	28	public static final String ID = "nokiaSpecific";
28	public static final String TITLE = "Nokia specific";	29	public static final String TITLE = "Nokia specific";
29		30
30	private static final String NOKIA_S40_UPDATE = "Nokia-Update";	31	private static final String NOKIA_S40_UPDATE = "Nokia-Update";
31		32
32	private static final String NOKIA_S60_CATEGORY = "Nokia-MIDlet-Category";	33	private static final String NOKIA_S60_CATEGORY = "Nokia-MIDlet-Category";
33	private static final String NOKIA_S60_CATEGORY_LBL = "Nokia-MIDlet-Category:";	34	private static final String NOKIA_S60_CATEGORY_LBL = "Nokia-MIDlet-Category:";
Lines 35-41 Link Here
35	private static final String NOKIA_S60_ORIGIN_DISPLAY_SIZE_LBL = "Nokia-MIDlet-Original-Display-Size:";	36	private static final String NOKIA_S60_ORIGIN_DISPLAY_SIZE_LBL = "Nokia-MIDlet-Original-Display-Size:";
36	private static final String NOKIA_S60_TARGET_DISPLAY_SIZE = "Nokia-MIDlet-Target-Display-Size";	37	private static final String NOKIA_S60_TARGET_DISPLAY_SIZE = "Nokia-MIDlet-Target-Display-Size";
37	private static final String NOKIA_S60_TARGET_DISPLAY_SIZE_LBL = "Nokia-MIDlet-Target-Display-Size:";	38	private static final String NOKIA_S60_TARGET_DISPLAY_SIZE_LBL = "Nokia-MIDlet-Target-Display-Size:";
38		39
39	private static final String NOKIA_S40_UPDATE_LBL = "Nokia-Update:";	40	private static final String NOKIA_S40_UPDATE_LBL = "Nokia-Update:";
40		41
41	private static final DescriptorPropertyDescription[] NOKIA_S60_JAD_DESCRIPTORS = new DescriptorPropertyDescription[] {	42	private static final DescriptorPropertyDescription[] NOKIA_S60_JAD_DESCRIPTORS = new DescriptorPropertyDescription[] {
Lines 48-54 Link Here
48	new DescriptorPropertyDescription(NOKIA_S60_ORIGIN_DISPLAY_SIZE,	49	new DescriptorPropertyDescription(NOKIA_S60_ORIGIN_DISPLAY_SIZE,
49	NOKIA_S60_TARGET_DISPLAY_SIZE_LBL,	50	NOKIA_S60_TARGET_DISPLAY_SIZE_LBL,
50	DescriptorPropertyDescription.DATATYPE_STRING) };	51	DescriptorPropertyDescription.DATATYPE_STRING) };
51		52
52	private static final DescriptorPropertyDescription[] NOKIA_S40_JAD_DESCRIPTORS = new DescriptorPropertyDescription[] { new DescriptorPropertyDescription(	53	private static final DescriptorPropertyDescription[] NOKIA_S40_JAD_DESCRIPTORS = new DescriptorPropertyDescription[] { new DescriptorPropertyDescription(
53	NOKIA_S40_UPDATE, NOKIA_S40_UPDATE_LBL,	54	NOKIA_S40_UPDATE, NOKIA_S40_UPDATE_LBL,
54	DescriptorPropertyDescription.DATATYPE_STRING)	55	DescriptorPropertyDescription.DATATYPE_STRING)
Lines 54-95 Link Here
54	DescriptorPropertyDescription.DATATYPE_STRING)	55	DescriptorPropertyDescription.DATATYPE_STRING)
55		56
56	};	57	};
57		58
		59	public NokiaSpecPropertiesEditorPage() {
		60	super(ID, TITLE);
		61	}
58		62
59	public NokiaSpecPropertiesEditorPage() {	63	/**
60	super(ID, TITLE);	64	* return array of DescriptorPropertyDescription
61	}	65	*/
62	/**	66	@Override
63	* return array of DescriptorPropertyDescription	67	protected DescriptorPropertyDescription[] doGetDescriptors() {
64	*/	68
65	@Override	69	return NOKIA_S60_JAD_DESCRIPTORS;
66	protected DescriptorPropertyDescription[] doGetDescriptors() {
67	IDevice device = getProjectDevice();
68	String toolKitName = device.getGroupName();
69	if (toolKitName.toLowerCase().indexOf("series 40") != -1) {
70	return NOKIA_S40_JAD_DESCRIPTORS;
71	} else if (toolKitName.toLowerCase().indexOf("series 60") != -1) {
72	return NOKIA_S60_JAD_DESCRIPTORS;
73	}
74		70
75	return new DescriptorPropertyDescription[0];}	71	}
76
77	/**
78	* @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionTitle()
79	*/
80	protected String getSectionTitle() {
81	return "Nokia Specific Properties";
82	}
83		72
84	/**	73	/**
85	* @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionDescription()	74	* @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionTitle()
86	*/	75	*/
87	protected String getSectionDescription() {	76	protected String getSectionTitle() {
88	return "Nokia specific JAD properties can be specified on this page";	77	return "Nokia Specific Properties";
89	}	78	}
90		79
91	protected void addContextHelp(Composite c) {	80	/**
92	PlatformUI.getWorkbench().getHelpSystem().setHelp(c,	81	* @see org.eclipse.mtj.ui.jadEditor.AbstractJADEditorPage#getSectionDescription()
93	"org.eclipse.mtj.ui.help_NokiaJADPropertiesEditorPage");	82	*/
94	}	83	protected String getSectionDescription() {
		84	return "Nokia specific JAD properties can be specified on this page";
		85	}
		86
		87	protected void addContextHelp(Composite c) {
		88	PlatformUI.getWorkbench().getHelpSystem().setHelp(c,
		89	"org.eclipse.mtj.ui.help_NokiaJADPropertiesEditorPage");
		90	}
95	}	91	}

Lines 4-11 Link Here

(-)plugin.xml (-4 / +1 lines)
4	<extension	4	<extension
5	point="org.eclipse.mtj.ui.jadEditorPages">	5	point="org.eclipse.mtj.ui.jadEditorPages">
6	<jadEditorPage	6	<jadEditorPage
7	vendorSpec="true"
8	vendorSpecTester="org.eclipse.mtj.toolkit.uei.jadEditor.MotoSpecTester"
9	class="org.eclipse.mtj.toolkit.uei.jadEditor.MotoSpecPropertiesEditorPage"	7	class="org.eclipse.mtj.toolkit.uei.jadEditor.MotoSpecPropertiesEditorPage"
10	/>	8	/>
11	</extension>	9	</extension>
Lines 21-29 Link Here
21	<extension	19	<extension
22	point="org.eclipse.mtj.ui.jadEditorPages">	20	point="org.eclipse.mtj.ui.jadEditorPages">
23	<jadEditorPage	21	<jadEditorPage
24	vendorSpec="true"
25	vendorSpecTester="org.eclipse.mtj.toolkit.uei.jadEditor.NokiaSpecTester"
26	class="org.eclipse.mtj.toolkit.uei.jadEditor.NokiaSpecPropertiesEditorPage"	22	class="org.eclipse.mtj.toolkit.uei.jadEditor.NokiaSpecPropertiesEditorPage"
		23	priority="70"
27	/>	24	/>
28	</extension>	25	</extension>
29		26