Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 333886
Collapse All | Expand All

(-).project (-1 / +1 lines)
Lines 1-6 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<projectDescription>
2
<projectDescription>
3
	<name>org.eclipse.ui.views.properties.tabbed</name>
3
	<name>org.eclipse.rap.ui.views.properties.tabbed</name>
4
	<comment></comment>
4
	<comment></comment>
5
	<projects>
5
	<projects>
6
	</projects>
6
	</projects>
(-)plugin.xml (-4 / +4 lines)
Lines 1-9 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<?eclipse version="3.0"?>
2
<?eclipse version="3.2"?>
3
<plugin>
3
<plugin>
4
4
5
   <extension-point id="propertyContributor" name="%ExtPoint.propertyContributor" schema="schema/propertyContributor.exsd"/>
5
   <extension-point id="org.eclipse.ui.views.properties.tabbed.propertyContributor" name="%ExtPoint.propertyContributor" schema="schema/propertyContributor.exsd"/>
6
   <extension-point id="propertyTabs" name="%ExtPoint.propertyTabs" schema="schema/propertyTabs.exsd"/>
6
   <extension-point id="org.eclipse.ui.views.properties.tabbed.propertyTabs" name="%ExtPoint.propertyTabs" schema="schema/propertyTabs.exsd"/>
7
   <extension-point id="propertySections" name="%ExtPoint.propertySections" schema="schema/propertySections.exsd"/>
7
   <extension-point id="org.eclipse.ui.views.properties.tabbed.propertySections" name="%ExtPoint.propertySections" schema="schema/propertySections.exsd"/>
8
8
9
</plugin>
9
</plugin>
(-).settings/org.eclipse.jdt.ui.prefs (-1 / +54 lines)
Lines 1-5 Link Here
1
#Wed Jul 02 15:17:10 EDT 2008
1
#Fri Jan 07 09:15:54 CET 2011
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
3
internal.default.compliance=user
4
internal.default.compliance=user
4
org.eclipse.jdt.ui.javadoc=true
5
org.eclipse.jdt.ui.javadoc=true
5
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     IBM Corporation - initial API and implementation\r\n ******************************************************************************/\r\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @since 3.5\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template></templates>
6
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     IBM Corporation - initial API and implementation\r\n ******************************************************************************/\r\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @since 3.5\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template></templates>
7
sp_cleanup.add_default_serial_version_id=true
8
sp_cleanup.add_generated_serial_version_id=false
9
sp_cleanup.add_missing_annotations=true
10
sp_cleanup.add_missing_deprecated_annotations=true
11
sp_cleanup.add_missing_methods=false
12
sp_cleanup.add_missing_nls_tags=false
13
sp_cleanup.add_missing_override_annotations=true
14
sp_cleanup.add_missing_override_annotations_interface_methods=false
15
sp_cleanup.add_serial_version_id=false
16
sp_cleanup.always_use_blocks=true
17
sp_cleanup.always_use_parentheses_in_expressions=true
18
sp_cleanup.always_use_this_for_non_static_field_access=false
19
sp_cleanup.always_use_this_for_non_static_method_access=false
20
sp_cleanup.convert_to_enhanced_for_loop=false
21
sp_cleanup.correct_indentation=false
22
sp_cleanup.format_source_code=true
23
sp_cleanup.format_source_code_changes_only=false
24
sp_cleanup.make_local_variable_final=true
25
sp_cleanup.make_parameters_final=true
26
sp_cleanup.make_private_fields_final=true
27
sp_cleanup.make_type_abstract_if_missing_method=false
28
sp_cleanup.make_variable_declarations_final=true
29
sp_cleanup.never_use_blocks=false
30
sp_cleanup.never_use_parentheses_in_expressions=false
31
sp_cleanup.on_save_use_additional_actions=true
32
sp_cleanup.organize_imports=true
33
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
34
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
35
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
36
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
37
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
38
sp_cleanup.remove_private_constructors=true
39
sp_cleanup.remove_trailing_whitespaces=true
40
sp_cleanup.remove_trailing_whitespaces_all=true
41
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
42
sp_cleanup.remove_unnecessary_casts=true
43
sp_cleanup.remove_unnecessary_nls_tags=true
44
sp_cleanup.remove_unused_imports=true
45
sp_cleanup.remove_unused_local_variables=false
46
sp_cleanup.remove_unused_private_fields=true
47
sp_cleanup.remove_unused_private_members=false
48
sp_cleanup.remove_unused_private_methods=true
49
sp_cleanup.remove_unused_private_types=true
50
sp_cleanup.sort_members=true
51
sp_cleanup.sort_members_all=false
52
sp_cleanup.use_blocks=true
53
sp_cleanup.use_blocks_only_for_return_and_throw=false
54
sp_cleanup.use_parentheses_in_expressions=true
55
sp_cleanup.use_this_for_non_static_field_access=true
56
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
57
sp_cleanup.use_this_for_non_static_method_access=true
58
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
(-)META-INF/MANIFEST.MF (-6 / +6 lines)
Lines 1-8 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %Plugin.name
3
Bundle-Name: %Plugin.name
4
Bundle-SymbolicName: org.eclipse.ui.views.properties.tabbed;singleton:=true
4
Bundle-SymbolicName: org.eclipse.rap.ui.views.properties.tabbed;singleton:=true
5
Bundle-Version: 3.5.200.qualifier
5
Bundle-Version: 1.4.0.qualifier
6
Bundle-Activator: org.eclipse.ui.internal.views.properties.tabbed.TabbedPropertyViewPlugin
6
Bundle-Activator: org.eclipse.ui.internal.views.properties.tabbed.TabbedPropertyViewPlugin
7
Bundle-Vendor: %Plugin.providerName
7
Bundle-Vendor: %Plugin.providerName
8
Bundle-Localization: plugin
8
Bundle-Localization: plugin
Lines 10-19 Link Here
10
 org.eclipse.ui.internal.views.properties.tabbed.l10n;x-internal:=true,
10
 org.eclipse.ui.internal.views.properties.tabbed.l10n;x-internal:=true,
11
 org.eclipse.ui.internal.views.properties.tabbed.view;x-internal:=true,
11
 org.eclipse.ui.internal.views.properties.tabbed.view;x-internal:=true,
12
 org.eclipse.ui.views.properties.tabbed
12
 org.eclipse.ui.views.properties.tabbed
13
Require-Bundle: org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
13
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
14
 org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
14
 org.eclipse.rap.ui;bundle-version="1.4.0",
15
 org.eclipse.ui;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
15
 org.eclipse.rap.ui.forms;bundle-version="1.4.0",
16
 org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
16
 org.eclipse.rap.ui.views;bundle-version="1.4.0"
17
Import-Package: com.ibm.icu.text
17
Import-Package: com.ibm.icu.text
18
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
18
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
19
 J2SE-1.3
19
 J2SE-1.3
(-)src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyList.java (-136 / +131 lines)
Lines 4-10 Link Here
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 * 
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
9
 *     IBM Corporation - initial API and implementation
10
 *     Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 259553
10
 *     Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 259553
