Attachment #4219 for bug #30644

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




import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;

		data.horizontalAlignment = GridData.FILL;
		intro.setLayoutData(data);
		
		new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
		
		new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$
		cvsRsh = new Text(composite, SWT.BORDER);
		cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

			}			
		});
		
		Label l = new Label(composite, SWT.LEFT | SWT.BOLD);
		l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
		l.setFont(JFaceResources.getBannerFont());
		
		l = new Label(composite, SWT.LEFT);
		l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH")); //$NON-NLS-1$
		data = new GridData();
		data.horizontalSpan = 2;
		data.horizontalAlignment = GridData.FILL;
		l.setLayoutData(data);
		
		new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
		
		new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH_Parameters")); //$NON-NLS-1$
		cvsRshParameters = new Text(composite, SWT.BORDER);
		data = new GridData();

		data.horizontalAlignment = GridData.FILL;
		cvsRshParameters.setLayoutData(data);

		l = new Label(composite, SWT.LEFT | SWT.BOLD);
		l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
		l.setFont(JFaceResources.getBannerFont());
		
		l = new Label(composite, SWT.LEFT);
		l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH_Parameters")); //$NON-NLS-1$
		data = new GridData();
		data.horizontalSpan = 2;
		data.horizontalAlignment = GridData.FILL;
		l.setLayoutData(data);
						
		new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
		
		new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$
		cvsServer = new Text(composite, SWT.BORDER);
		data = new GridData();
		data.horizontalSpan = 2;
		data.horizontalAlignment = GridData.FILL;
		cvsServer.setLayoutData(data);

		l = new Label(composite, SWT.LEFT | SWT.BOLD);
		l.setText(Policy.bind("ExtMethodPreferencePage_Note__8")); //$NON-NLS-1$
		l.setFont(JFaceResources.getBannerFont());
		
		l = new Label(composite, SWT.LEFT);
		l.setText(Policy.bind("ExtMethodPreferencePage_NoteForCVS_SERVER")); //$NON-NLS-1$
		data = new GridData();
		data.horizontalSpan = 2;
		data.horizontalAlignment = GridData.FILL;
		l.setLayoutData(data);

		
		initializeDefaults();
		WorkbenchHelp.setHelp(composite, IHelpContextIds.EXT_PREFERENCE_PAGE);
		WorkbenchHelp.setHelp(cvsRsh, IHelpContextIds.EXT_PREFERENCE_RSH);
		WorkbenchHelp.setHelp(cvsRshParameters, IHelpContextIds.EXT_PREFERENCE_PARAM);
		WorkbenchHelp.setHelp(cvsServer, IHelpContextIds.EXT_PREFERENCE_SERVER);
		Dialog.applyDialogFont(parent);
		return composite;
	}

Lines 89-94 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java (+4 lines)
89		89
90	public static final String CONSOLE_PREFERENCE_PAGE = PREFIX + "console_preference_page_context"; //$NON-NLS-1$	90	public static final String CONSOLE_PREFERENCE_PAGE = PREFIX + "console_preference_page_context"; //$NON-NLS-1$
91	public static final String EXT_PREFERENCE_PAGE = PREFIX + "ext_preference_page_context"; //$NON-NLS-1$	91	public static final String EXT_PREFERENCE_PAGE = PREFIX + "ext_preference_page_context"; //$NON-NLS-1$
		92	public static final String EXT_PREFERENCE_RSH = PREFIX + "ext_preference_rsh_context"; //$NON-NLS-1$
		93	public static final String EXT_PREFERENCE_PARAM = PREFIX + "ext_preference_param_context"; //$NON-NLS-1$
		94	public static final String EXT_PREFERENCE_SERVER = PREFIX + "ext_preference_server_context"; //$NON-NLS-1$
		95
92	public static final String DECORATORS_PREFERENCE_PAGE = PREFIX + "decorators_preference_page_context"; //$NON-NLS-1$	96	public static final String DECORATORS_PREFERENCE_PAGE = PREFIX + "decorators_preference_page_context"; //$NON-NLS-1$
93	public static final String WATCH_EDIT_PREFERENCE_PAGE = PREFIX + "watch_edit_preference_page_context"; //$NON-NLS-1$	97	public static final String WATCH_EDIT_PREFERENCE_PAGE = PREFIX + "watch_edit_preference_page_context"; //$NON-NLS-1$
94		98




