Attachment #185360 for bug #258767

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

Lines 10-15 Link Here

(-)plugin.properties (+9 lines)
10	# QNX Software Systems - Mikhail Khodjaiants - Registers View (Bug 53640)	10	# QNX Software Systems - Mikhail Khodjaiants - Registers View (Bug 53640)
11	# Wind River Systems - Pawel Piech - Added Modules view (bug 211158)	11	# Wind River Systems - Pawel Piech - Added Modules view (bug 211158)
12	# Wind River Systems - Ted Williams -[Memory View] Memory View: Workflow Enhancements (bug 215432)	12	# Wind River Systems - Ted Williams -[Memory View] Memory View: Workflow Enhancements (bug 215432)
		13	# Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
13	###############################################################################	14	###############################################################################
14		15
15	pluginName=Debug UI	16	pluginName=Debug UI
Lines 129-134 Link Here
129	StringVariablePresentationsName=String Variable Presentations	130	StringVariablePresentationsName=String Variable Presentations
130	SuspendAction.label=&Suspend	131	SuspendAction.label=&Suspend
131	TerminateAction.label=&Terminate	132	TerminateAction.label=&Terminate
		133	DropToFrame.label=Drop To Frame
		134	Disconnect.label=Disconnect
132	ToggleBreakpointAction.label=Toggle Brea&kpoint	135	ToggleBreakpointAction.label=Toggle Brea&kpoint
133	ToggleBreakpointsTargetFactoriesExtension.name=Toggle Breakpoints Target Factories	136	ToggleBreakpointsTargetFactoriesExtension.name=Toggle Breakpoints Target Factories
134	ToggleLineBreakpointAction.label=Toggle &Line Breakpoint	137	ToggleLineBreakpointAction.label=Toggle &Line Breakpoint
Lines 219-224 Link Here
219	ActionDefinition.suspend.name=Suspend	222	ActionDefinition.suspend.name=Suspend
220	ActionDefinition.suspend.description=Suspend	223	ActionDefinition.suspend.description=Suspend
221		224
		225	ActionDefinition.dropToFrame.name=Drop to Frame
		226	ActionDefinition.dropToFrame.description=Drop to Frame
		227
		228	ActionDefinition.disconnect.name=Disconnect
		229	ActionDefinition.disconnect.description=Disconnect
		230
222	ActionDefinition.openProfile.name=Profile...	231	ActionDefinition.openProfile.name=Profile...
223	ActionDefinition.openProfile.description=Open profile launch configuration dialog	232	ActionDefinition.openProfile.description=Open profile launch configuration dialog
224		233




     Contributors:
         IBM Corporation - initial API and implementation
         Patrick Chuong (Texas Instruments) - Improve usability of the breakpoint view (Bug 238956)
         Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784) 
 -->