Lines 13-36 Link Here
13
13
14
import org.eclipse.jface.resource.JFaceResources;
14
import org.eclipse.jface.resource.JFaceResources;
15
import org.eclipse.swt.SWT;
15
import org.eclipse.swt.SWT;
16
import org.eclipse.swt.accessibility.ACC;
17
import org.eclipse.swt.accessibility.Accessible;
18
import org.eclipse.swt.accessibility.AccessibleAdapter;
19
import org.eclipse.swt.accessibility.AccessibleControlAdapter;
20
import org.eclipse.swt.accessibility.AccessibleControlEvent;
21
import org.eclipse.swt.accessibility.AccessibleEvent;
22
import org.eclipse.swt.events.ControlAdapter;
16
import org.eclipse.swt.events.ControlAdapter;
23
import org.eclipse.swt.events.ControlEvent;
17
import org.eclipse.swt.events.ControlEvent;
24
import org.eclipse.swt.events.FocusEvent;
18
import org.eclipse.swt.events.FocusEvent;
25
import org.eclipse.swt.events.FocusListener;
19
import org.eclipse.swt.events.FocusListener;
26
import org.eclipse.swt.events.MouseAdapter;
20
import org.eclipse.swt.events.MouseAdapter;
27
import org.eclipse.swt.events.MouseEvent;
21
import org.eclipse.swt.events.MouseEvent;
28
import org.eclipse.swt.events.MouseMoveListener;
29
import org.eclipse.swt.events.MouseTrackAdapter;
30
import org.eclipse.swt.events.PaintEvent;
22
import org.eclipse.swt.events.PaintEvent;
31
import org.eclipse.swt.events.PaintListener;
23
import org.eclipse.swt.events.PaintListener;
32
import org.eclipse.swt.events.TraverseEvent;
33
import org.eclipse.swt.events.TraverseListener;
34
import org.eclipse.swt.graphics.Color;
24
import org.eclipse.swt.graphics.Color;
35
import org.eclipse.swt.graphics.FontMetrics;
25
import org.eclipse.swt.graphics.FontMetrics;
36
import org.eclipse.swt.graphics.GC;
26
import org.eclipse.swt.graphics.GC;
Lines 44-50 Link Here
44
import org.eclipse.swt.widgets.Composite;
34
import org.eclipse.swt.widgets.Composite;
45
import org.eclipse.swt.widgets.Display;
35
import org.eclipse.swt.widgets.Display;
46
import org.eclipse.swt.widgets.Event;
36
import org.eclipse.swt.widgets.Event;
47
import org.eclipse.swt.widgets.Listener;
48
import org.eclipse.ui.forms.FormColors;
37
import org.eclipse.ui.forms.FormColors;
49
import org.eclipse.ui.internal.views.properties.tabbed.l10n.TabbedPropertyMessages;
38
import org.eclipse.ui.internal.views.properties.tabbed.l10n.TabbedPropertyMessages;
50
import org.eclipse.ui.views.properties.tabbed.ITabItem;
39
import org.eclipse.ui.views.properties.tabbed.ITabItem;
Lines 53-59 Link Here
53
42
54
/**
43
/**
55
 * Shows the list of tabs in the tabbed property sheet page.
44
 * Shows the list of tabs in the tabbed property sheet page.
56
 * 
45
 *
57
 * @author Anthony Hunter
46
 * @author Anthony Hunter
58
 */
47
 */
59
public class TabbedPropertyList
48
public class TabbedPropertyList
Lines 128-134 Link Here
128
117
129
		/**
118
		/**
130
		 * Constructor for ListElement.
119
		 * Constructor for ListElement.
131
		 * 
120
		 *
132
		 * @param parent
121
		 * @param parent
133
		 *            the parent Composite.
122
		 *            the parent Composite.
134
		 * @param tab
123
		 * @param tab
Lines 168-194 Link Here
168
					}
157
					}
169
				}
158
				}
170
			});
159
			});
171
			addMouseMoveListener(new MouseMoveListener() {
160
			// RAP does not support this yet
172
161
//			addMouseMoveListener(new MouseMoveListener() {
173
				public void mouseMove(MouseEvent e) {
162
//
174
					if (!hover) {
163
//				public void mouseMove(MouseEvent e) {
175
						hover = true;
164
//					if (!hover) {
176
						redraw();
165
//						hover = true;
177
					}
166
//						redraw();
178
				}
167
//					}
179
			});
168
//				}
180
			addMouseTrackListener(new MouseTrackAdapter() {
169
//			});
181
170
//			addMouseTrackListener(new MouseTrackAdapter() {
182
				public void mouseExit(MouseEvent e) {
171
//
183
					hover = false;
172
//				public void mouseExit(MouseEvent e) {
184
					redraw();
173
//					hover = false;
185
				}
174
//					redraw();
186
			});
175
//				}
176
//			});
177
			// /RAP
187
		}
178
		}
188
179
189
		/**
180
		/**
190
		 * Set selected value for this element.
181
		 * Set selected value for this element.
191
		 * 
182
		 *
192
		 * @param selected
183
		 * @param selected
193
		 *            the selected value.
184
		 *            the selected value.
194
		 */
185
		 */
Lines 199-205 Link Here
199
190
200
		/**
191
		/**
201
		 * Paint the element.
192
		 * Paint the element.
202
		 * 
193
		 *
203
		 * @param e
194
		 * @param e
204
		 *            the paint event.
195
		 *            the paint event.
205
		 */
196
		 */
Lines 286-292 Link Here
286
277
287
		/**
278
		/**
288
		 * Get the tab item.
279
		 * Get the tab item.
289
		 * 
280
		 *
290
		 * @return the tab item.
281
		 * @return the tab item.
291
		 */
282
		 */
