Merge branch 'master' of ssh://git.phpeclipse.com/phpeclipse

[phpeclipse.git] / net.sourceforge.phpeclipse.phphelp / src / net / sourceforge / phpdt / httpquery / preferences / ConfigurationPreferencesDialog.java

diff --git a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationPreferencesDialog.java b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationPreferencesDialog.java
index 98682f7..aeb8d8e 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationPreferencesDialog.java
+++ b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationPreferencesDialog.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
@@ -23,53 +23,55 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
 public class ConfigurationPreferencesDialog extends Dialog {
-  protected IConfigurationWorkingCopy monitor;
+       protected IConfigurationWorkingCopy monitor;
 
-  protected boolean isEdit;
+       protected boolean isEdit;
 
-  /**
-   * @param parentShell
-   */
-  public ConfigurationPreferencesDialog(Shell parentShell, IConfigurationWorkingCopy monitor) {
-    super(parentShell);
-    this.monitor = monitor;
-    isEdit = true;
-  }
+       /**
+        * @param parentShell
+        */
+       public ConfigurationPreferencesDialog(Shell parentShell,
+                       IConfigurationWorkingCopy monitor) {
+               super(parentShell);
+               this.monitor = monitor;
+               isEdit = true;
+       }
 
-  public ConfigurationPreferencesDialog(Shell composite) {
-    super(composite);
-    isEdit = false;
-  }
+       public ConfigurationPreferencesDialog(Shell composite) {
+               super(composite);
+               isEdit = false;
+       }
 
-  protected void configureShell(Shell shell) {
-    super.configureShell(shell);
-    shell.setText(PHPHelpPlugin.getResource("%preferenceTitle"));
-  }
+       protected void configureShell(Shell shell) {
+               super.configureShell(shell);
+               shell.setText(PHPHelpPlugin.getResource("%preferenceTitle"));
+       }
 
-  protected Control createDialogArea(Composite parent) {
-    Composite compositeParent = (Composite) super.createDialogArea(parent);
+       protected Control createDialogArea(Composite parent) {
+               Composite compositeParent = (Composite) super.createDialogArea(parent);
 
-    Composite composite = new Composite(compositeParent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginHeight = convertHorizontalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-    layout.marginWidth = convertVerticalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-    layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-    composite.setLayout(layout);
-    GridData data = new GridData(GridData.FILL_BOTH);
-    composite.setLayoutData(data);
-    //         WorkbenchHelp.setHelp(composite, ContextIds.PREF);
+               Composite composite = new Composite(compositeParent, SWT.NONE);
+               GridLayout layout = new GridLayout();
+               layout.marginHeight = convertHorizontalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+               layout.marginWidth = convertVerticalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+               layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+               composite.setLayout(layout);
+               GridData data = new GridData(GridData.FILL_BOTH);
+               composite.setLayoutData(data);
+               // WorkbenchHelp.setHelp(composite, ContextIds.PREF);
 
-    ConfigurationComposite monitorComp = new ConfigurationComposite(composite, SWT.NONE);
-    data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    monitorComp.setLayoutData(data);
+               ConfigurationComposite monitorComp = new ConfigurationComposite(
+                               composite, SWT.NONE);
+               data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
+               monitorComp.setLayoutData(data);
 
-    Dialog.applyDialogFont(composite);
+               Dialog.applyDialogFont(composite);
 
-    return composite;
-  }
+               return composite;
+       }
 
-  protected void okPressed() {
-       PHPHelpPlugin.getDefault().savePluginPreferences();
-    super.okPressed();
-  }
+       protected void okPressed() {
+               PHPHelpPlugin.getDefault().savePluginPreferences();
+               super.okPressed();
+       }
 }
\ No newline at end of file