Attachment #23100 for bug #99801




import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.*;
import org.eclipse.ui.forms.HyperlinkSettings;
import org.eclipse.ui.forms.widgets.FormText;

/**
 * Preference page for Tomcat network interface and port.


		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpUIConstants.PREF_PAGE_APPSERVER);

		final Composite mainComposite = new Composite(parent, SWT.NULL);
		mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
		final GridLayout layout = new GridLayout();
		layout.marginHeight = 0;
		layout.marginWidth = 0;
		layout.numColumns = 2;
		mainComposite.setLayout(layout);

		final Label descLabel = new Label(mainComposite, SWT.WRAP);
		descLabel.setText(Messages.AppserverPreferencePage_description); //$NON-NLS-1$
		GridData data = new GridData();
		data.horizontalSpan = 2;
		data.widthHint = 100;
		descLabel.setLayoutData(data);
		descLabel.setFont(font);

		// Spacer
		Label label = new Label(mainComposite, SWT.NONE);
		data = new GridData();
		data.horizontalSpan = 2;
		label.setLayoutData(data);

		label = new Label(mainComposite, SWT.NONE);
		label.setFont(font);
		label.setText(Messages.AppserverPreferencePage_hostDescription); //$NON-NLS-1$
		data = new GridData();
		data.horizontalSpan = 2;
		label.setLayoutData(data);

		//Label labelHost = new Label(mainComposite, SWT.LEFT);
		//labelHost.setText(
		//	WorkbenchResources.getString("AppserverPreferencePage.host"));
		//data = new GridData();
		//labelHost.setLayoutData(data);
		//labelHost.setFont(font);

		textServerAddr = new Text(mainComposite, SWT.SINGLE | SWT.BORDER);
		//text.addListener(SWT.Modify, this);
		data = new GridData(GridData.FILL_HORIZONTAL);
		data.widthHint = convertWidthInCharsToPixels(8);
		data.grabExcessHorizontalSpace = true;
		data.horizontalSpan = 2;
		textServerAddr.setLayoutData(data);
		textServerAddr.setFont(font);

		// Spacer
		label = new Label(mainComposite, SWT.NONE);
		data = new GridData();
		data.horizontalSpan = 2;
		label.setLayoutData(data);
		label.setFont(font);

		label = new Label(mainComposite, SWT.NONE);
		label.setFont(font);
		label.setText(Messages.AppserverPreferencePage_portDescription); //$NON-NLS-1$
		data = new GridData();
		data.horizontalSpan = 2;
		label.setLayoutData(data);
		label.setFont(font);

		//Label labelPort = new Label(mainComposite, SWT.LEFT);
		//labelPort.setText(
		//	WorkbenchResources.getString("AppserverPreferencePage.port"));
		//data = new GridData();
		//labelPort.setLayoutData(data);
		//labelPort.setFont(font);

		textServerPort = new Text(mainComposite, SWT.SINGLE | SWT.BORDER);
		textServerPort.setTextLimit(5);
		data = new GridData(GridData.FILL_HORIZONTAL);
		data.widthHint = convertWidthInCharsToPixels(8);
		data.horizontalAlignment = GridData.FILL;
		data.grabExcessHorizontalSpace = true;
		data.horizontalSpan = 2;
		textServerPort.setLayoutData(data);
		textServerPort.setFont(font);


		data.horizontalSpan = 2;
		label.setLayoutData(data);
		label.setFont(font);
	
		FormText ftext = new FormText(mainComposite, SWT.WRAP);
		ftext.setText(Messages.AppserverPreferencePage_requireRestart, true, false);
		data = new GridData(GridData.GRAB_HORIZONTAL);
		ftext.setHyperlinkSettings(new HyperlinkSettings(mainComposite.getDisplay()));
		data.horizontalSpan = 2;
		data.widthHint = 100;
		ftext.setLayoutData(data);
		ftext.setFont(font);
		final GridData fdata = data;
		mainComposite.addControlListener(new ControlAdapter() {
			public void controlResized(ControlEvent e) {
				GridData ddata = (GridData)descLabel.getLayoutData();
				int width = mainComposite.getSize().x-layout.marginWidth*2;
				fdata.widthHint = width;
				ddata.widthHint = width;
				mainComposite.layout();
			}
		});
		//
		data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
		//data.horizontalSpan = 2;
		label.setLayoutData(data);

		label = new Label(mainComposite, SWT.NONE);
		label.setText(Messages.AppserverPreferencePage_requireRestart); //$NON-NLS-1$
		data = new GridData();
		//data.horizontalSpan = 2;
		label.setLayoutData(data);
		label.setFont(font);

		Preferences pref = AppserverPlugin.getDefault().getPluginPreferences();
		textServerAddr.setText(pref.getString(AppserverPlugin.HOST_KEY));

Lines 35-41 Link Here

(-)src/org/eclipse/help/ui/internal/Messages.java (-1 lines)
35	public static String AppserverPreferencePage_description;	35	public static String AppserverPreferencePage_description;
36	public static String AppserverPreferencePage_hostDescription;	36	public static String AppserverPreferencePage_hostDescription;
37	public static String AppserverPreferencePage_portDescription;	37	public static String AppserverPreferencePage_portDescription;
38	public static String AppserverPreferencePage_Note;
39	public static String AppserverPreferencePage_requireRestart;	38	public static String AppserverPreferencePage_requireRestart;
40	public static String AppserverPreferencePage_invalidPort;	39	public static String AppserverPreferencePage_invalidPort;
41	public static String WW002;	40	public static String WW002;




CustomBrowserPreferencePage_Details = Select a browser program

# AppserverPreferencePage
AppserverPreferencePage_description = Internal Application Server configuration.  The server is used internally \
by help system.
AppserverPreferencePage_hostDescription = &Host name or IP address:
determine
#AppserverPreferencePage.host = &Host:
AppserverPreferencePage_portDescription = Server &port:
#AppserverPreferencePage.port = &Port:
AppserverPreferencePage_requireRestart = <form><p><b>Note:</b> Leave the above fields empty to have the IP address and port number \
dynamically computed by the help system. If the server is already running, these preferences will only take effect\
after restarting.</p></form>
AppserverPreferencePage_invalidPort = Port must be a number in the range 0-65535

# ContextHelpDialog

Return to bug 99801

Lines 18-23 Link Here

(-)src/org/eclipse/help/ui/internal/AppserverPreferencePage.java (-68 / +30 lines)
18	import org.eclipse.swt.layout.*;	18	import org.eclipse.swt.layout.*;
19	import org.eclipse.swt.widgets.*;	19	import org.eclipse.swt.widgets.*;
20	import org.eclipse.ui.*;	20	import org.eclipse.ui.*;
		21	import org.eclipse.ui.forms.HyperlinkSettings;
		22	import org.eclipse.ui.forms.widgets.FormText;
21		23
22	/**	24	/**
23	* Preference page for Tomcat network interface and port.	25	* Preference page for Tomcat network interface and port.
Lines 38-60 Link Here
38		40
39	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpUIConstants.PREF_PAGE_APPSERVER);	41	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpUIConstants.PREF_PAGE_APPSERVER);
40		42
41	Composite mainComposite = new Composite(parent, SWT.NULL);	43	final Composite mainComposite = new Composite(parent, SWT.NULL);
42	mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));	44	mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
43	GridLayout layout = new GridLayout();	45	final GridLayout layout = new GridLayout();
44	layout.marginHeight = 0;	46	layout.marginHeight = 0;
45	layout.marginWidth = 0;	47	layout.marginWidth = 0;
46	layout.numColumns = 2;	48	layout.numColumns = 2;
47	mainComposite.setLayout(layout);	49	mainComposite.setLayout(layout);
48		50
49	Label label = new Label(mainComposite, SWT.NONE);	51	final Label descLabel = new Label(mainComposite, SWT.WRAP);
50	label.setText(Messages.AppserverPreferencePage_description); //$NON-NLS-1$	52	descLabel.setText(Messages.AppserverPreferencePage_description); //$NON-NLS-1$
51	GridData data = new GridData();	53	GridData data = new GridData();
52	data.horizontalSpan = 2;	54	data.horizontalSpan = 2;
53	label.setLayoutData(data);	55	data.widthHint = 100;
54	label.setFont(font);	56	descLabel.setLayoutData(data);
		57	descLabel.setFont(font);
55		58
56	// Spacer	59	// Spacer
57	label = new Label(mainComposite, SWT.NONE);	60	Label label = new Label(mainComposite, SWT.NONE);
58	data = new GridData();	61	data = new GridData();
59	data.horizontalSpan = 2;	62	data.horizontalSpan = 2;
60	label.setLayoutData(data);	63	label.setLayoutData(data);
Lines 63-117 Link Here
63	label = new Label(mainComposite, SWT.NONE);	66	label = new Label(mainComposite, SWT.NONE);
64	label.setFont(font);	67	label.setFont(font);
65	label.setText(Messages.AppserverPreferencePage_hostDescription); //$NON-NLS-1$	68	label.setText(Messages.AppserverPreferencePage_hostDescription); //$NON-NLS-1$
66	data = new GridData();
67	data.horizontalSpan = 2;
68	label.setLayoutData(data);
69
70	//Label labelHost = new Label(mainComposite, SWT.LEFT);
71	//labelHost.setText(
72	// WorkbenchResources.getString("AppserverPreferencePage.host"));
73	//data = new GridData();
74	//labelHost.setLayoutData(data);
75	//labelHost.setFont(font);
76		69
77	textServerAddr = new Text(mainComposite, SWT.SINGLE \| SWT.BORDER);	70	textServerAddr = new Text(mainComposite, SWT.SINGLE \| SWT.BORDER);
78	//text.addListener(SWT.Modify, this);	71	//text.addListener(SWT.Modify, this);
79	data = new GridData();	72	data = new GridData(GridData.FILL_HORIZONTAL);
80	data.horizontalAlignment = GridData.FILL;	73	data.widthHint = convertWidthInCharsToPixels(8);
81	data.grabExcessHorizontalSpace = true;
82	data.horizontalSpan = 2;
83	textServerAddr.setLayoutData(data);	74	textServerAddr.setLayoutData(data);
84	textServerAddr.setFont(font);	75	textServerAddr.setFont(font);
85		76
86	// Spacer
87	label = new Label(mainComposite, SWT.NONE);
88	data = new GridData();
89	data.horizontalSpan = 2;
90	label.setLayoutData(data);
91	label.setFont(font);
92
93	label = new Label(mainComposite, SWT.NONE);	77	label = new Label(mainComposite, SWT.NONE);
94	label.setFont(font);	78	label.setFont(font);
95	label.setText(Messages.AppserverPreferencePage_portDescription); //$NON-NLS-1$	79	label.setText(Messages.AppserverPreferencePage_portDescription); //$NON-NLS-1$
96	data = new GridData();
97	data.horizontalSpan = 2;
98	label.setLayoutData(data);
99	label.setFont(font);
100
101	//Label labelPort = new Label(mainComposite, SWT.LEFT);
102	//labelPort.setText(
103	// WorkbenchResources.getString("AppserverPreferencePage.port"));
104	//data = new GridData();
105	//labelPort.setLayoutData(data);
106	//labelPort.setFont(font);
107		80
108	textServerPort = new Text(mainComposite, SWT.SINGLE \| SWT.BORDER);	81	textServerPort = new Text(mainComposite, SWT.SINGLE \| SWT.BORDER);
109	textServerPort.setTextLimit(5);	82	textServerPort.setTextLimit(5);
110	data = new GridData();	83	data = new GridData(GridData.FILL_HORIZONTAL);
111	data.widthHint = convertWidthInCharsToPixels(8);	84	data.widthHint = convertWidthInCharsToPixels(8);
112	data.horizontalAlignment = GridData.FILL;
113	data.grabExcessHorizontalSpace = true;
114	data.horizontalSpan = 2;
115	textServerPort.setLayoutData(data);	85	textServerPort.setLayoutData(data);
116	textServerPort.setFont(font);	86	textServerPort.setFont(font);
117		87
Lines 147-179 Link Here
147	data.horizontalSpan = 2;	117	data.horizontalSpan = 2;
148	label.setLayoutData(data);	118	label.setLayoutData(data);
149	label.setFont(font);	119	label.setFont(font);
150		120
151	label = new Label(mainComposite, SWT.NONE);	121	FormText ftext = new FormText(mainComposite, SWT.WRAP);
152	label	122	ftext.setText(Messages.AppserverPreferencePage_requireRestart, true, false);
153	.setText(Messages.AppserverPreferencePage_Note); //$NON-NLS-1$	123	data = new GridData(GridData.GRAB_HORIZONTAL);
154	// Make this bold	124	ftext.setHyperlinkSettings(new HyperlinkSettings(mainComposite.getDisplay()));
155	FontData[] fontData = font.getFontData();	125	data.horizontalSpan = 2;
156	for (int i = 0; i < fontData.length; i++) {	126	data.widthHint = 100;
157	fontData[i].setStyle(fontData[i].getStyle() \| SWT.BOLD);	127	ftext.setLayoutData(data);
158	}	128	ftext.setFont(font);
159	final Font boldFont = new Font(label.getDisplay(), fontData);	129	final GridData fdata = data;
160	label.setFont(boldFont);	130	mainComposite.addControlListener(new ControlAdapter() {
161	label.addDisposeListener(new DisposeListener() {	131	public void controlResized(ControlEvent e) {
162	public void widgetDisposed(DisposeEvent e) {	132	GridData ddata = (GridData)descLabel.getLayoutData();
163	boldFont.dispose();	133	int width = mainComposite.getSize().x-layout.marginWidth*2;
		134	fdata.widthHint = width;
		135	ddata.widthHint = width;
		136	mainComposite.layout();
164	}	137	}
165	});	138	});
166	//
167	data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
168	//data.horizontalSpan = 2;
169	label.setLayoutData(data);
170
171	label = new Label(mainComposite, SWT.NONE);
172	label.setText(Messages.AppserverPreferencePage_requireRestart); //$NON-NLS-1$
173	data = new GridData();
174	//data.horizontalSpan = 2;
175	label.setLayoutData(data);
176	label.setFont(font);
177		139
178	Preferences pref = AppserverPlugin.getDefault().getPluginPreferences();	140	Preferences pref = AppserverPlugin.getDefault().getPluginPreferences();
179	textServerAddr.setText(pref.getString(AppserverPlugin.HOST_KEY));	141	textServerAddr.setText(pref.getString(AppserverPlugin.HOST_KEY));

Lines 33-48 Link Here

(-)src/org/eclipse/help/ui/internal/Messages.properties (-7 / +6 lines)
33	CustomBrowserPreferencePage_Details = Select a browser program	33	CustomBrowserPreferencePage_Details = Select a browser program
34		34
35	# AppserverPreferencePage	35	# AppserverPreferencePage
36	AppserverPreferencePage_description = Internal Application Server configuration. The server is used internally\n\	36	AppserverPreferencePage_description = Internal Application Server configuration. The server is used internally \
37	by help system.	37	by help system.
38	AppserverPreferencePage_hostDescription = &Host name or IP address of local machine. Leave blank to automatically\n\	38	AppserverPreferencePage_hostDescription = &Host name or IP address:
39	determine
40	#AppserverPreferencePage.host = &Host:	39	#AppserverPreferencePage.host = &Host:
41	AppserverPreferencePage_portDescription = &Port for server to listen on. Leave blank to dynamically assign	40	AppserverPreferencePage_portDescription = Server &port:
42	#AppserverPreferencePage.port = &Port:	41	#AppserverPreferencePage.port = &Port:
43	AppserverPreferencePage_Note = Note:	42	AppserverPreferencePage_requireRestart = <form><p><b>Note:</b> Leave the above fields empty to have the IP address and port number \
44	AppserverPreferencePage_requireRestart = If the server is already running, these preferences will only take effect\n\	43	dynamically computed by the help system. If the server is already running, these preferences will only take effect\
45	after restarting.	44	after restarting.</p></form>
46	AppserverPreferencePage_invalidPort = Port must be a number in the range 0-65535	45	AppserverPreferencePage_invalidPort = Port must be a number in the range 0-65535
47		46
48	# ContextHelpDialog	47	# ContextHelpDialog