<plugin>

               label="%StepWithFiltersAction.label"
               menubarPath="org.eclipse.ui.run/emptyStepGroup"
               style="toggle"
               state="false"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.DropToFrame"
               hoverIcon="$nl$/icons/full/elcl16/drop_to_frame.gif"
               class="org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandActionDelegate"
               definitionId="org.eclipse.debug.ui.commands.DropToFrame"
               disabledIcon="$nl$/icons/full/dlcl16/drop_to_frame.gif"
               helpContextId="drop_to_frame_action_context"
               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
               label="%DropToFrame.label"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/emptyStepGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.RunToLine"

               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
               helpContextId="step_return_action_context"
               label="%StepReturnAction.label"
               menubarPath="org.eclipse.ui.run/stepReturnGroup"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepReturnGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.StepOver"

               icon="$nl$/icons/full/elcl16/stepover_co.gif"
               helpContextId="step_over_action_context"
               label="%StepOverAction.label"
               menubarPath="org.eclipse.ui.run/stepOverGroup"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepOverGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.StepInto"

               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
               helpContextId="step_into_action_context"
               label="%StepIntoAction.label"
               menubarPath="org.eclipse.ui.run/stepIntoGroup"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.Disconnect"
               hoverIcon="$nl$/icons/full/elcl16/disconnect_co.gif"
               class="org.eclipse.debug.internal.ui.commands.actions.DisconnectCommandActionDelegate"
               definitionId="org.eclipse.debug.ui.commands.Disconnect"
               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
               helpContextId="disconnect_action_context"
               label="%Disconnect.label"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.Terminate"

               icon="$nl$/icons/full/elcl16/terminate_co.gif"
               helpContextId="terminate_action_context"
               label="%TerminateAction.label"
               menubarPath="org.eclipse.ui.run/stepGroup"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.Suspend"

               icon="$nl$/icons/full/elcl16/suspend_co.gif"
               helpContextId="suspend_action_context"
               label="%SuspendAction.label"
               menubarPath="org.eclipse.ui.run/stepGroup"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
         </action>
         <action
               id="org.eclipse.debug.ui.actions.Resume"

               icon="$nl$/icons/full/elcl16/resume_co.gif"
               helpContextId="resume_action_context"
               label="%ResumeAction.label"
               menubarPath="org.eclipse.ui.run/stepGroup"
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
         </action>
      </actionSet>
      <actionSet

	           </dynamic>
            </menu>         
       </menuContribution>
       <menuContribution
             locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
          <toolbar
                id="org.eclipse.debug.ui.main.toolbar"
                label="%DebugActionSet.label">
             <separator
                   name="threadGroup"
                   visible="true">
             </separator>
             <separator
                   name="stepGroup"
                   visible="true">
             </separator>
             <separator
                   name="stepIntoGroup"
                   visible="false">
             </separator>
             <separator
                   name="stepOverGroup"
                   visible="false">
             </separator>
             <separator
                   name="stepReturnGroup"
                   visible="false">
             </separator>
             <separator
                   name="emptyStepGroup"
                   visible="false">
             </separator>
             <separator
                   name="renderGroup"
                   visible="true">
             </separator>
          </toolbar>
       </menuContribution>
   </extension>  
   
   <extension

            id="org.eclipse.debug.ui.commands.ToggleStepFilters">
      </command>
      <command
            categoryId="org.eclipse.debug.ui.category.run"
            description="%ActionDefinition.dropToFrame.description"
            id="org.eclipse.debug.ui.commands.DropToFrame"
            name="%ActionDefinition.dropToFrame.name">
      </command>
      <command
            categoryId="org.eclipse.debug.ui.category.run"
            description="%ActionDefinition.disconnect.discrption"
            id="org.eclipse.debug.ui.commands.Disconnect"
            name="%ActionDefinition.disconnect.name">
      </command>
      <command
            name="%ActionDefinition.stepInto.name"
            categoryId="org.eclipse.debug.ui.category.run"
            description="%ActionDefinition.stepInto.description"




/*****************************************************************
 * Copyright (c) 2010 Texas Instruments 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:
 *     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
 *****************************************************************/
package org.eclipse.debug.internal.ui.commands.actions;

/**
 * Disconnect action delegate.
 * 
 * @since 3.7
 */
public class DisconnectCommandActionDelegate extends DebugCommandActionDelegate {
	
	public DisconnectCommandActionDelegate() {
		super();
		setAction(new DisconnectCommandAction());
	}
}




/*****************************************************************
 * Copyright (c) 2010 Texas Instruments 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:
 *     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
 *****************************************************************/
package org.eclipse.debug.internal.ui.commands.actions;

/**
 * Drop to Frame action delegate.
 * 
 * @since 3.7
 */
public class DropToFrameCommandActionDelegate extends DebugCommandActionDelegate {

