Attachment #117021 for bug #251794

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




#Tue Nov 04 14:19:07 PST 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

Lines 15-28 Link Here

(-)src/org/eclipse/jst/pagedesigner/itemcreation/customizer/CustomizationDataImpl.java (-33 / +40 lines)
15	*	15	*
16	*/	16	*/
17		17
18	public class CustomizationDataImpl implements ICustomizationData, IAdaptable	18	public class CustomizationDataImpl implements IWritableCustomizationData, IAdaptable
19	{	19	{
20	private TagIdentifier tagIdentifier;	20	private TagIdentifier tagIdentifier;
21	private AttributeData _attrs;	21	private AttributeData _attrs;
22	private ChildrenData childrenData;	22	private ChildrenData childrenData;
23	private ParentData parentData;	23	private ParentData parentData;
		24
24		25
25		26	/**
		27	* Constructor.
		28	*
		29	* @param target
		30	* Tag identifier for the tag whose customization data this is
		31	*
		32	*/
26	public CustomizationDataImpl(final TagIdentifier target)	33	public CustomizationDataImpl(final TagIdentifier target)
27	{	34	{
28	tagIdentifier = target;	35	tagIdentifier = target;
Lines 32-37 Link Here
32	}	39	}
33		40
34		41
		42	/* (non-Javadoc)
		43	* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
		44	*/
35	public Object getAdapter(Class adapter)	45	public Object getAdapter(Class adapter)
36	{	46	{
37	if (ICustomizationData.class.equals(adapter))	47	if (ICustomizationData.class.equals(adapter))
Lines 48-59 Link Here
48	//------------------------------------------------------------	58	//------------------------------------------------------------
49		59
50		60
51	/*	61	/* (non-Javadoc)
52	* (non-Javadoc)	62	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData#getTagIdentifier()
53	*
54	* @see
55	* org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData
56	* #getTagIdentifier()
57	*/	63	*/
58	public TagIdentifier getTagIdentifier()	64	public TagIdentifier getTagIdentifier()
59	{	65	{
Lines 61-66 Link Here
61	}	67	}
62		68
63		69
		70	/* (non-Javadoc)
		71	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#setTagIdentifier(org.eclipse.jst.jsf.common.dom.TagIdentifier)
		72	*/
64	public void setTagIdentifier(TagIdentifier tagId)	73	public void setTagIdentifier(TagIdentifier tagId)
65	{	74	{
66	this.tagIdentifier = tagId;	75	this.tagIdentifier = tagId;
Lines 72-83 Link Here
72	//------------------------------------------------------------	81	//------------------------------------------------------------
73		82
74		83
75	/*	84	/* (non-Javadoc)
76	* (non-Javadoc)	85	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData#getAttributeData()
77	*
78	* @see
79	* org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData
80	* #getAttributeData()
81	*/	86	*/
82	public final AttributeData getAttributeData()	87	public final AttributeData getAttributeData()
83	{	88	{
Lines 85-96 Link Here
85	}	90	}
86		91
87		92
		93	/* (non-Javadoc)
		94	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#setAttributes(org.eclipse.jst.pagedesigner.itemcreation.customizer.AttributeData)
		95	*/
88	public void setAttributes(AttributeData attrs)	96	public void setAttributes(AttributeData attrs)
89	{	97	{
90	_attrs = attrs;	98	_attrs = attrs;
91	}	99	}
92		100
93		101
		102	/* (non-Javadoc)
		103	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#addAttribute(java.lang.String, java.lang.String)
		104	*/
94	public void addAttribute(String attributeName, String attributeValue)	105	public void addAttribute(String attributeName, String attributeValue)
95	{	106	{
96	getAttributeData().addAttribute(attributeName, attributeValue);	107	getAttributeData().addAttribute(attributeName, attributeValue);
Lines 102-113 Link Here
102	//------------------------------------------------------------	113	//------------------------------------------------------------
103		114
104		115
105	/*	116	/* (non-Javadoc)
106	* (non-Javadoc)	117	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData#getChildrenData()
107	*
108	* @see
109	* org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData
110	* #getChildrenData()
111	*/	118	*/
112	public final ChildrenData getChildrenData()	119	public final ChildrenData getChildrenData()
113	{	120	{
Lines 115-126 Link Here
115	}	122	}
116		123
117		124
		125	/* (non-Javadoc)
		126	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#setChildrenData(org.eclipse.jst.pagedesigner.itemcreation.customizer.ChildrenData)
		127	*/
118	public void setChildrenData(ChildrenData data)	128	public void setChildrenData(ChildrenData data)
119	{	129	{
120	childrenData = data;	130	childrenData = data;
121	}	131	}
122		132
123		133
		134	/* (non-Javadoc)
		135	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#addChildrenData(org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData)
		136	*/
124	public void addChildrenData (ICustomizationData childrenData)	137	public void addChildrenData (ICustomizationData childrenData)
125	{	138	{
126	getChildrenData().add(childrenData);	139	getChildrenData().add(childrenData);
Lines 132-143 Link Here
132	//------------------------------------------------------------	145	//------------------------------------------------------------
133		146
134		147
135	/*	148	/* (non-Javadoc)
136	* (non-Javadoc)	149	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData#getParentData()
137	*
138	* @see
139	* org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData
140	* #getParentData()
141	*/	150	*/
142	public final ParentData getParentData()	151	public final ParentData getParentData()
143	{	152	{
Lines 145-163 Link Here
145	}	154	}
146		155
147		156
		157	/* (non-Javadoc)
		158	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#setParentData(org.eclipse.jst.pagedesigner.itemcreation.customizer.ParentData)
		159	*/
148	public void setParentData(ParentData parentData)	160	public void setParentData(ParentData parentData)
149	{	161	{
150	this.parentData = parentData;	162	this.parentData = parentData;
151	}	163	}
152		164
153		165
154	/**	166	/* (non-Javadoc)
155	* Attaches a parent to a tag (The customization data for a parent is added	167	* @see org.eclipse.jst.pagedesigner.itemcreation.customizer.IWritableCustomizationData#addParentData(org.eclipse.jst.pagedesigner.itemcreation.customizer.ICustomizationData)
156	* to the tag's customization data). The oldest parent (outermost container
157	* tag) should be attached (added) first.
158	*
159	* @param parentData
160	* Parent customization data
161	*/	168	*/
162	public void addParentData (ICustomizationData parentData)	169	public void addParentData (ICustomizationData parentData)
163	{	170	{

Lines 16-27 Link Here

(-)src/org/eclipse/jst/pagedesigner/itemcreation/customizer/ChildrenData.java (+12 lines)
16	private List<ICustomizationData> childList;	16	private List<ICustomizationData> childList;
17		17
18		18
		19	/**
		20	* Default constructor
		21	*
		22	*/
19	public ChildrenData()	23	public ChildrenData()
20	{	24	{
21	this.childList = new ArrayList<ICustomizationData>();	25	this.childList = new ArrayList<ICustomizationData>();
22	}	26	}
23		27
24		28
		29	/**
		30	* Constructor to initialize a ChildrenData object with a list of
		31	* customization data for the child tags
		32	*
		33	* @param childList
		34	* List of customization data objects for child tags
		35	*
		36	*/
25	public ChildrenData(List<ICustomizationData> childList)	37	public ChildrenData(List<ICustomizationData> childList)
26	{	38	{
27	this.childList = childList;	39	this.childList = childList;

Lines 4-37 Link Here

(-)src/org/eclipse/jst/pagedesigner/itemcreation/customizer/ParentData.java (-2 / +28 lines)
4	import java.util.List;	4	import java.util.List;
5		5
6	/**	6	/**
7	* Class to represent parent tag customization data for a tag	7	* Class to represent parent tag customization data for a tag. This information
		8	* is stored as a List of ICustomizationData objects, where each
		9	* ICustomizationData object belongs to one parent tag. (The outermost parent tag
		10	* (oldest ancestor) should be added first to this list)
8	*	11	*
9	* @author Debajit Adhikary	12	* @author Debajit Adhikary
10	*	13	*
11	*/	14	*/
12	public class ParentData	15	public class ParentData
13	{	16	{
14	private List<ICustomizationData> parentList;	17	/**
		18	* List of ICustomizationData objects to store parent tag information. The
		19	* outermost parent tag should be added first.
		20	*/
		21	private List<ICustomizationData> parentList;
15		22
16		23
		24	/**
		25	* Default constructor
		26	*
		27	*/
17	public ParentData ()	28	public ParentData ()
18	{	29	{
19	parentList = new ArrayList<ICustomizationData>();	30	parentList = new ArrayList<ICustomizationData>();
20	}	31	}
21		32
22		33
		34	/**
		35	* @param parentData
		36	* Customization data to add for the parent tag
		37	*
		38	*/
23	public void add (ICustomizationData parentData)	39	public void add (ICustomizationData parentData)
24	{	40	{
25	this.parentList.add(parentData);	41	this.parentList.add(parentData);
26	}	42	}
27		43
28		44
		45	/**
		46	* Returns the Parent customization data as a list of customization objects.
		47	*
		48	* @return The parent customization data
		49	*
		50	*/
29	public List<ICustomizationData> getParentCustomizationData ()	51	public List<ICustomizationData> getParentCustomizationData ()
30	{	52	{
31	return parentList;	53	return parentList;
32	}	54	}
33		55
34		56
		57	/**
		58	* @param parentList List of ICustomizationData to set it to
		59	*
		60	*/
35	public void setParentCustomizationData (List<ICustomizationData> parentList)	61	public void setParentCustomizationData (List<ICustomizationData> parentList)
36	{	62	{
37	this.parentList = parentList;	63	this.parentList = parentList;

Lines 4-14 Link Here

(-)src/org/eclipse/jst/pagedesigner/itemcreation/command/UserCustomizedContainerCreationCommand.java (+31 lines)
4	import org.eclipse.jst.jsf.common.dom.TagIdentifier;	4	import org.eclipse.jst.jsf.common.dom.TagIdentifier;
5	import org.eclipse.jst.pagedesigner.dom.IDOMPosition;	5	import org.eclipse.jst.pagedesigner.dom.IDOMPosition;
6		6
		7	/**
		8	* Tag container creation command for tags dropped on to the WPE by the user
		9	*
		10	* @see TagContainerCreationCommand
		11	*
		12	* @author Debajit Adhikary
		13	*
		14	*/
7	public class UserCustomizedContainerCreationCommand extends	15	public class UserCustomizedContainerCreationCommand extends
8	TagContainerCreationCommand	16	TagContainerCreationCommand
9	{	17	{
		18	/**
		19	* Customization data for tag dropped
		20	*
		21	* @see ICustomizationData
		22	* @see IAdaptable
		23	*/
10	private final IAdaptable _data;	24	private final IAdaptable _data;
		25
11		26
		27	/**
		28	* @param domPosition
		29	* Position in the DOM where the tag is to be inserted
		30	* @param containerTag
		31	* Container tag
		32	* @param tagBeingCreated
		33	* The tag which was dropped
		34	* @param data
		35	* Customization data for the tag dropped
		36	*
		37	* @see TagContainerCreationCommand#TagContainerCreationCommand(IDOMPosition, TagIdentifier, TagIdentifier)
		38	*/
12	public UserCustomizedContainerCreationCommand(IDOMPosition domPosition,	39	public UserCustomizedContainerCreationCommand(IDOMPosition domPosition,
13	TagIdentifier containerTag, TagIdentifier tagBeingCreated, IAdaptable data)	40	TagIdentifier containerTag, TagIdentifier tagBeingCreated, IAdaptable data)
14	{	41	{
Lines 16-21 Link Here
16	_data = data;	43	_data = data;
17	}	44	}
18		45
		46
		47	/* (non-Javadoc)
		48	* @see org.eclipse.jst.pagedesigner.itemcreation.command.TagContainerCreationCommand#getContainerCustomizationData()
		49	*/
19	@Override	50	@Override
20	protected IAdaptable getContainerCustomizationData()	51	protected IAdaptable getContainerCustomizationData()
21	{	52	{

Lines 66-71 Link Here

(-)src/org/eclipse/jst/pagedesigner/itemcreation/command/ElementCustomizationCommand.java (+16 lines)
66	_creationData = creationData;	66	_creationData = creationData;
67	}	67	}
68		68
		69
		70	/* (non-Javadoc)
		71	* @see org.eclipse.jst.pagedesigner.itemcreation.internal.AbstractCreationCommand#execute()
		72	*/
69	@Override	73	@Override
70	public void execute()	74	public void execute()
71	{	75	{
Lines 73-78 Link Here
73	applyAttributeCustomization();	77	applyAttributeCustomization();
74	}	78	}
75		79
		80
		81	/* (non-Javadoc)
		82	* @see org.eclipse.jst.pagedesigner.itemcreation.internal.AbstractCreationCommand#prepare()
		83	*/
76	@Override	84	@Override
77	protected boolean prepare()	85	protected boolean prepare()
78	{	86	{
Lines 159-170 Link Here
159	}	167	}
160	}	168	}
161		169
		170
		171	/* (non-Javadoc)
		172	* @see org.eclipse.jst.pagedesigner.itemcreation.internal.AbstractCreationCommand#chain(org.eclipse.emf.common.command.Command)
		173	*/
162	@Override	174	@Override
163	public final Command chain(final Command command)	175	public final Command chain(final Command command)
164	{	176	{
165	return super.chain(command);	177	return super.chain(command);
166	}	178	}
167		179
		180
		181	/* (non-Javadoc)
		182	* @see org.eclipse.jst.pagedesigner.itemcreation.internal.AbstractCreationCommand#getResult()
		183	*/
168	@Override	184	@Override
169	public final Collection<Element> getResult()	185	public final Collection<Element> getResult()
170	{	186	{

Return to bug 251794

Lines 1-4 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-7 / +8 lines)
1	#Fri Dec 14 11:18:54 PST 2007	1	#Tue Nov 04 14:19:07 PST 2008
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
Lines 28-44 Link Here
28	org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning	28	org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
29	org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore	29	org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
30	org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error	30	org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
31	org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled	31	org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
32	org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled	32	org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
33	org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled	33	org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
34	org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected	34	org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
35	org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning	35	org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
36	org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning	36	org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
37	org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore	37	org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
38	org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning	38	org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error
39	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled	39	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
40	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected	40	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
41	org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning	41	org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
		42	org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
42	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled	43	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
43	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected	44	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
44	org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore	45	org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore