X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerPropertyPage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerPropertyPage.java index c0cb607..377710b 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerPropertyPage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerPropertyPage.java @@ -45,37 +45,45 @@ import org.eclipse.ui.dialogs.PropertyPage; public class CompilerPropertyPage extends PropertyPage { private CompilerConfigurationBlock fConfigurationBlock; + private Control fConfigurationBlockControl; + private ControlEnableState fBlockEnableState; + private SelectionButtonDialogField fUseWorkspaceSettings; + private SelectionButtonDialogField fChangeWorkspaceSettings; + private SelectionButtonDialogField fUseProjectSettings; - private IStatus fBlockStatus; + private IStatus fBlockStatus; public CompilerPropertyPage() { - fBlockStatus= new StatusInfo(); - fBlockEnableState= null; + fBlockStatus = new StatusInfo(); + fBlockEnableState = null; - IDialogFieldListener listener= new IDialogFieldListener() { + IDialogFieldListener listener = new IDialogFieldListener() { public void dialogFieldChanged(DialogField field) { doDialogFieldChanged(field); } }; - fUseWorkspaceSettings= new SelectionButtonDialogField(SWT.RADIO); + fUseWorkspaceSettings = new SelectionButtonDialogField(SWT.RADIO); fUseWorkspaceSettings.setDialogFieldListener(listener); - fUseWorkspaceSettings.setLabelText(PreferencesMessages.getString("CompilerPropertyPage.useworkspacesettings.label")); //$NON-NLS-1$ + fUseWorkspaceSettings.setLabelText(PreferencesMessages + .getString("CompilerPropertyPage.useworkspacesettings.label")); //$NON-NLS-1$ - fChangeWorkspaceSettings= new SelectionButtonDialogField(SWT.PUSH); - fChangeWorkspaceSettings.setLabelText(PreferencesMessages.getString("CompilerPropertyPage.useworkspacesettings.change")); //$NON-NLS-1$ + fChangeWorkspaceSettings = new SelectionButtonDialogField(SWT.PUSH); + fChangeWorkspaceSettings.setLabelText(PreferencesMessages + .getString("CompilerPropertyPage.useworkspacesettings.change")); //$NON-NLS-1$ fChangeWorkspaceSettings.setDialogFieldListener(listener); fUseWorkspaceSettings.attachDialogField(fChangeWorkspaceSettings); - fUseProjectSettings= new SelectionButtonDialogField(SWT.RADIO); + fUseProjectSettings = new SelectionButtonDialogField(SWT.RADIO); fUseProjectSettings.setDialogFieldListener(listener); - fUseProjectSettings.setLabelText(PreferencesMessages.getString("CompilerPropertyPage.useprojectsettings.label")); //$NON-NLS-1$ + fUseProjectSettings.setLabelText(PreferencesMessages + .getString("CompilerPropertyPage.useprojectsettings.label")); //$NON-NLS-1$ } /* @@ -83,42 +91,48 @@ public class CompilerPropertyPage extends PropertyPage { */ public void createControl(Composite parent) { super.createControl(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IJavaHelpContextIds.COMPILER_PROPERTY_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), + IJavaHelpContextIds.COMPILER_PROPERTY_PAGE); } /* * @see org.eclipse.jface.preference.IPreferencePage#createContents(Composite) */ protected Control createContents(Composite parent) { - IStatusChangeListener listener= new IStatusChangeListener() { + IStatusChangeListener listener = new IStatusChangeListener() { public void statusChanged(IStatus status) { - fBlockStatus= status; + fBlockStatus = status; doStatusChanged(); } }; - fConfigurationBlock= new CompilerConfigurationBlock(listener, getProject()); - - Composite composite= new Composite(parent, SWT.NONE); - GridLayout layout= new GridLayout(); - layout.marginHeight= 0; - layout.marginWidth= 0; - layout.numColumns= 2; + fConfigurationBlock = new CompilerConfigurationBlock(listener, + getProject()); + + Composite composite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.marginHeight = 0; + layout.marginWidth = 0; + layout.numColumns = 2; composite.setLayout(layout); fUseWorkspaceSettings.doFillIntoGrid(composite, 1); - LayoutUtil.setHorizontalGrabbing(fUseWorkspaceSettings.getSelectionButton(null)); + LayoutUtil.setHorizontalGrabbing(fUseWorkspaceSettings + .getSelectionButton(null)); fChangeWorkspaceSettings.doFillIntoGrid(composite, 1); fUseProjectSettings.doFillIntoGrid(composite, 2); - GridData data= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL ); - data.horizontalSpan= 2; + GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.VERTICAL_ALIGN_FILL); + data.horizontalSpan = 2; - fConfigurationBlockControl= fConfigurationBlock.createContents(composite); + fConfigurationBlockControl = fConfigurationBlock + .createContents(composite); fConfigurationBlockControl.setLayoutData(data); - boolean useProjectSettings= fConfigurationBlock.hasProjectSpecificOptions(); + boolean useProjectSettings = fConfigurationBlock + .hasProjectSpecificOptions(); fUseProjectSettings.setSelection(useProjectSettings); fUseWorkspaceSettings.setSelection(!useProjectSettings); @@ -134,14 +148,15 @@ public class CompilerPropertyPage extends PropertyPage { private void doDialogFieldChanged(DialogField field) { if (field == fChangeWorkspaceSettings) { - String id= "net.sourceforge.phpdt.ui.preferences.CompilerPreferencePage"; //$NON-NLS-1$ - CompilerPreferencePage page= new CompilerPreferencePage(); + String id = "net.sourceforge.phpdt.ui.preferences.CompilerPreferencePage"; //$NON-NLS-1$ + CompilerPreferencePage page = new CompilerPreferencePage(); showPreferencePage(id, page); } else { updateEnableState(); doStatusChanged(); } } + /** * Method statusChanged. */ @@ -160,11 +175,12 @@ public class CompilerPropertyPage extends PropertyPage { if (useProjectSettings()) { if (fBlockEnableState != null) { fBlockEnableState.restore(); - fBlockEnableState= null; + fBlockEnableState = null; } } else { if (fBlockEnableState == null) { - fBlockEnableState= ControlEnableState.disable(fConfigurationBlockControl); + fBlockEnableState = ControlEnableState + .disable(fConfigurationBlockControl); } } } @@ -198,13 +214,14 @@ public class CompilerPropertyPage extends PropertyPage { PreferenceManager manager = new PreferenceManager(); manager.addToRoot(targetNode); - final PreferenceDialog dialog = new PreferenceDialog(getControl().getShell(), manager); - final boolean [] result = new boolean[] { false }; + final PreferenceDialog dialog = new PreferenceDialog(getControl() + .getShell(), manager); + final boolean[] result = new boolean[] { false }; BusyIndicator.showWhile(getControl().getDisplay(), new Runnable() { public void run() { dialog.create(); dialog.setMessage(targetNode.getLabelText()); - result[0]= (dialog.open() == Window.OK); + result[0] = (dialog.open() == Window.OK); } }); return result[0];