	public DropToFrameCommandActionDelegate() {
		super();
		setAction(new DropToFrameCommandAction());
	}
}




 *     IBM Corporation - initial API and implementation
 *     Wind River - Pawel Piech - Busy status while updates in progress (Bug 206822)
 *     Pawel Piech (Wind River) - added a breadcrumb mode to Debug view (Bug 252677)
 *     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
 *******************************************************************************/
package org.eclipse.debug.internal.ui.views.launch;


		tbm.add(new GroupMarker(IDebugUIConstants.STEP_RETURN_GROUP));
		tbm.add(new GroupMarker(IDebugUIConstants.EMPTY_STEP_GROUP));
		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));
        
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME));
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND));
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE));
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT));
        
        tbm.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO));
        tbm.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER));
        tbm.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN));
        
        tbm.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME));
        
        tbm.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));
	}	

	/* (non-Javadoc)

Return to bug 258767

Lines 10-15 Link Here

(-)plugin.xml (-7 / +84 lines)
10	Contributors:	10	Contributors:
11	IBM Corporation - initial API and implementation	11	IBM Corporation - initial API and implementation
12	Patrick Chuong (Texas Instruments) - Improve usability of the breakpoint view (Bug 238956)	12	Patrick Chuong (Texas Instruments) - Improve usability of the breakpoint view (Bug 238956)
		13	Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
13	-->	14	-->
14		15
15	<plugin>	16	<plugin>
Lines 302-308 Link Here
302	label="%StepWithFiltersAction.label"	303	label="%StepWithFiltersAction.label"
303	menubarPath="org.eclipse.ui.run/emptyStepGroup"	304	menubarPath="org.eclipse.ui.run/emptyStepGroup"
304	style="toggle"	305	style="toggle"
305	state="false">	306	state="false"
		307	toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup">
		308	</action>
		309	<action
		310	id="org.eclipse.debug.ui.actions.DropToFrame"
		311	hoverIcon="$nl$/icons/full/elcl16/drop_to_frame.gif"
		312	class="org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandActionDelegate"
		313	definitionId="org.eclipse.debug.ui.commands.DropToFrame"
		314	disabledIcon="$nl$/icons/full/dlcl16/drop_to_frame.gif"
		315	helpContextId="drop_to_frame_action_context"
		316	icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
		317	label="%DropToFrame.label"
		318	toolbarPath="org.eclipse.debug.ui.main.toolbar/emptyStepGroup">
306	</action>	319	</action>
307	<action	320	<action
308	id="org.eclipse.debug.ui.actions.RunToLine"	321	id="org.eclipse.debug.ui.actions.RunToLine"
Lines 323-329 Link Here
323	icon="$nl$/icons/full/elcl16/stepreturn_co.gif"	336	icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
324	helpContextId="step_return_action_context"	337	helpContextId="step_return_action_context"
325	label="%StepReturnAction.label"	338	label="%StepReturnAction.label"
326	menubarPath="org.eclipse.ui.run/stepReturnGroup">	339	menubarPath="org.eclipse.ui.run/stepReturnGroup"
		340	toolbarPath="org.eclipse.debug.ui.main.toolbar/stepReturnGroup">
327	</action>	341	</action>
328	<action	342	<action
329	id="org.eclipse.debug.ui.actions.StepOver"	343	id="org.eclipse.debug.ui.actions.StepOver"
Lines 334-340 Link Here
334	icon="$nl$/icons/full/elcl16/stepover_co.gif"	348	icon="$nl$/icons/full/elcl16/stepover_co.gif"
335	helpContextId="step_over_action_context"	349	helpContextId="step_over_action_context"
336	label="%StepOverAction.label"	350	label="%StepOverAction.label"
337	menubarPath="org.eclipse.ui.run/stepOverGroup">	351	menubarPath="org.eclipse.ui.run/stepOverGroup"
		352	toolbarPath="org.eclipse.debug.ui.main.toolbar/stepOverGroup">
338	</action>	353	</action>
339	<action	354	<action
340	id="org.eclipse.debug.ui.actions.StepInto"	355	id="org.eclipse.debug.ui.actions.StepInto"
Lines 345-351 Link Here
345	icon="$nl$/icons/full/elcl16/stepinto_co.gif"	360	icon="$nl$/icons/full/elcl16/stepinto_co.gif"
346	helpContextId="step_into_action_context"	361	helpContextId="step_into_action_context"
347	label="%StepIntoAction.label"	362	label="%StepIntoAction.label"
348	menubarPath="org.eclipse.ui.run/stepIntoGroup">	363	menubarPath="org.eclipse.ui.run/stepIntoGroup"
		364	toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">
		365	</action>
		366	<action
		367	id="org.eclipse.debug.ui.actions.Disconnect"
		368	hoverIcon="$nl$/icons/full/elcl16/disconnect_co.gif"
		369	class="org.eclipse.debug.internal.ui.commands.actions.DisconnectCommandActionDelegate"
		370	definitionId="org.eclipse.debug.ui.commands.Disconnect"
		371	disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
		372	icon="$nl$/icons/full/elcl16/disconnect_co.gif"
		373	helpContextId="disconnect_action_context"
		374	label="%Disconnect.label"
		375	toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
349	</action>	376	</action>
350	<action	377	<action
351	id="org.eclipse.debug.ui.actions.Terminate"	378	id="org.eclipse.debug.ui.actions.Terminate"
Lines 356-362 Link Here
356	icon="$nl$/icons/full/elcl16/terminate_co.gif"	383	icon="$nl$/icons/full/elcl16/terminate_co.gif"
357	helpContextId="terminate_action_context"	384	helpContextId="terminate_action_context"
358	label="%TerminateAction.label"	385	label="%TerminateAction.label"
359	menubarPath="org.eclipse.ui.run/stepGroup">	386	menubarPath="org.eclipse.ui.run/stepGroup"
		387	toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
360	</action>	388	</action>
361	<action	389	<action
362	id="org.eclipse.debug.ui.actions.Suspend"	390	id="org.eclipse.debug.ui.actions.Suspend"
Lines 367-373 Link Here
367	icon="$nl$/icons/full/elcl16/suspend_co.gif"	395	icon="$nl$/icons/full/elcl16/suspend_co.gif"
368	helpContextId="suspend_action_context"	396	helpContextId="suspend_action_context"
369	label="%SuspendAction.label"	397	label="%SuspendAction.label"
370	menubarPath="org.eclipse.ui.run/stepGroup">	398	menubarPath="org.eclipse.ui.run/stepGroup"
		399	toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
371	</action>	400	</action>
372	<action	401	<action
373	id="org.eclipse.debug.ui.actions.Resume"	402	id="org.eclipse.debug.ui.actions.Resume"
Lines 378-384 Link Here
378	icon="$nl$/icons/full/elcl16/resume_co.gif"	407	icon="$nl$/icons/full/elcl16/resume_co.gif"
379	helpContextId="resume_action_context"	408	helpContextId="resume_action_context"
380	label="%ResumeAction.label"	409	label="%ResumeAction.label"
381	menubarPath="org.eclipse.ui.run/stepGroup">	410	menubarPath="org.eclipse.ui.run/stepGroup"
		411	toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
382	</action>	412	</action>
383	</actionSet>	413	</actionSet>
384	<actionSet	414	<actionSet
Lines 613-618 Link Here
613	</dynamic>	643	</dynamic>
614	</menu>	644	</menu>
615	</menuContribution>	645	</menuContribution>
		646	<menuContribution
		647	locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
		648	<toolbar
		649	id="org.eclipse.debug.ui.main.toolbar"
		650	label="%DebugActionSet.label">
		651	<separator
		652	name="threadGroup"
		653	visible="true">
		654	</separator>
		655	<separator
		656	name="stepGroup"
		657	visible="true">
		658	</separator>
		659	<separator
		660	name="stepIntoGroup"
		661	visible="false">
		662	</separator>
		663	<separator
		664	name="stepOverGroup"
		665	visible="false">
		666	</separator>
		667	<separator
		668	name="stepReturnGroup"
		669	visible="false">
		670	</separator>
		671	<separator
		672	name="emptyStepGroup"
		673	visible="false">
		674	</separator>
		675	<separator
		676	name="renderGroup"
		677	visible="true">
		678	</separator>
		679	</toolbar>
		680	</menuContribution>
616	</extension>	681	</extension>
617		682
618	<extension	683	<extension
Lines 1614-1619 Link Here
1614	id="org.eclipse.debug.ui.commands.ToggleStepFilters">	1679	id="org.eclipse.debug.ui.commands.ToggleStepFilters">
1615	</command>	1680	</command>
1616	<command	1681	<command
		1682	categoryId="org.eclipse.debug.ui.category.run"
		1683	description="%ActionDefinition.dropToFrame.description"
		1684	id="org.eclipse.debug.ui.commands.DropToFrame"
		1685	name="%ActionDefinition.dropToFrame.name">
		1686	</command>
		1687	<command
		1688	categoryId="org.eclipse.debug.ui.category.run"
		1689	description="%ActionDefinition.disconnect.discrption"
		1690	id="org.eclipse.debug.ui.commands.Disconnect"
		1691	name="%ActionDefinition.disconnect.name">
		1692	</command>
		1693	<command
1617	name="%ActionDefinition.stepInto.name"	1694	name="%ActionDefinition.stepInto.name"
1618	categoryId="org.eclipse.debug.ui.category.run"	1695	categoryId="org.eclipse.debug.ui.category.run"
1619	description="%ActionDefinition.stepInto.description"	1696	description="%ActionDefinition.stepInto.description"

Added Link Here

(-)ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandActionDelegate.java (+24 lines)
1	/*****************************************************************
2	* Copyright (c) 2010 Texas Instruments 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	* Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
10	*****************************************************************/
11	package org.eclipse.debug.internal.ui.commands.actions;
12
13	/**
14	* Disconnect action delegate.
15	*
16	* @since 3.7
17	*/
18	public class DisconnectCommandActionDelegate extends DebugCommandActionDelegate {
19
20	public DisconnectCommandActionDelegate() {
21	super();
22	setAction(new DisconnectCommandAction());
23	}
24	}

