Attachment #231253 for bug #401518

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




    Group group = new Group( parent, SWT.NONE );
    group.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );
    group.setText( "Server Settings" );
    group.setLayout( new GridLayout( 2, true ) );
    createFixedPortPart( group );
    createSessionTimeoutPart( group );
    createContextPathPart( group );
    updateEnablement();
    setControl( group );
    HelpContextIds.assign( getControl(), HelpContextIds.MAIN_TAB );
  }

  private void createFixedPortPart( Group group ) {
    Composite composite = new Composite( group, SWT.NONE );
    composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
    GridDataFactory.fillDefaults().grab( true, false ).applyTo( composite );
    cbManualPort = createCheckButton( composite, "Use a fixed &port:" );
    cbManualPort.addSelectionListener( new UpdateConfigSelectionListener() );
    spnPort = new Spinner( composite, SWT.BORDER );
    spnPort.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
    spnPort.setMinimum( RWTLaunchConfig.MIN_PORT_NUMBER );
    spnPort.setMaximum( RWTLaunchConfig.MAX_PORT_NUMBER );
    spnPort.addModifyListener( new UpdateConfigModifyListener() );
  }

  private void createSessionTimeoutPart( Group group ) {
    Composite composite = new Composite( group, SWT.NONE );
    composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
    GridDataFactory.fillDefaults().grab( true, false ).indent( 15, 0 ).applyTo( composite );
    cbSessionTimeout = createCheckButton( composite, "Session &timeout [min]:" );
    cbSessionTimeout.addSelectionListener( new UpdateConfigSelectionListener() );
    spnSessionTimeout = new Spinner( composite, SWT.BORDER );
    spnSessionTimeout.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
    spnSessionTimeout.setMinimum( RWTLaunchConfig.MIN_SESSION_TIMEOUT );
    spnSessionTimeout.setMaximum( RWTLaunchConfig.MAX_SESSION_TIMEOUT );
    spnSessionTimeout.addModifyListener( new UpdateConfigModifyListener() );
  }

  private void createContextPathPart( Group group ) {
    Composite composite = new Composite( group, SWT.NONE );
    composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
    GridDataFactory.fillDefaults().grab( true, false ).span( 2, 1 ).applyTo( composite );
    cbContextPath = createCheckButton( composite, "Context pat&h:" );
    cbContextPath.addSelectionListener( new UpdateConfigSelectionListener() );
    txtContextPath = new Text( composite, SWT.BORDER | SWT.SINGLE );
    GridDataFactory.fillDefaults().grab( true, false ).applyTo( txtContextPath );
    txtContextPath.addModifyListener( new UpdateConfigModifyListener() );
    GridDataFactory.fillDefaults().grab( true, false ).indent( 13, 0 ).applyTo( txtContextPath );
  }

  private GridLayout createGridLayoutWithoutMargin( int numColumns ) {
    GridLayout result = new GridLayout( numColumns, false );
    result.marginHeight = 0;
    result.marginWidth = 0;
    return result;
  }

  public void initializeFrom( RWTLaunchConfig launchConfig ) {




    Composite container = new Composite( parent, SWT.NONE );
    container.setLayout( new GridLayout() );
    createBrowserModeSection( container );
    createServerSettingsSection( container );
    createRAPSettingsSection( container );
    createDataLocationSection( container );
    Dialog.applyDialogFont( container );

    GridDataFactory.fillDefaults().grab( true, false ).applyTo( applicationUrlTextField );
  }

  private void createServerSettingsSection( Composite parent ) {
    Group group = new Group( parent, SWT.NONE );
    group.setLayoutData( fillHorizontal.create() );
    group.setText( LaunchMessages.MainTab_ServerSettings );
    group.setLayout( new GridLayout( 2, true ) );
    createServerSettingsFixedPortPart( group );
    createServerSettingsSessionTimeoutPart( group );
    createServerSettingsContextPathPart( group );
  }

  private void createServerSettingsFixedPortPart( Group group ) {
    Composite composite = new Composite( group, SWT.NONE );
    composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
    GridDataFactory.fillDefaults().grab( true, false ).applyTo( composite );
    useFixedPortCheckBox = new Button( composite, SWT.CHECK );
    useFixedPortCheckBox.setText( LaunchMessages.MainTab_ManualPortConfig );
    useFixedPortCheckBox.addSelectionListener( selectionListener );
    portSpinner = new Spinner( composite, SWT.BORDER );
    portSpinner.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
    portSpinner.setMinimum( RAPLaunchConfig.MIN_PORT_NUMBER );
    portSpinner.setMaximum( RAPLaunchConfig.MAX_PORT_NUMBER );
    portSpinner.addModifyListener( modifyListener );
  }

  private void createServerSettingsSessionTimeoutPart( Group group ) {
    Composite composite = new Composite( group, SWT.NONE );
    composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
    GridDataFactory.fillDefaults().grab( true, false ).indent( 15, 0 ).applyTo( composite );
    useSessionTimeoutCheckBox = new Button( composite, SWT.CHECK );
    useSessionTimeoutCheckBox.setText( LaunchMessages.MainTab_ManualTimeoutConfig );
    useSessionTimeoutCheckBox.addSelectionListener( selectionListener );
    sessionTimeoutSpinner = new Spinner( composite, SWT.BORDER );
    sessionTimeoutSpinner.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
    sessionTimeoutSpinner.setMinimum( RAPLaunchConfig.MIN_SESSION_TIMEOUT );
    sessionTimeoutSpinner.setMaximum( RAPLaunchConfig.MAX_SESSION_TIMEOUT );
    sessionTimeoutSpinner.addModifyListener( modifyListener );
  }

  private void createServerSettingsContextPathPart( Group group ) {
    Composite composite = new Composite( group, SWT.NONE );
    composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
    GridDataFactory.fillDefaults().grab( true, false ).span( 2, 1 ).applyTo( composite );
    contextPathCheckBox = new Button( composite, SWT.CHECK );
    contextPathCheckBox.setText( LaunchMessages.MainTab_ManualContextPath );
    contextPathCheckBox.addSelectionListener( selectionListener );
    contextPathTextField = new Text( composite, SWT.BORDER | SWT.SINGLE );
    GridDataFactory.fillDefaults().grab( true, false ).applyTo( contextPathTextField );
    contextPathTextField.addModifyListener( modifyListener );
    GridDataFactory.fillDefaults()
      .grab( true, false )
      .indent( 13, 0 )
      .applyTo( contextPathTextField );
  }

  private void createRAPSettingsSection( Composite parent ) {

    return result;
  }

  private void createRAPSettingsLeftPart( Composite parent ) {
    developmentModeCheckBox = new Button( parent, SWT.CHECK );
    developmentModeCheckBox.setText( LaunchMessages.MainTab_DevelopmentMode );
    developmentModeCheckBox.addSelectionListener( selectionListener );
  }