ExtMethodPreferencePage_CVS_RSH=CVS_&RSH:
ExtMethodPreferencePage_Browse=&Browse...
ExtMethodPreferencePage_Details=Select a program or script
ExtMethodPreferencePage_Note__5=Note:
ExtMethodPreferencePage_note_CVS_RSH=This program will be called to connect to the remote CVS server.\nThe RSH command is invoked with following calling pattern:\n<CVS_RSH> <Parameters> <CVS_SERVER>
ExtMethodPreferencePage_CVS_RSH_Parameters=&Parameters:
ExtMethodPreferencePage_Add_Variable=&Add Variable...
ExtMethodPreferencePage_note_CVS_RSH_Parameters=The default parameter pattern is {host} -l {user}.\nIt can be tailored using {host}, {user}, {password} and {port}.
ExtMethodPreferencePage_CVS_SERVER__7=CVS_&SERVER:
ExtMethodPreferencePage_Note__8=Note:
ExtMethodPreferencePage_NoteForCVS_SERVER=This is the name of the remote CVS server program.\nChange this setting only if the remote CVS server name\nis different than the default
UpdateMergeActionProblems_merging_remote_resources_into_workspace_1=Problems merging remote resources into workspace
UpdateMergeActionProblems_merging_remote_resources_into_workspace_2=Problems merging remote resources into workspace
CVSAddResolutionGenerator.Add_Resource_to_CVS_1=Add Resource to CVS

Return to bug 30644

Lines 15-21 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java (-41 / +3 lines)
15	import org.eclipse.jface.dialogs.IDialogConstants;	15	import org.eclipse.jface.dialogs.IDialogConstants;
16	import org.eclipse.jface.preference.IPreferenceStore;	16	import org.eclipse.jface.preference.IPreferenceStore;
17	import org.eclipse.jface.preference.PreferencePage;	17	import org.eclipse.jface.preference.PreferencePage;
18	import org.eclipse.jface.resource.JFaceResources;
19	import org.eclipse.swt.SWT;	18	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.layout.GridData;	19	import org.eclipse.swt.layout.GridData;
21	import org.eclipse.swt.layout.GridLayout;	20	import org.eclipse.swt.layout.GridLayout;
Lines 57-64 Link Here
57	data.horizontalAlignment = GridData.FILL;	56	data.horizontalAlignment = GridData.FILL;
58	intro.setLayoutData(data);	57	intro.setLayoutData(data);
59		58
60	new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
61
62	new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$	59	new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$
63	cvsRsh = new Text(composite, SWT.BORDER);	60	cvsRsh = new Text(composite, SWT.BORDER);
64	cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	61	cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Lines 82-100 Link Here
82	}	79	}
83	});	80	});
84		81
85	Label l = new Label(composite, SWT.LEFT \| SWT.BOLD);
86	l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
87	l.setFont(JFaceResources.getBannerFont());
88
89	l = new Label(composite, SWT.LEFT);
90	l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH")); //$NON-NLS-1$
91	data = new GridData();
92	data.horizontalSpan = 2;
93	data.horizontalAlignment = GridData.FILL;
94	l.setLayoutData(data);
95
96	new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
97
98	new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH_Parameters")); //$NON-NLS-1$	82	new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH_Parameters")); //$NON-NLS-1$
99	cvsRshParameters = new Text(composite, SWT.BORDER);	83	cvsRshParameters = new Text(composite, SWT.BORDER);
100	data = new GridData();	84	data = new GridData();
Lines 102-141 Link Here
102	data.horizontalAlignment = GridData.FILL;	86	data.horizontalAlignment = GridData.FILL;
103	cvsRshParameters.setLayoutData(data);	87	cvsRshParameters.setLayoutData(data);
104		88
105	l = new Label(composite, SWT.LEFT \| SWT.BOLD);
106	l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
107	l.setFont(JFaceResources.getBannerFont());
108
109	l = new Label(composite, SWT.LEFT);
110	l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH_Parameters")); //$NON-NLS-1$
111	data = new GridData();
112	data.horizontalSpan = 2;
113	data.horizontalAlignment = GridData.FILL;
114	l.setLayoutData(data);
115
116	new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
117
118	new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$	89	new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$
119	cvsServer = new Text(composite, SWT.BORDER);	90	cvsServer = new Text(composite, SWT.BORDER);
120	data = new GridData();	91	data = new GridData();
121	data.horizontalSpan = 2;	92	data.horizontalSpan = 2;
122	data.horizontalAlignment = GridData.FILL;	93	data.horizontalAlignment = GridData.FILL;
123	cvsServer.setLayoutData(data);	94	cvsServer.setLayoutData(data);
124
125	l = new Label(composite, SWT.LEFT \| SWT.BOLD);
126	l.setText(Policy.bind("ExtMethodPreferencePage_Note__8")); //$NON-NLS-1$
127	l.setFont(JFaceResources.getBannerFont());
128
129	l = new Label(composite, SWT.LEFT);
130	l.setText(Policy.bind("ExtMethodPreferencePage_NoteForCVS_SERVER")); //$NON-NLS-1$
131	data = new GridData();
132	data.horizontalSpan = 2;
133	data.horizontalAlignment = GridData.FILL;
134	l.setLayoutData(data);
135
136		95
137	initializeDefaults();	96	initializeDefaults();
138	WorkbenchHelp.setHelp(composite, IHelpContextIds.EXT_PREFERENCE_PAGE);	97	WorkbenchHelp.setHelp(composite, IHelpContextIds.EXT_PREFERENCE_PAGE);
		98	WorkbenchHelp.setHelp(cvsRsh, IHelpContextIds.EXT_PREFERENCE_RSH);
		99	WorkbenchHelp.setHelp(cvsRshParameters, IHelpContextIds.EXT_PREFERENCE_PARAM);
		100	WorkbenchHelp.setHelp(cvsServer, IHelpContextIds.EXT_PREFERENCE_SERVER);
