Attachment 231253 Details for Bug 401518 – Proposed patch

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

[patch] Proposed patch

server-settings-alignment.patch (text/plain), 8.80 KB, created by Ivan Furnadjiev

on 2013-05-21 09:21:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2013-05-21 09:21:01 EDT

Size: 8.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.tools.launch.rwt
>diff --git src/org/eclipse/rap/ui/internal/launch/rwt/tab/ServerSettingsSection.java src/org/eclipse/rap/ui/internal/launch/rwt/tab/ServerSettingsSection.java
>index a425dcc..13d6471 100644
>--- src/org/eclipse/rap/ui/internal/launch/rwt/tab/ServerSettingsSection.java
>+++ src/org/eclipse/rap/ui/internal/launch/rwt/tab/ServerSettingsSection.java
>@@ -37,31 +37,57 @@
>     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, false ) );
>-    cbManualPort = createCheckButton( group, "Use a fixed &port:" );
>+    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( group, SWT.BORDER );
>+    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() );
>-    cbSessionTimeout = new Button( group, SWT.CHECK );
>-    cbSessionTimeout.setText( "Session &timeout [min]:" );
>+  }
>+
>+  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( group, SWT.BORDER );
>+    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() );
>-    cbContextPath = new Button( group, SWT.CHECK );
>-    cbContextPath.setText( "Context pat&h:" );
>+  }
>+
>+  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( group, SWT.BORDER | SWT.SINGLE );
>-    GridDataFactory.fillDefaults().grab( true, false ).applyTo( txtContextPath );
>+    txtContextPath = new Text( composite, SWT.BORDER | SWT.SINGLE );
>     txtContextPath.addModifyListener( new UpdateConfigModifyListener() );
>-    updateEnablement();
>-    setControl( group );
>-    HelpContextIds.assign( getControl(), HelpContextIds.MAIN_TAB );
>+    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 ) {
>#P org.eclipse.rap.tools.launch
>diff --git src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java
>index 67b5879..2c3f0f8 100644
>--- src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java
>+++ src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java
>@@ -100,7 +100,7 @@
>     Composite container = new Composite( parent, SWT.NONE );
>     container.setLayout( new GridLayout() );
>     createBrowserModeSection( container );
>-    createRuntimeSettingsSection( container );
>+    createServerSettingsSection( container );
>     createRAPSettingsSection( container );
>     createDataLocationSection( container );
>     Dialog.applyDialogFont( container );
>@@ -297,33 +297,57 @@
>     GridDataFactory.fillDefaults().grab( true, false ).applyTo( applicationUrlTextField );
>   }
> 
>-  private void createRuntimeSettingsSection( Composite parent ) {
>+  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, false ) );
>-    useFixedPortCheckBox = new Button( group, SWT.CHECK );
>+    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( group, SWT.BORDER );
>+    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 );
>-    useSessionTimeoutCheckBox = new Button( group, SWT.CHECK );
>+  }
>+
>+  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( group, SWT.BORDER );
>+    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 );
>-    contextPathCheckBox = new Button( group, SWT.CHECK );
>+  }
>+
>+  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( group, SWT.BORDER | SWT.SINGLE );
>-    GridDataFactory.fillDefaults().grab( true, false ).applyTo( contextPathTextField );
>+    contextPathTextField = new Text( composite, SWT.BORDER | SWT.SINGLE );
>     contextPathTextField.addModifyListener( modifyListener );
>+    GridDataFactory.fillDefaults()
>+      .grab( true, false )
>+      .indent( 13, 0 )
>+      .applyTo( contextPathTextField );
>   }
> 
>   private void createRAPSettingsSection( Composite parent ) {
>@@ -347,8 +371,8 @@
>     return result;
>   }
> 
>-  private void createRAPSettingsLeftPart( Composite leftPartComposite ) {
>-    developmentModeCheckBox = new Button( leftPartComposite, SWT.CHECK );
>+  private void createRAPSettingsLeftPart( Composite parent ) {
>+    developmentModeCheckBox = new Button( parent, SWT.CHECK );
>     developmentModeCheckBox.setText( LaunchMessages.MainTab_DevelopmentMode );
>     developmentModeCheckBox.addSelectionListener( selectionListener );
>   }

Actions: View | Diff

Attachments on bug 401518: 231253 | 231291