Return to bug 401518

Lines 37-67 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/rwt/tab/ServerSettingsSection.java (-13 / +39 lines)
37	Group group = new Group( parent, SWT.NONE );	37	Group group = new Group( parent, SWT.NONE );
38	group.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );	38	group.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );
39	group.setText( "Server Settings" );	39	group.setText( "Server Settings" );
40	group.setLayout( new GridLayout( 2, false ) );	40	group.setLayout( new GridLayout( 2, true ) );
41	cbManualPort = createCheckButton( group, "Use a fixed &port:" );	41	createFixedPortPart( group );
		42	createSessionTimeoutPart( group );
		43	createContextPathPart( group );
		44	updateEnablement();
		45	setControl( group );
		46	HelpContextIds.assign( getControl(), HelpContextIds.MAIN_TAB );
		47	}
		48
		49	private void createFixedPortPart( Group group ) {
		50	Composite composite = new Composite( group, SWT.NONE );
		51	composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
		52	GridDataFactory.fillDefaults().grab( true, false ).applyTo( composite );
		53	cbManualPort = createCheckButton( composite, "Use a fixed &port:" );
42	cbManualPort.addSelectionListener( new UpdateConfigSelectionListener() );	54	cbManualPort.addSelectionListener( new UpdateConfigSelectionListener() );
43	spnPort = new Spinner( group, SWT.BORDER );	55	spnPort = new Spinner( composite, SWT.BORDER );
44	spnPort.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );	56	spnPort.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
45	spnPort.setMinimum( RWTLaunchConfig.MIN_PORT_NUMBER );	57	spnPort.setMinimum( RWTLaunchConfig.MIN_PORT_NUMBER );
46	spnPort.setMaximum( RWTLaunchConfig.MAX_PORT_NUMBER );	58	spnPort.setMaximum( RWTLaunchConfig.MAX_PORT_NUMBER );
47	spnPort.addModifyListener( new UpdateConfigModifyListener() );	59	spnPort.addModifyListener( new UpdateConfigModifyListener() );
48	cbSessionTimeout = new Button( group, SWT.CHECK );	60	}
49	cbSessionTimeout.setText( "Session &timeout [min]:" );	61
		62	private void createSessionTimeoutPart( Group group ) {
		63	Composite composite = new Composite( group, SWT.NONE );
		64	composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
		65	GridDataFactory.fillDefaults().grab( true, false ).indent( 15, 0 ).applyTo( composite );
		66	cbSessionTimeout = createCheckButton( composite, "Session &timeout [min]:" );
50	cbSessionTimeout.addSelectionListener( new UpdateConfigSelectionListener() );	67	cbSessionTimeout.addSelectionListener( new UpdateConfigSelectionListener() );
51	spnSessionTimeout = new Spinner( group, SWT.BORDER );	68	spnSessionTimeout = new Spinner( composite, SWT.BORDER );
52	spnSessionTimeout.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );	69	spnSessionTimeout.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
53	spnSessionTimeout.setMinimum( RWTLaunchConfig.MIN_SESSION_TIMEOUT );	70	spnSessionTimeout.setMinimum( RWTLaunchConfig.MIN_SESSION_TIMEOUT );
54	spnSessionTimeout.setMaximum( RWTLaunchConfig.MAX_SESSION_TIMEOUT );	71	spnSessionTimeout.setMaximum( RWTLaunchConfig.MAX_SESSION_TIMEOUT );
55	spnSessionTimeout.addModifyListener( new UpdateConfigModifyListener() );	72	spnSessionTimeout.addModifyListener( new UpdateConfigModifyListener() );
56	cbContextPath = new Button( group, SWT.CHECK );	73	}
57	cbContextPath.setText( "Context pat&h:" );	74
		75	private void createContextPathPart( Group group ) {
		76	Composite composite = new Composite( group, SWT.NONE );
		77	composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
		78	GridDataFactory.fillDefaults().grab( true, false ).span( 2, 1 ).applyTo( composite );
		79	cbContextPath = createCheckButton( composite, "Context pat&h:" );
58	cbContextPath.addSelectionListener( new UpdateConfigSelectionListener() );	80	cbContextPath.addSelectionListener( new UpdateConfigSelectionListener() );
59	txtContextPath = new Text( group, SWT.BORDER \| SWT.SINGLE );	81	txtContextPath = new Text( composite, SWT.BORDER \| SWT.SINGLE );
60	GridDataFactory.fillDefaults().grab( true, false ).applyTo( txtContextPath );
61	txtContextPath.addModifyListener( new UpdateConfigModifyListener() );	82	txtContextPath.addModifyListener( new UpdateConfigModifyListener() );
62	updateEnablement();	83	GridDataFactory.fillDefaults().grab( true, false ).indent( 13, 0 ).applyTo( txtContextPath );
63	setControl( group );	84	}
64	HelpContextIds.assign( getControl(), HelpContextIds.MAIN_TAB );	85
		86	private GridLayout createGridLayoutWithoutMargin( int numColumns ) {
		87	GridLayout result = new GridLayout( numColumns, false );
		88	result.marginHeight = 0;
		89	result.marginWidth = 0;
		90	return result;
65	}	91	}
66		92
67	public void initializeFrom( RWTLaunchConfig launchConfig ) {	93	public void initializeFrom( RWTLaunchConfig launchConfig ) {

Lines 100-106 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java (-12 / +36 lines)
100	Composite container = new Composite( parent, SWT.NONE );	100	Composite container = new Composite( parent, SWT.NONE );
101	container.setLayout( new GridLayout() );	101	container.setLayout( new GridLayout() );
102	createBrowserModeSection( container );	102	createBrowserModeSection( container );
103	createRuntimeSettingsSection( container );	103	createServerSettingsSection( container );
104	createRAPSettingsSection( container );	104	createRAPSettingsSection( container );
105	createDataLocationSection( container );	105	createDataLocationSection( container );
106	Dialog.applyDialogFont( container );	106	Dialog.applyDialogFont( container );
Lines 297-329 Link Here
297	GridDataFactory.fillDefaults().grab( true, false ).applyTo( applicationUrlTextField );	297	GridDataFactory.fillDefaults().grab( true, false ).applyTo( applicationUrlTextField );
298	}	298	}
299		299
300	private void createRuntimeSettingsSection( Composite parent ) {	300	private void createServerSettingsSection( Composite parent ) {
301	Group group = new Group( parent, SWT.NONE );	301	Group group = new Group( parent, SWT.NONE );
302	group.setLayoutData( fillHorizontal.create() );	302	group.setLayoutData( fillHorizontal.create() );
303	group.setText( LaunchMessages.MainTab_ServerSettings );	303	group.setText( LaunchMessages.MainTab_ServerSettings );
304	group.setLayout( new GridLayout( 2, false ) );	304	group.setLayout( new GridLayout( 2, true ) );
305	useFixedPortCheckBox = new Button( group, SWT.CHECK );	305	createServerSettingsFixedPortPart( group );
		306	createServerSettingsSessionTimeoutPart( group );
		307	createServerSettingsContextPathPart( group );
		308	}
		309
		310	private void createServerSettingsFixedPortPart( Group group ) {
		311	Composite composite = new Composite( group, SWT.NONE );
		312	composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
		313	GridDataFactory.fillDefaults().grab( true, false ).applyTo( composite );
		314	useFixedPortCheckBox = new Button( composite, SWT.CHECK );
306	useFixedPortCheckBox.setText( LaunchMessages.MainTab_ManualPortConfig );	315	useFixedPortCheckBox.setText( LaunchMessages.MainTab_ManualPortConfig );
307	useFixedPortCheckBox.addSelectionListener( selectionListener );	316	useFixedPortCheckBox.addSelectionListener( selectionListener );
308	portSpinner = new Spinner( group, SWT.BORDER );	317	portSpinner = new Spinner( composite, SWT.BORDER );
309	portSpinner.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );	318	portSpinner.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
310	portSpinner.setMinimum( RAPLaunchConfig.MIN_PORT_NUMBER );	319	portSpinner.setMinimum( RAPLaunchConfig.MIN_PORT_NUMBER );
311	portSpinner.setMaximum( RAPLaunchConfig.MAX_PORT_NUMBER );	320	portSpinner.setMaximum( RAPLaunchConfig.MAX_PORT_NUMBER );
312	portSpinner.addModifyListener( modifyListener );	321	portSpinner.addModifyListener( modifyListener );
313	useSessionTimeoutCheckBox = new Button( group, SWT.CHECK );	322	}
		323
		324	private void createServerSettingsSessionTimeoutPart( Group group ) {
		325	Composite composite = new Composite( group, SWT.NONE );
		326	composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
		327	GridDataFactory.fillDefaults().grab( true, false ).indent( 15, 0 ).applyTo( composite );
		328	useSessionTimeoutCheckBox = new Button( composite, SWT.CHECK );
314	useSessionTimeoutCheckBox.setText( LaunchMessages.MainTab_ManualTimeoutConfig );	329	useSessionTimeoutCheckBox.setText( LaunchMessages.MainTab_ManualTimeoutConfig );
315	useSessionTimeoutCheckBox.addSelectionListener( selectionListener );	330	useSessionTimeoutCheckBox.addSelectionListener( selectionListener );
316	sessionTimeoutSpinner = new Spinner( group, SWT.BORDER );	331	sessionTimeoutSpinner = new Spinner( composite, SWT.BORDER );
317	sessionTimeoutSpinner.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );	332	sessionTimeoutSpinner.setLayoutData( new GridData( SWT.FILL, SWT.DEFAULT, true, false ) );
318	sessionTimeoutSpinner.setMinimum( RAPLaunchConfig.MIN_SESSION_TIMEOUT );	333	sessionTimeoutSpinner.setMinimum( RAPLaunchConfig.MIN_SESSION_TIMEOUT );
319	sessionTimeoutSpinner.setMaximum( RAPLaunchConfig.MAX_SESSION_TIMEOUT );	334	sessionTimeoutSpinner.setMaximum( RAPLaunchConfig.MAX_SESSION_TIMEOUT );
320	sessionTimeoutSpinner.addModifyListener( modifyListener );	335	sessionTimeoutSpinner.addModifyListener( modifyListener );
321	contextPathCheckBox = new Button( group, SWT.CHECK );	336	}
		337
		338	private void createServerSettingsContextPathPart( Group group ) {
		339	Composite composite = new Composite( group, SWT.NONE );
		340	composite.setLayout( createGridLayoutWithoutMargin( 2 ) );
		341	GridDataFactory.fillDefaults().grab( true, false ).span( 2, 1 ).applyTo( composite );
		342	contextPathCheckBox = new Button( composite, SWT.CHECK );
322	contextPathCheckBox.setText( LaunchMessages.MainTab_ManualContextPath );	343	contextPathCheckBox.setText( LaunchMessages.MainTab_ManualContextPath );
323	contextPathCheckBox.addSelectionListener( selectionListener );	344	contextPathCheckBox.addSelectionListener( selectionListener );
324	contextPathTextField = new Text( group, SWT.BORDER \| SWT.SINGLE );	345	contextPathTextField = new Text( composite, SWT.BORDER \| SWT.SINGLE );
325	GridDataFactory.fillDefaults().grab( true, false ).applyTo( contextPathTextField );
326	contextPathTextField.addModifyListener( modifyListener );	346	contextPathTextField.addModifyListener( modifyListener );
		347	GridDataFactory.fillDefaults()
		348	.grab( true, false )
		349	.indent( 13, 0 )
		350	.applyTo( contextPathTextField );
327	}	351	}
328		352
329	private void createRAPSettingsSection( Composite parent ) {	353	private void createRAPSettingsSection( Composite parent ) {
Lines 347-354 Link Here
347	return result;	371	return result;
348	}	372	}
349		373
350	private void createRAPSettingsLeftPart( Composite leftPartComposite ) {	374	private void createRAPSettingsLeftPart( Composite parent ) {
351	developmentModeCheckBox = new Button( leftPartComposite, SWT.CHECK );	375	developmentModeCheckBox = new Button( parent, SWT.CHECK );
352	developmentModeCheckBox.setText( LaunchMessages.MainTab_DevelopmentMode );	376	developmentModeCheckBox.setText( LaunchMessages.MainTab_DevelopmentMode );
353	developmentModeCheckBox.addSelectionListener( selectionListener );	377	developmentModeCheckBox.addSelectionListener( selectionListener );
354	}	378	}