139	Dialog.applyDialogFont(parent);	101	Dialog.applyDialogFont(parent);
140	return composite;	102	return composite;
141	}	103	}

Lines 715-728 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/messages.properties (-5 lines)
715	ExtMethodPreferencePage_CVS_RSH=CVS_&RSH:	715	ExtMethodPreferencePage_CVS_RSH=CVS_&RSH:
716	ExtMethodPreferencePage_Browse=&Browse...	716	ExtMethodPreferencePage_Browse=&Browse...
717	ExtMethodPreferencePage_Details=Select a program or script	717	ExtMethodPreferencePage_Details=Select a program or script
718	ExtMethodPreferencePage_Note__5=Note:
719	ExtMethodPreferencePage_note_CVS_RSH=This program will be called to connect to the remote CVS server.\nThe RSH command is invoked with following calling pattern:\n<CVS_RSH> <Parameters> <CVS_SERVER>
720	ExtMethodPreferencePage_CVS_RSH_Parameters=&Parameters:	718	ExtMethodPreferencePage_CVS_RSH_Parameters=&Parameters:
721	ExtMethodPreferencePage_Add_Variable=&Add Variable...	719	ExtMethodPreferencePage_Add_Variable=&Add Variable...
722	ExtMethodPreferencePage_note_CVS_RSH_Parameters=The default parameter pattern is {host} -l {user}.\nIt can be tailored using {host}, {user}, {password} and {port}.
723	ExtMethodPreferencePage_CVS_SERVER__7=CVS_&SERVER:	720	ExtMethodPreferencePage_CVS_SERVER__7=CVS_&SERVER:
724	ExtMethodPreferencePage_Note__8=Note:
725	ExtMethodPreferencePage_NoteForCVS_SERVER=This is the name of the remote CVS server program.\nChange this setting only if the remote CVS server name\nis different than the default
726	UpdateMergeActionProblems_merging_remote_resources_into_workspace_1=Problems merging remote resources into workspace	721	UpdateMergeActionProblems_merging_remote_resources_into_workspace_1=Problems merging remote resources into workspace
727	UpdateMergeActionProblems_merging_remote_resources_into_workspace_2=Problems merging remote resources into workspace	722	UpdateMergeActionProblems_merging_remote_resources_into_workspace_2=Problems merging remote resources into workspace
728	CVSAddResolutionGenerator.Add_Resource_to_CVS_1=Add Resource to CVS	723	CVSAddResolutionGenerator.Add_Resource_to_CVS_1=Add Resource to CVS