Lines 9-14 Link Here

(-)ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java (-13 / +1 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Wind River - Pawel Piech - Busy status while updates in progress (Bug 206822)	10	* Wind River - Pawel Piech - Busy status while updates in progress (Bug 206822)
11	* Pawel Piech (Wind River) - added a breadcrumb mode to Debug view (Bug 252677)	11	* Pawel Piech (Wind River) - added a breadcrumb mode to Debug view (Bug 252677)
		12	* Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
12	*******************************************************************************/	13	*******************************************************************************/
13	package org.eclipse.debug.internal.ui.views.launch;	14	package org.eclipse.debug.internal.ui.views.launch;
14		15
Lines 919-937 Link Here
919	tbm.add(new GroupMarker(IDebugUIConstants.STEP_RETURN_GROUP));	920	tbm.add(new GroupMarker(IDebugUIConstants.STEP_RETURN_GROUP));
920	tbm.add(new GroupMarker(IDebugUIConstants.EMPTY_STEP_GROUP));	921	tbm.add(new GroupMarker(IDebugUIConstants.EMPTY_STEP_GROUP));
921	tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));	922	tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));
922
923	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME));
924	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND));
925	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE));
926	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT));
927
928	tbm.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO));
929	tbm.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER));
930	tbm.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN));
931
932	tbm.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME));
933
934	tbm.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));
935	}	923	}
936		924
937	/* (non-Javadoc)	925	/* (non-Javadoc)