292
		public ITabItem getTabItem() {
283
		public ITabItem getTabItem() {
Lines 307-313 Link Here
307
298
308
		/**
299
		/**
309
		 * Constructor for TopNavigationElement.
300
		 * Constructor for TopNavigationElement.
310
		 * 
301
		 *
311
		 * @param parent
302
		 * @param parent
312
		 *            the parent Composite.
303
		 *            the parent Composite.
313
		 */
304
		 */
Lines 337-343 Link Here
337
328
338
		/**
329
		/**
339
		 * Paint the element.
330
		 * Paint the element.
340
		 * 
331
		 *
341
		 * @param e
332
		 * @param e
342
		 *            the paint event.
333
		 *            the paint event.
343
		 */
334
		 */
Lines 394-400 Link Here
394
385
395
		/**
386
		/**
396
		 * Constructor for BottomNavigationElement.
387
		 * Constructor for BottomNavigationElement.
397
		 * 
388
		 *
398
		 * @param parent
389
		 * @param parent
399
		 *            the parent Composite.
390
		 *            the parent Composite.
400
		 */
391
		 */
Lines 424-430 Link Here
424
415
425
		/**
416
		/**
426
		 * Paint the element.
417
		 * Paint the element.
427
		 * 
418
		 *
428
		 * @param e
419
		 * @param e
429
		 *            the paint event.
420
		 *            the paint event.
430
		 */
421
		 */
Lines 473-479 Link Here
473
464
474
	/**
465
	/**
475
	 * Constructor for TabbedPropertyList.
466
	 * Constructor for TabbedPropertyList.
476
	 * 
467
	 *
477
	 * @param parent
468
	 * @param parent
478
	 *            the parent widget.
469
	 *            the parent widget.
479
	 * @param factory
470
	 * @param factory
Lines 514-540 Link Here
514
				computeTopAndBottomTab();
505
				computeTopAndBottomTab();
515
			}
506
			}
516
		});
507
		});
517
		this.addTraverseListener(new TraverseListener() {
508
		// RAP not supported yet
518
509
//		this.addTraverseListener(new TraverseListener() {
519
			public void keyTraversed(TraverseEvent e) {
510
//
520
				if (e.detail == SWT.TRAVERSE_ARROW_PREVIOUS
511
//			public void keyTraversed(TraverseEvent e) {
521
					|| e.detail == SWT.TRAVERSE_ARROW_NEXT) {
512
//				if (e.detail == SWT.TRAVERSE_ARROW_PREVIOUS
522
					int nMax = elements.length - 1;
513
//					|| e.detail == SWT.TRAVERSE_ARROW_NEXT) {
523
					int nCurrent = getSelectionIndex();
514
//					int nMax = elements.length - 1;
524
					if (e.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
515
//					int nCurrent = getSelectionIndex();
525
						nCurrent -= 1;
516
//					if (e.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
526
						nCurrent = Math.max(0, nCurrent);
517
//						nCurrent -= 1;
527
					} else if (e.detail == SWT.TRAVERSE_ARROW_NEXT) {
518
//						nCurrent = Math.max(0, nCurrent);
528
						nCurrent += 1;
519
//					} else if (e.detail == SWT.TRAVERSE_ARROW_NEXT) {
529
						nCurrent = Math.min(nCurrent, nMax);
520
//						nCurrent += 1;
530
					}
521
//						nCurrent = Math.min(nCurrent, nMax);
531
					select(nCurrent);
522
//					}
532
					redraw();
523
//					select(nCurrent);
533
				} else {
524
//					redraw();
534
					e.doit = true;
525
//				} else {
535
				}
526
//					e.doit = true;
536
			}
527
//				}
537
		});
528
//			}
529
//		});
530
		// /RAP
538
	}
531
	}
539
532
540
	/**
533
	/**
Lines 551-557 Link Here
551
	/**
544
	/**
552
	 * Returns the element with the given index from this list viewer. Returns
545
	 * Returns the element with the given index from this list viewer. Returns
553
	 * <code>null</code> if the index is out of range.
546
	 * <code>null</code> if the index is out of range.
554
	 * 
547
	 *
555
	 * @param index
548
	 * @param index
556
	 *            the zero-based index
549
	 *            the zero-based index
557
	 * @return the element at the given index, or <code>null</code> if the
550
	 * @return the element at the given index, or <code>null</code> if the
Lines 567-573 Link Here
567
	/**
560
	/**
568
	 * Returns the zero-relative index of the item which is currently selected
561
	 * Returns the zero-relative index of the item which is currently selected
569
	 * in the receiver, or -1 if no item is selected.
562
	 * in the receiver, or -1 if no item is selected.
570
	 * 
563
	 *
571
	 * @return the index of the selected item
564
	 * @return the index of the selected item
572
	 */
565
	 */
573
	public int getSelectionIndex() {
566
	public int getSelectionIndex() {
Lines 592-598 Link Here
592
585
593
	/**
586
	/**
594
	 * Sets the new list elements.
587
	 * Sets the new list elements.
595
	 * 
588
	 *
596
	 * @param children
589
	 * @param children
597
	 */
590
	 */
598
	public void setElements(Object[] children) {
591
	public void setElements(Object[] children) {
Lines 628-634 Link Here
628
621
629
	/**
622
	/**
630
	 * Selects one of the elements in the list.
623
	 * Selects one of the elements in the list.
631
	 * 
624
	 *
632
	 * @param index
625
	 * @param index
633
	 *            the index of the element to select.
626
	 *            the index of the element to select.
634
	 */
627
	 */
Lines 707-713 Link Here
707
700
708
	/**
701
	/**
709
	 * Get the dimensions of the provided string.
702
	 * Get the dimensions of the provided string.
710
	 * 
703
	 *
711
	 * @param text
704
	 * @param text
712
	 *            the string.
705
	 *            the string.
713
	 * @return the dimensions of the provided string.
706
	 * @return the dimensions of the provided string.
Lines 811-821 Link Here
811
	/**
804
	/**
812
	 * Get the height of a tab. The height of the tab is the height of the text
805
	 * Get the height of a tab. The height of the tab is the height of the text
813
	 * plus buffer.
806
	 * plus buffer.
814
	 * 
807
	 *
815
	 * @return the height of a tab.
808
	 * @return the height of a tab.
816
	 */
809
	 */
817
	private int getTabHeight() {
810
	private int getTabHeight() {
818
		int tabHeight = getTextDimension("").y + INDENT; //$NON-NLS-1$ 
811
		int tabHeight = getTextDimension("").y + INDENT; //$NON-NLS-1$
819
		if (tabsThatFitInComposite == 1) {
812
		if (tabsThatFitInComposite == 1) {
820
			/*
813
			/*
821
			 * if only one tab will fix, reduce the size of the tab height so
814
			 * if only one tab will fix, reduce the size of the tab height so
Lines 831-837 Link Here
831
824
832
	/**
825
	/**
833
	 * Determine if a downward scrolling is required.
826
	 * Determine if a downward scrolling is required.
834
	 * 
827
	 *
835
	 * @return true if downward scrolling is required.
828
	 * @return true if downward scrolling is required.
836
	 */
829
	 */
837
	private boolean isDownScrollRequired() {
830
	private boolean isDownScrollRequired() {
Lines 841-847 Link Here
841
834
842
	/**
835
	/**
843
	 * Determine if an upward scrolling is required.
836
	 * Determine if an upward scrolling is required.
844
	 * 
837
	 *
845
	 * @return true if upward scrolling is required.
838
	 * @return true if upward scrolling is required.
846
	 */
839
	 */
847
	private boolean isUpScrollRequired() {
840
	private boolean isUpScrollRequired() {
Lines 973-1045 Link Here
973
	 * Initialize the accessibility adapter.
966
	 * Initialize the accessibility adapter.
974
	 */
967
	 */
975
	private void initAccessible() {
968
	private void initAccessible() {
976
		final Accessible accessible = getAccessible();
969
		// RAP does not support this
977
		accessible.addAccessibleListener(new AccessibleAdapter() {
970
//		final Accessible accessible = getAccessible();
978
971
//		accessible.addAccessibleListener(new AccessibleAdapter() {
979
			public void getName(AccessibleEvent e) {
972
//
980
				if (getSelectionIndex() != NONE) {
973
//			public void getName(AccessibleEvent e) {
981
					e.result = elements[getSelectionIndex()].getTabItem()
974
//				if (getSelectionIndex() != NONE) {
982
							.getText();
975
//					e.result = elements[getSelectionIndex()].getTabItem()
983
				}
976
//							.getText();
984
			}
977
//				}
985
978
//			}
986
			public void getHelp(AccessibleEvent e) {
979
//
987
				if (getSelectionIndex() != NONE) {
980
//			public void getHelp(AccessibleEvent e) {
988
					e.result = elements[getSelectionIndex()].getTabItem()
981
//				if (getSelectionIndex() != NONE) {
989
							.getText();
982
//					e.result = elements[getSelectionIndex()].getTabItem()
990
				}
983
//							.getText();
991
			}
984
//				}
992
		});
985
//			}
993
986
//		});
994
		accessible.addAccessibleControlListener(new AccessibleControlAdapter() {
987
//
995
988
//		accessible.addAccessibleControlListener(new AccessibleControlAdapter() {
996
			public void getChildAtPoint(AccessibleControlEvent e) {
989
//
997
				Point pt = toControl(new Point(e.x, e.y));
990
//			public void getChildAtPoint(AccessibleControlEvent e) {
998
				e.childID = (getBounds().contains(pt)) ? ACC.CHILDID_SELF
991
//				Point pt = toControl(new Point(e.x, e.y));
999
					: ACC.CHILDID_NONE;
992
//				e.childID = (getBounds().contains(pt)) ? ACC.CHILDID_SELF
1000
			}
993
//					: ACC.CHILDID_NONE;
1001
994
//			}
1002
			public void getLocation(AccessibleControlEvent e) {
995
//
1003
				if (getSelectionIndex() != NONE) {
996
//			public void getLocation(AccessibleControlEvent e) {
1004
					Rectangle location = elements[getSelectionIndex()]
997
//				if (getSelectionIndex() != NONE) {
1005
						.getBounds();
998
//					Rectangle location = elements[getSelectionIndex()]
1006
					Point pt = toDisplay(new Point(location.x, location.y));
999
//						.getBounds();
1007
					e.x = pt.x;
1000
//					Point pt = toDisplay(new Point(location.x, location.y));
1008
					e.y = pt.y;
1001
//					e.x = pt.x;
1009
					e.width = location.width;
1002
//					e.y = pt.y;
1010
					e.height = location.height;
1003
//					e.width = location.width;
1011
				}
1004
//					e.height = location.height;
1012
			}
1005
//				}
1013
1006
//			}
1014
			public void getChildCount(AccessibleControlEvent e) {
1007
//
1015
				e.detail = 0;
1008
//			public void getChildCount(AccessibleControlEvent e) {
1016
			}
1009
//				e.detail = 0;
1017
1010
//			}
1018
			public void getRole(AccessibleControlEvent e) {
1011
//
1019
				e.detail = ACC.ROLE_TABITEM;
1012
//			public void getRole(AccessibleControlEvent e) {
1020
			}
1013
//				e.detail = ACC.ROLE_TABITEM;
1021
1014
//			}
1022
			public void getState(AccessibleControlEvent e) {
1015
//
1023
				e.detail = ACC.STATE_NORMAL | ACC.STATE_SELECTABLE
1016
//			public void getState(AccessibleControlEvent e) {
1024
					| ACC.STATE_SELECTED | ACC.STATE_FOCUSED
1017
//				e.detail = ACC.STATE_NORMAL | ACC.STATE_SELECTABLE
1025
					| ACC.STATE_FOCUSABLE;
1018
//					| ACC.STATE_SELECTED | ACC.STATE_FOCUSED
1026
			}
1019
//					| ACC.STATE_FOCUSABLE;
1027
		});
1020
//			}
1028
1021
//		});
1029
		addListener(SWT.Selection, new Listener() {
1022
//
1030
1023
//		addListener(SWT.Selection, new Listener() {
1031
			public void handleEvent(Event event) {
1024
//
1032
				if (isFocusControl()) {
1025
//			public void handleEvent(Event event) {
1033
					accessible.setFocus(ACC.CHILDID_SELF);
1026
//				if (isFocusControl()) {
1034
				}
1027
//					accessible.setFocus(ACC.CHILDID_SELF);
1035
			}
1028
//				}
1036
		});
1029
//			}
1037
1030
//		});
1038
		addListener(SWT.FocusIn, new Listener() {
1031
//
1039
1032
//		addListener(SWT.FocusIn, new Listener() {
1040
			public void handleEvent(Event event) {
1033
//
1041
				accessible.setFocus(ACC.CHILDID_SELF);
1034
//			public void handleEvent(Event event) {
1042
			}
1035
//				accessible.setFocus(ACC.CHILDID_SELF);
1043
		});
1036
//			}
1037
//		});
1038
		// /RAP
1044
	}
1039
	}
1045
}
1040
}
(-)src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java (-13 / +13 lines)
Lines 4-10 Link Here
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 * 
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
10
 *******************************************************************************/
Lines 44-50 Link Here
44
/**
44
/**
45
 * Provides information about the tabbed property extension points. Each tabbed
45
 * Provides information about the tabbed property extension points. Each tabbed
46
 * property registry is associated with a unique contributor ID.
46
 * property registry is associated with a unique contributor ID.
47
 * 
47
 *
48
 * @author Anthony Hunter
48
 * @author Anthony Hunter
49
 */
49
 */
50
public class TabbedPropertyRegistry {
50
public class TabbedPropertyRegistry {
Lines 167-173 Link Here
167
167
168
	/**
168
	/**
169
	 * Gets the categories that are valid for this contributor.
169
	 * Gets the categories that are valid for this contributor.
170
	 * 
170
	 *
171
	 * @param configurationElement
171
	 * @param configurationElement
172
	 *            the configuration element for this contributor.
172
	 *            the configuration element for this contributor.
173
	 */
173
	 */
Lines 184-190 Link Here
184
	/**
184
	/**
185
	 * Handle the error when an issue is found loading from the configuration
185
	 * Handle the error when an issue is found loading from the configuration
186
	 * element.
186
	 * element.
187
	 * 
187
	 *
188
	 * @param id
188
	 * @param id
189
	 *            the configuration id.
189
	 *            the configuration id.
190
	 * @param exception
190
	 * @param exception
Lines 232-241 Link Here
232
		if (contributorId == null) {
232
		if (contributorId == null) {
233
			return new IConfigurationElement[0];
233
			return new IConfigurationElement[0];
234
		}
234
		}
235
		// RAP modified to use 'org.eclipse.ui.views.properties.tabbed' namespace
235
		IExtensionPoint point = Platform.getExtensionRegistry()
236
		IExtensionPoint point = Platform.getExtensionRegistry()
236
				.getExtensionPoint(
237
				.getExtensionPoint(
237
						TabbedPropertyViewPlugin.getPlugin().getBundle()
238
						"org.eclipse.ui.views.properties.tabbed", extensionPointId); //$NON-NLS-1$
238
								.getSymbolicName(), extensionPointId);
239
		IConfigurationElement[] extensions = point.getConfigurationElements();
239
		IConfigurationElement[] extensions = point.getConfigurationElements();
240
		List unordered = new ArrayList(extensions.length);
240
		List unordered = new ArrayList(extensions.length);
241
		for (int i = 0; i < extensions.length; i++) {
241
		for (int i = 0; i < extensions.length; i++) {
Lines 267-273 Link Here
267
267
268
	/**
268
	/**
269
	 * Returns all section descriptors for the provided selection.
269
	 * Returns all section descriptors for the provided selection.
270
	 * 
270
	 *
271
	 * @param part
271
	 * @param part
272
	 *            the workbench part containing the selection
272
	 *            the workbench part containing the selection
273
	 * @param selection
273
	 * @param selection
Lines 485-491 Link Here
485
485
486
	/**
486
	/**
487
	 * Gets the type mapper for the contributor.
487
	 * Gets the type mapper for the contributor.
488
	 * 
488
	 *
489
	 * @return the type mapper for the contributor.
489
	 * @return the type mapper for the contributor.
490
	 */
490
	 */
491
	public ITypeMapper getTypeMapper() {
491
	public ITypeMapper getTypeMapper() {
Lines 494-500 Link Here
494
494
495
	/**
495
	/**
496
	 * Gets the label provider for the contributor.
496
	 * Gets the label provider for the contributor.
497
	 * 
497
	 *
498
	 * @return the label provider for the contributor.
498
	 * @return the label provider for the contributor.
499
	 */
499
	 */
500
	public ILabelProvider getLabelProvider() {
500
	public ILabelProvider getLabelProvider() {
Lines 503-509 Link Here
503
503
504
	/**
504
	/**
505
	 * Gets the action provider for the contributor.
505
	 * Gets the action provider for the contributor.
506
	 * 
506
	 *
507
	 * @return the action provider for the contributor.
507
	 * @return the action provider for the contributor.
508
	 */
508
	 */
509
	public IActionProvider getActionProvider() {
509
	public IActionProvider getActionProvider() {
Lines 512-518 Link Here
512
512
513
	/**
513
	/**
514
	 * Gets the tab list content provider for the contributor.
514
	 * Gets the tab list content provider for the contributor.
515
	 * 
515
	 *
516
	 * @return the tab list content provider for the contributor.
516
	 * @return the tab list content provider for the contributor.
517
	 */
517
	 */
518
	public IStructuredContentProvider getTabListContentProvider() {
518
	public IStructuredContentProvider getTabListContentProvider() {
Lines 525-531 Link Here
525
	/**
525
	/**
526
	 * Handle the tab error when an issue is found loading from the
526
	 * Handle the tab error when an issue is found loading from the
527
	 * configuration element.
527
	 * configuration element.
528
	 * 
528
	 *
529
	 * @param configurationElement
529
	 * @param configurationElement
530
	 *            the configuration element
530
	 *            the configuration element
531
	 */
531
	 */
Lines 542-548 Link Here
542
542
543
	/**
543
	/**
544
	 * Disposes this registry.
544
	 * Disposes this registry.
545
	 * 
545
	 *
546
	 * @since 3.7
546
	 * @since 3.7
547
	 */
547
	 */
548
	public void dispose() {
548
	public void dispose() {
(-)src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyTitle.java (-33 / +34 lines)
Lines 4-10 Link Here
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 * 
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
10
 *******************************************************************************/
Lines 14-20 Link Here
14
import org.eclipse.swt.SWT;
14
import org.eclipse.swt.SWT;
15
import org.eclipse.swt.custom.CLabel;
15
import org.eclipse.swt.custom.CLabel;
16
import org.eclipse.swt.events.PaintEvent;
16
import org.eclipse.swt.events.PaintEvent;
17
import org.eclipse.swt.events.PaintListener;
18
import org.eclipse.swt.graphics.Color;
17
import org.eclipse.swt.graphics.Color;
19
import org.eclipse.swt.graphics.Font;
18
import org.eclipse.swt.graphics.Font;
20
import org.eclipse.swt.graphics.FontData;
19
import org.eclipse.swt.graphics.FontData;
Lines 31-37 Link Here
31
30
32
/**
31
/**
33
 * The title in the tabbed property sheet page.
32
 * The title in the tabbed property sheet page.
34
 * 
33
 *
35
 * @author Anthony Hunter
34
 * @author Anthony Hunter
36
 */
35
 */
37
public class TabbedPropertyTitle
36
public class TabbedPropertyTitle
Lines 39-57 Link Here
39
38
40
	private CLabel label;
39
	private CLabel label;
41
40
42
	private Image image = null;
41
//	private Image image = null;
42
43
//	private String text = null;
43
44
44
	private String text = null;
45
	
46
	private static final String BLANK = ""; //$NON-NLS-1$
45
	private static final String BLANK = ""; //$NON-NLS-1$
47
46
48
	private static final String TITLE_FONT = "org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyTitle"; //$NON-NLS-1$
47
	private static final String TITLE_FONT = "org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyTitle"; //$NON-NLS-1$
49
	
48
50
	private TabbedPropertySheetWidgetFactory factory;
49
	private TabbedPropertySheetWidgetFactory factory;
51
50
52
	/**
51
	/**
53
	 * Constructor for TabbedPropertyTitle.
52
	 * Constructor for TabbedPropertyTitle.
54
	 * 
53
	 *
55
	 * @param parent
54
	 * @param parent
56
	 *            the parent composite.
55
	 *            the parent composite.
57
	 * @param factory
56
	 * @param factory
Lines 62-78 Link Here
62
		super(parent, SWT.NO_FOCUS);
61
		super(parent, SWT.NO_FOCUS);
63
		this.factory = factory;
62
		this.factory = factory;
64
63
65
		this.addPaintListener(new PaintListener() {
64
		// RAP not suppported
66
65
//		this.addPaintListener(new PaintListener() {
67
			public void paintControl(PaintEvent e) {
66
//
68
				if (image == null && (text == null || text.equals(BLANK))) {
67
//			public void paintControl(PaintEvent e) {
69
					label.setVisible(false);
68
//				if (image == null && (text == null || text.equals(BLANK))) {
70
				} else {
69
//					label.setVisible(false);
71
					label.setVisible(true);
70
//				} else {
72
					drawTitleBackground(e);
71
//					label.setVisible(true);
73
				}
72
//					drawTitleBackground(e);
74
			}
73
//				}
75
		});
74
//			}
75
//		});
76
		// /RAP
76
77
77
		factory.getColors().initializeSectionToolBarColors();
78
		factory.getColors().initializeSectionToolBarColors();
78
		setBackground(factory.getColors().getBackground());
79
		setBackground(factory.getColors().getBackground());
Lines 87-103 Link Here
87
		if (! JFaceResources.getFontRegistry().hasValueFor(TITLE_FONT)) {
88
		if (! JFaceResources.getFontRegistry().hasValueFor(TITLE_FONT)) {
88
			FontData[] fontData = JFaceResources.getFontRegistry().getBold(
89
			FontData[] fontData = JFaceResources.getFontRegistry().getBold(
89
					JFaceResources.DEFAULT_FONT).getFontData();
90
					JFaceResources.DEFAULT_FONT).getFontData();
90
			/* title font is 2pt larger than that used in the tabs. */  
91
			/* title font is 2pt larger than that used in the tabs. */
91
			fontData[0].setHeight(fontData[0].getHeight() + 2);
92
			fontData[0].setHeight(fontData[0].getHeight() + 2);
92
			JFaceResources.getFontRegistry().put(TITLE_FONT, fontData);
93
			JFaceResources.getFontRegistry().put(TITLE_FONT, fontData);
93
		}
94
		}
94
		font = JFaceResources.getFont(TITLE_FONT);
95
		font = JFaceResources.getFont(TITLE_FONT);
95
		
96
96
		label = factory.createCLabel(this, BLANK);
97
		label = factory.createCLabel(this, BLANK);
97
		label.setBackground(new Color[] {
98
//		label.setBackground(new Color[] {
98
				factory.getColors().getColor(IFormColors.H_GRADIENT_END),
99
//				factory.getColors().getColor(IFormColors.H_GRADIENT_END),
99
				factory.getColors().getColor(IFormColors.H_GRADIENT_START) },
100
//				factory.getColors().getColor(IFormColors.H_GRADIENT_START) },
100
				new int[] { 100 }, true);
101
//				new int[] { 100 }, true);
101
		label.setFont(font);
102
		label.setFont(font);
102
		label.setForeground(factory.getColors().getColor(IFormColors.TITLE));
103
		label.setForeground(factory.getColors().getColor(IFormColors.TITLE));
103
		FormData data = new FormData();
104
		FormData data = new FormData();
Lines 118-127 Link Here
118
	 */
119
	 */
119
	protected void drawTitleBackground(PaintEvent e) {
120
	protected void drawTitleBackground(PaintEvent e) {
120
		Rectangle bounds = getClientArea();
121
		Rectangle bounds = getClientArea();
121
		label.setBackground(new Color[] {
122
//		label.setBackground(new Color[] {
122
				factory.getColors().getColor(IFormColors.H_GRADIENT_END),
123
//				factory.getColors().getColor(IFormColors.H_GRADIENT_END),
123
				factory.getColors().getColor(IFormColors.H_GRADIENT_START) },
124
//				factory.getColors().getColor(IFormColors.H_GRADIENT_START) },
124
				new int[] { 100 }, true);
125
//				new int[] { 100 }, true);
125
		Color bg = factory.getColors().getColor(IFormColors.H_GRADIENT_END);
126
		Color bg = factory.getColors().getColor(IFormColors.H_GRADIENT_END);
126
		Color gbg = factory.getColors().getColor(IFormColors.H_GRADIENT_START);
127
		Color gbg = factory.getColors().getColor(IFormColors.H_GRADIENT_START);
127
		GC gc = e.gc;
128
		GC gc = e.gc;
Lines 142-160 Link Here
142
143
143
	/**
144
	/**
144
	 * Set the text label.
145
	 * Set the text label.
145
	 * 
146
	 *
146
	 * @param text
147
	 * @param text
147
	 *            the text label.
148
	 *            the text label.
148
	 * @param image
149
	 * @param image
149
	 *            the image for the label.
150
	 *            the image for the label.
150
	 */
151
	 */
151
	public void setTitle(String text, Image image) {
152
	public void setTitle(String text, Image image) {
152
		this.text = text;
153
//		this.text = text;
153
		this.image = image;
154
//		this.image = image;
154
		if (text != null) {
155
		if (text != null) {
155
			label.setText(text);
156
			label.setText(text);
156
		} else {
157
		} else {
157
			label.setText(BLANK); 
158
			label.setText(BLANK);
158
		}
159
		}
159
		label.setImage(image);
160
		label.setImage(image);
160
		redraw();
161
		redraw();
(-)src/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetPage.java (-60 / +58 lines)
Lines 4-10 Link Here
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 * 
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
10
 *******************************************************************************/
Lines 34-47 Link Here
34
import org.eclipse.swt.events.ControlEvent;
34
import org.eclipse.swt.events.ControlEvent;
35
import org.eclipse.swt.graphics.Image;
35
import org.eclipse.swt.graphics.Image;
36
import org.eclipse.swt.graphics.Point;
36
import org.eclipse.swt.graphics.Point;
37
import org.eclipse.swt.graphics.Rectangle;
38
import org.eclipse.swt.layout.FillLayout;
37
import org.eclipse.swt.layout.FillLayout;
39
import org.eclipse.swt.layout.FormAttachment;
38
import org.eclipse.swt.layout.FormAttachment;
40
import org.eclipse.swt.layout.FormData;
39
import org.eclipse.swt.layout.FormData;
41
import org.eclipse.swt.layout.FormLayout;
40
import org.eclipse.swt.layout.FormLayout;
42
import org.eclipse.swt.widgets.Composite;
41
import org.eclipse.swt.widgets.Composite;
43
import org.eclipse.swt.widgets.Control;
42
import org.eclipse.swt.widgets.Control;
44
import org.eclipse.swt.widgets.ScrollBar;
45
import org.eclipse.ui.IActionBars;
43
import org.eclipse.ui.IActionBars;
46
import org.eclipse.ui.IEditorPart;
44
import org.eclipse.ui.IEditorPart;
47
import org.eclipse.ui.IPartListener;
45
import org.eclipse.ui.IPartListener;
Lines 61-67 Link Here
61
59
62
/**
60
/**
63
 * A property sheet page that provides a tabbed UI.
61
 * A property sheet page that provides a tabbed UI.
64
 * 
62
 *
65
 * @author Anthony Hunter
63
 * @author Anthony Hunter
66
 */
64
 */
67
public class TabbedPropertySheetPage
65
public class TabbedPropertySheetPage
Lines 138-144 Link Here
138
136
139
		/**
137
		/**
140
		 * Constructor that takes in a contributor id taken from a selection.
138
		 * Constructor that takes in a contributor id taken from a selection.
141
		 * 
139
		 *
142
		 * @param contributorId
140
		 * @param contributorId
143
		 *            the contributor id.
141
		 *            the contributor id.
144
		 */
142
		 */
Lines 265-271 Link Here
265
263
266
	/**
264
	/**
267
	 * create a new tabbed property sheet page.
265
	 * create a new tabbed property sheet page.
268
	 * 
266
	 *
269
	 * @param tabbedPropertySheetPageContributor
267
	 * @param tabbedPropertySheetPageContributor
270
	 *            the tabbed property sheet page contributor.
268
	 *            the tabbed property sheet page contributor.
271
	 */
269
	 */
Lines 273-287 Link Here
273
			ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor) {
271
			ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor) {
274
		this(tabbedPropertySheetPageContributor, true);
272
		this(tabbedPropertySheetPageContributor, true);
275
	}
273
	}
276
	
274
277
	/**
275
	/**
278
	 * create a new tabbed property sheet page.
276
	 * create a new tabbed property sheet page.
279
	 *
277
	 *
280
	 * @param tabbedPropertySheetPageContributor
278
	 * @param tabbedPropertySheetPageContributor
281
	 *            the tabbed property sheet page contributor.	  
279
	 *            the tabbed property sheet page contributor.
282
	 * @param showTitleBar
280
	 * @param showTitleBar
283
	 *            boolean indicating if the title bar should be shown; 
281
	 *            boolean indicating if the title bar should be shown;
284
	 *            default value is <code>true</code> 	
282
	 *            default value is <code>true</code>
285
	 * @since 3.5
283
	 * @since 3.5
286
	 */
284
	 */
287
	public TabbedPropertySheetPage(
285
	public TabbedPropertySheetPage(
Lines 297-303 Link Here
297
295
298
	/**
296
	/**
299
	 * Handle the part activated event.
297
	 * Handle the part activated event.
300
	 * 
298
	 *
301
	 * @param part
299
	 * @param part
302
	 *            the new activated part.
300
	 *            the new activated part.
303
	 */
301
	 */
Lines 350-356 Link Here
350
		widgetFactory = new TabbedPropertySheetWidgetFactory();
348
		widgetFactory = new TabbedPropertySheetWidgetFactory();
351
		tabbedPropertyComposite = new TabbedPropertyComposite(parent,
349
		tabbedPropertyComposite = new TabbedPropertyComposite(parent,
352
			widgetFactory, hasTitleBar);
350
			widgetFactory, hasTitleBar);
353
		widgetFactory.paintBordersFor(tabbedPropertyComposite);
351
//		widgetFactory.paintBordersFor(tabbedPropertyComposite);
354
		tabbedPropertyComposite.setLayout(new FormLayout());
352
		tabbedPropertyComposite.setLayout(new FormLayout());
355
		FormData formData = new FormData();
353
		FormData formData = new FormData();
356
		formData.left = new FormAttachment(0, 0);
354
		formData.left = new FormAttachment(0, 0);
Lines 392-398 Link Here
392
390
393
	/**
391
	/**
394
	 * Initialize the contributor with the provided contributor id.
392
	 * Initialize the contributor with the provided contributor id.
395
	 * 
393
	 *
396
	 * @param contributorId
394
	 * @param contributorId
397
	 *            the contributor id.
395
	 *            the contributor id.
398
	 */
396
	 */
Lines 432-438 Link Here
432
430
433
	/**
431
	/**
434
	 * Gets the tab list content provider for the contributor.
432
	 * Gets the tab list content provider for the contributor.
435
	 * 
433
	 *
436
	 * @return the tab list content provider for the contributor.
434
	 * @return the tab list content provider for the contributor.
437
	 */
435
	 */
438
	protected IStructuredContentProvider getTabListContentProvider() {
436
	protected IStructuredContentProvider getTabListContentProvider() {
Lines 499-505 Link Here
499
				contributor);
497
				contributor);
500
			registry = null;
498
			registry = null;
501
		}
499
		}
502
        
500
503
        contributor = null;
501
        contributor = null;
504
        currentSelection = null;
502
        currentSelection = null;
505
	}
503
	}
Lines 524-531 Link Here
524
		} else if (contributor instanceof IViewPart) {
522
		} else if (contributor instanceof IViewPart) {
525
            IViewPart viewPart = (IViewPart) contributor;
523
            IViewPart viewPart = (IViewPart) contributor;
526
            partActionBars = viewPart.getViewSite().getActionBars();
524
            partActionBars = viewPart.getViewSite().getActionBars();
527
        } 
525
        }
528
        
526
529
        if (partActionBars != null) {
527
        if (partActionBars != null) {
530
            IAction action = partActionBars.getGlobalActionHandler(ActionFactory.UNDO
528
            IAction action = partActionBars.getGlobalActionHandler(ActionFactory.UNDO
531
                .getId());
529
                .getId());
Lines 533-539 Link Here
533
                actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), action);
531
                actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), action);
534
            }
532
            }
535
            action = partActionBars.getGlobalActionHandler(ActionFactory.REDO
533
            action = partActionBars.getGlobalActionHandler(ActionFactory.REDO
536
                .getId()); 
534
                .getId());
537
            if (action != null) {
535
            if (action != null) {
538
                actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), action);
536
                actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), action);
539
            }
537
            }
Lines 570-578 Link Here
570
	}
568
	}
571
569
572
	/**
570
	/**
573
	 * Resize the scrolled composite enclosing the sections, which may result in the 
571
	 * Resize the scrolled composite enclosing the sections, which may result in the
574
	 * addition or removal of scroll bars.
572
	 * addition or removal of scroll bars.
575
	 * 
573
	 *
576
	 * @since 3.5
574
	 * @since 3.5
577
	 */
575
	 */
578
	public void resizeScrolledComposite() {
576
	public void resizeScrolledComposite() {
Lines 581-609 Link Here
581
			Composite sizeReference = (Composite) tabToComposite
579
			Composite sizeReference = (Composite) tabToComposite
582
				.get(currentTab);
580
				.get(currentTab);
583
			if (sizeReference != null) {
581
			if (sizeReference != null) {
584
				currentTabSize = sizeReference.computeSize(SWT.DEFAULT, SWT.DEFAULT); 
582
				currentTabSize = sizeReference.computeSize(SWT.DEFAULT, SWT.DEFAULT);
585
			}
583
			}
586
		}
584
		}
587
		tabbedPropertyComposite.getScrolledComposite().setMinSize(
585
		tabbedPropertyComposite.getScrolledComposite().setMinSize(
588
				currentTabSize);
586
				currentTabSize);
589
587
590
		ScrollBar verticalScrollBar = tabbedPropertyComposite
588
//		ScrollBar verticalScrollBar = tabbedPropertyComposite
591
				.getScrolledComposite().getVerticalBar();
589
//				.getScrolledComposite().getVerticalBar();
592
		if (verticalScrollBar != null) {
590
//		if (verticalScrollBar != null) {
593
			Rectangle clientArea = tabbedPropertyComposite
591
//			Rectangle clientArea = tabbedPropertyComposite
594
					.getScrolledComposite().getClientArea();
592
//					.getScrolledComposite().getClientArea();
595
			int increment = clientArea.height - 5;
593
//			int increment = clientArea.height - 5;
596
			verticalScrollBar.setPageIncrement(increment);
594
//			verticalScrollBar.setPageIncrement(increment);
597
		}
595
//		}
598
596
599
		ScrollBar horizontalScrollBar = tabbedPropertyComposite
597
//		ScrollBar horizontalScrollBar = tabbedPropertyComposite
600
				.getScrolledComposite().getHorizontalBar();
598
//				.getScrolledComposite().getHorizontalBar();
601
		if (horizontalScrollBar != null) {
599
//		if (horizontalScrollBar != null) {
602
			Rectangle clientArea = tabbedPropertyComposite
600
//			Rectangle clientArea = tabbedPropertyComposite
603
					.getScrolledComposite().getClientArea();
601
//					.getScrolledComposite().getClientArea();
604
			int increment = clientArea.width - 5;
602
//			int increment = clientArea.width - 5;
605
			horizontalScrollBar.setPageIncrement(increment);
603
//			horizontalScrollBar.setPageIncrement(increment);
606
		}
604
//		}
607
	}
605
	}
608
606
609
	private void disposeTabs(Collection tabs) {
607
	private void disposeTabs(Collection tabs) {
Lines 673-679 Link Here
673
671
674
	/**
672
	/**
675
	 * Create the tab contents for the provided tab descriptor.
673
	 * Create the tab contents for the provided tab descriptor.
676
	 * 
674
	 *
677
	 * @param tabDescriptor
675
	 * @param tabDescriptor
678
	 *            the tab descriptor.
676
	 *            the tab descriptor.
679
	 * @return the tab contents.
677
	 * @return the tab contents.
Lines 685-691 Link Here
685
683
686
	/**
684
	/**
687
	 * Helper method for creating property tab composites.
685
	 * Helper method for creating property tab composites.
688
	 * 
686
	 *
689
	 * @return the property tab composite.
687
	 * @return the property tab composite.
690
	 */
688
	 */
691
	private Composite createTabComposite() {
689
	private Composite createTabComposite() {
Lines 751-757 Link Here
751
749
752
	/**
750
	/**
753
	 * Get the currently active tab.
751
	 * Get the currently active tab.
754
	 * 
752
	 *
755
	 * @return the currently active tab.
753
	 * @return the currently active tab.
756
	 * @since 3.4
754
	 * @since 3.4
757
	 */
755
	 */
Lines 761-767 Link Here
761
759
762
	/**
760
	/**
763
	 * Handle the tab selected change event.
761
	 * Handle the tab selected change event.
764
	 * 
762
	 *
765
	 * @param tabDescriptor
763
	 * @param tabDescriptor
766
	 *            the new selected tab.
764
	 *            the new selected tab.
767
	 */
765
	 */
Lines 780-786 Link Here
780
778
781
	/**
779
	/**
782
	 * Add a tab selection listener.
780
	 * Add a tab selection listener.
783
	 * 
781
	 *
784
	 * @param listener
782
	 * @param listener
785
	 *            a tab selection listener.
783
	 *            a tab selection listener.
786
	 */
784
	 */
Lines 790-796 Link Here
790
788
791
	/**
789
	/**
792
	 * Remove a tab selection listener.
790
	 * Remove a tab selection listener.
793
	 * 
791
	 *
794
	 * @param listener
792
	 * @param listener
795
	 *            a tab selection listener.
793
	 *            a tab selection listener.
796
	 */
794
	 */
Lines 813-819 Link Here
813
811
814
	/**
812
	/**
815
	 * Get the widget factory.
813
	 * Get the widget factory.
816
	 * 
814
	 *
817
	 * @return the widget factory.
815
	 * @return the widget factory.
818
	 */
816
	 */
819
	public TabbedPropertySheetWidgetFactory getWidgetFactory() {
817
	public TabbedPropertySheetWidgetFactory getWidgetFactory() {
Lines 851-857 Link Here
851
849
852
    /**
850
    /**
853
     * Retrieve the contributor from the selection.
851
     * Retrieve the contributor from the selection.
854
     * 
852
     *
855
     * @param object -
853
     * @param object -
856
     *            the selected element
854
     *            the selected element
857
     * @return the TabbedPropertySheetPageContributor or null if not applicable
855
     * @return the TabbedPropertySheetPageContributor or null if not applicable
Lines 888-894 Link Here
888
	 * It is possible for elements in a selection to implement
886
	 * It is possible for elements in a selection to implement
889
	 * ITabbedPropertySheetPageContributor to provide a different contributor id
887
	 * ITabbedPropertySheetPageContributor to provide a different contributor id
890
	 * and thus a differenent registry.
888
	 * and thus a differenent registry.
891
	 * 
889
	 *
892
	 * @param selection
890
	 * @param selection
893
	 *            the current selection in the active workbench part.
891
	 *            the current selection in the active workbench part.
894
	 */
892
	 */
Lines 907-920 Link Here
907
		}
905
		}
908
906
909
        ITabbedPropertySheetPageContributor newContributor = getTabbedPropertySheetPageContributor(structuredSelection.getFirstElement());
907
        ITabbedPropertySheetPageContributor newContributor = getTabbedPropertySheetPageContributor(structuredSelection.getFirstElement());
910
        
908
911
		if (newContributor == null) {
909
		if (newContributor == null) {
912
			/**
910
			/**
913
			 * selection does not implement or adapt ITabbedPropertySheetPageContributor.
911
			 * selection does not implement or adapt ITabbedPropertySheetPageContributor.
914
			 */
912
			 */
915
			newContributor = contributor;
913
			newContributor = contributor;
916
		}
914
		}
917
		
915
918
        String selectionContributorId = newContributor.getContributorId();
916
        String selectionContributorId = newContributor.getContributorId();
919
		if (selectionContributorId.equals(currentContributorId)) {
917
		if (selectionContributorId.equals(currentContributorId)) {
920
			/**
918
			/**
Lines 970-976 Link Here
970
968
971
	/**
969
	/**
972
	 * Returns the currently selected tab.
970
	 * Returns the currently selected tab.
973
	 * 
971
	 *
974
	 * @return the currently selected tab or <code>null</code> if there is no
972
	 * @return the currently selected tab or <code>null</code> if there is no
975
	 *         tab selected.
973
	 *         tab selected.
976
	 * @since 3.5
974
	 * @since 3.5
Lines 988-994 Link Here
988
986
989
	/**
987
	/**
990
	 * Returns the list of currently active tabs.
988
	 * Returns the list of currently active tabs.
991
	 * 
989
	 *
992
	 * @return the currently active tabs.
990
	 * @return the currently active tabs.
993
	 * @since 3.5
991
	 * @since 3.5
994
	 */
992
	 */
Lines 1001-1010 Link Here
1001
		}
999
		}
1002
		return new ITabDescriptor[] {};
1000
		return new ITabDescriptor[] {};
1003
	}
1001
	}
1004
	
1002
1005
	/**
1003
	/**
1006
	 * Set the currently selected tab to be that of the provided tab id.
1004
	 * Set the currently selected tab to be that of the provided tab id.
1007
	 * 
1005
	 *
1008
	 * @param id
1006
	 * @param id
1009
	 *            The string id of the tab to select.
1007
	 *            The string id of the tab to select.
1010
	 * @since 3.5
1008
	 * @since 3.5
Lines 1022-1047 Link Here
1022
			}
1020
			}
1023
		}
1021
		}
1024
	}
1022
	}
1025
	
1023
1026
	/**
1024
	/**
1027
     * Returns text of the properties title for given selection. If selection is null,
1025
     * Returns text of the properties title for given selection. If selection is null,
1028
     * then currentSelection is used
1026
     * then currentSelection is used
1029
     * 
1027
     *
1030
	 * @param selection Selection whose properties title text is to be returned 
1028
	 * @param selection Selection whose properties title text is to be returned
1031
     * @return String representing title text.
1029
     * @return String representing title text.
1032
	 * @since 3.5
1030
	 * @since 3.5
1033
     */	
1031
     */
1034
    public String getTitleText(ISelection selection) {
1032
    public String getTitleText(ISelection selection) {
1035
    	if (selection == null) {
1033
    	if (selection == null) {
1036
    		selection = currentSelection;
1034
    		selection = currentSelection;
1037
    	}
1035
    	}
1038
    	return registry.getLabelProvider().getText(selection);
1036
    	return registry.getLabelProvider().getText(selection);
1039
    }
1037
    }
1040
    
1038
1041
    /**
1039
    /**
1042
     * Returns the title image for given selection. If selection is null,
1040
     * Returns the title image for given selection. If selection is null,
1043
     * then currentSelection is used. 
1041
     * then currentSelection is used.
1044
     * 
1042
     *
1045
     * @param selection Selection whose properties title image is to be returned
1043
     * @param selection Selection whose properties title image is to be returned
1046
     * @return Image that is used as a title image.
1044
     * @return Image that is used as a title image.
1047
     * @since 3.5
1045
     * @since 3.5
(-)src/org/eclipse/ui/views/properties/tabbed/TabbedPropertySheetWidgetFactory.java (-15 / +15 lines)
Lines 4-10 Link Here
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 * 
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
10
 *******************************************************************************/
Lines 25-31 Link Here
25
25
26
/**
26
/**
27
 * A FormToolkit customized for use by tabbed property sheet page.
27
 * A FormToolkit customized for use by tabbed property sheet page.
28
 * 
28
 *
29
 * @author Anthony Hunter
29
 * @author Anthony Hunter
30
 */
30
 */
31
public class TabbedPropertySheetWidgetFactory
31
public class TabbedPropertySheetWidgetFactory
Lines 40-46 Link Here
40
40
41
    /**
41
    /**
42
     * Creates the tab folder as a part of the form.
42
     * Creates the tab folder as a part of the form.
43
     * 
43
     *
44
     * @param parent
44
     * @param parent
45
     *            the composite parent.
45
     *            the composite parent.
46
     * @param style
46
     * @param style
Lines 54-60 Link Here
54
54
55
    /**
55
    /**
56
     * Creates the tab item as a part of the tab folder.
56
     * Creates the tab item as a part of the tab folder.
57
     * 
57
     *
58
     * @param tabFolder
58
     * @param tabFolder
59
     *            the parent.
59
     *            the parent.
60
     * @param style
60
     * @param style
Lines 68-74 Link Here
68
68
69
    /**
69
    /**
70
     * Creates the list as a part of the form.
70
     * Creates the list as a part of the form.
71
     * 
71
     *
72
     * @param parent
72
     * @param parent
73
     *            the composite parent.
73
     *            the composite parent.
74
     * @param style
74
     * @param style
Lines 82-88 Link Here
82
82
83
    public Composite createComposite(Composite parent, int style) {
83
    public Composite createComposite(Composite parent, int style) {
84
        Composite c = super.createComposite(parent, style);
84
        Composite c = super.createComposite(parent, style);
85
        paintBordersFor(c);
85
//        paintBordersFor(c);
86
        return c;
86
        return c;
87
    }
87
    }
88
88
Lines 93-99 Link Here
93
93
94
    /**
94
    /**
95
     * Creates a plain composite as a part of the form.
95
     * Creates a plain composite as a part of the form.
96
     * 
96
     *
97
     * @param parent
97
     * @param parent
98
     *            the composite parent.
98
     *            the composite parent.
99
     * @param style
99
     * @param style
Lines 103-115 Link Here
103
    public Composite createPlainComposite(Composite parent, int style) {
103
    public Composite createPlainComposite(Composite parent, int style) {
104
        Composite c = super.createComposite(parent, style);
104
        Composite c = super.createComposite(parent, style);
105
        c.setBackground(parent.getBackground());
105
        c.setBackground(parent.getBackground());
106
        paintBordersFor(c);
106
//        paintBordersFor(c);
107
        return c;
107
        return c;
108
    }
108
    }
109
109
110
    /**
110
    /**
111
     * Creates a scrolled composite as a part of the form.
111
     * Creates a scrolled composite as a part of the form.
112
     * 
112
     *
113
     * @param parent
113
     * @param parent
114
     *            the composite parent.
114
     *            the composite parent.
115
     * @param style
115
     * @param style
Lines 124-130 Link Here
124
124
125
    /**
125
    /**
126
     * Creates a combo box as a part of the form.
126
     * Creates a combo box as a part of the form.
127
     * 
127
     *
128
     * @param parent
128
     * @param parent
129
     *            the combo box parent.
129
     *            the combo box parent.
130
     * @param comboStyle
130
     * @param comboStyle
Lines 143-149 Link Here
143
143
144
    /**
144
    /**
145
     * Creates a combo box as a part of the form.
145
     * Creates a combo box as a part of the form.
146
     * 
146
     *
147
     * @param parent
147
     * @param parent
148
     *            the combo box parent.
148
     *            the combo box parent.
149
     * @return the combo box.
149
     * @return the combo box.
Lines 154-160 Link Here
154
154
155
    /**
155
    /**
156
     * Creates a group as a part of the form.
156
     * Creates a group as a part of the form.
157
     * 
157
     *
158
     * @param parent
158
     * @param parent
159
     *            the group parent.
159
     *            the group parent.
160
     * @param text
160
     * @param text
Lines 171-177 Link Here
171
171
172
    /**
172
    /**
173
     * Creates a flat form composite as a part of the form.
173
     * Creates a flat form composite as a part of the form.
174
     * 
174
     *
175
     * @param parent
175
     * @param parent
176
     *            the composite parent.
176
     *            the composite parent.
177
     * @return the composite.
177
     * @return the composite.
Lines 188-194 Link Here
188
188
189
    /**
189
    /**
190
     * Creates a label as a part of the form.
190
     * Creates a label as a part of the form.
191
     * 
191
     *
192
     * @param parent
192
     * @param parent
193
     *            the label parent.
193
     *            the label parent.
194
     * @param text
194
     * @param text
Lines 201-207 Link Here
201
201
202
    /**
202
    /**
203
     * Creates a label as a part of the form.
203
     * Creates a label as a part of the form.
204
     * 
204
     *
205
     * @param parent
205
     * @param parent
206
     *            the label parent.
206
     *            the label parent.
207
     * @param text
207
     * @param text

Return to bug 333886