diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java index 6980635d6a1..e6933eb3a9a 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java @@ -379,8 +379,8 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr Composite composite = new Composite(parent, SWT.NONE); - LayoutUtil.doDefaultLayout(composite, new DialogField[]{fDiscoveredContainerList}, true); - LayoutUtil.setHorizontalGrabbing(fDiscoveredContainerList.getTreeControl(null)); + LayoutUtil.doDefaultLayout(composite, new DialogField[] { fDiscoveredContainerList }, true); + LayoutUtil.setHorizontalGrabbing(fDiscoveredContainerList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fDiscoveredContainerList.setButtonsMinWidth(buttonBarWidth); diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java index 71805af2aa2..2b525f46afb 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java @@ -130,7 +130,7 @@ public class ExclusionInclusionEntryDialog extends StatusDialog { LayoutUtil.setWidthHint(fExclusionPatternDialog.getLabelControl(null), widthHint); LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2); LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint); - LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null), true); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); applyDialogFont(composite); return composite; diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java index 3c829f15b90..b3165f126e2 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java @@ -96,10 +96,10 @@ public class FileScopePreferencePage extends PreferencePage { inner.setLayoutData(new GridData(GridData.FILL_BOTH)); fInclusionPatternList.doFillIntoGrid(inner, 3); LayoutUtil.setHorizontalSpan(fInclusionPatternList.getLabelControl(null), 2); - LayoutUtil.setHorizontalGrabbing(fInclusionPatternList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fInclusionPatternList.getListControl(null), true); fExclusionPatternList.doFillIntoGrid(inner, 3); LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2); - LayoutUtil.setHorizontalGrabbing(fExclusionPatternList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fExclusionPatternList.getListControl(null), true); setControl(inner); Dialog.applyDialogFont(inner); return inner; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java index b8166c2f110..ba2d6a802bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java @@ -40,7 +40,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; public class CHHistoryListAction extends Action { private class HistoryListDialog extends StatusDialog { - private ListDialogField fHistoryList; private IStatus fHistoryStatus; private ICElement fResult; @@ -81,7 +80,6 @@ public class CHHistoryListAction extends Action { fHistoryList.selectElements(sel); } - /* * @see Dialog#createDialogArea(Composite) @@ -99,7 +97,7 @@ public class CHHistoryListAction extends Action { LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0); LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); - LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null), true); applyDialogFont(composite); return composite; @@ -117,8 +115,7 @@ public class CHHistoryListAction extends Action { okPressed(); } } - - + private void doSelectionChanged() { StatusInfo status= new StatusInfo(); List selected= fHistoryList.getSelectedElements(); @@ -181,6 +178,5 @@ public class CHHistoryListAction extends Action { fView.setInput(dialog.getResult()); } } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java index 23bba8deeb9..6b106db6e20 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java @@ -37,7 +37,6 @@ import org.eclipse.swt.widgets.Composite; */ @Deprecated public class CPathContainerDefaultPage extends NewElementWizardPage implements IPathEntryContainerPage { - private StringDialogField fEntryField; private ArrayList fUsedPaths; @@ -90,7 +89,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I composite.setLayout(layout); fEntryField.doFillIntoGrid(composite, 2); - LayoutUtil.setHorizontalGrabbing(fEntryField.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fEntryField.getTextControl(null), true); fEntryField.setFocus(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java index b2d56d1cf69..2687d72cbc0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java @@ -47,7 +47,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; */ @Deprecated public class CPathContainerEntryPage extends CPathBasePage { - private ListDialogField fCPathList; private ICProject fCurrCProject; @@ -115,7 +114,7 @@ public class CPathContainerEntryPage extends CPathBasePage { Composite composite = new Composite(parent, SWT.NONE); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fContainersList}, true); - LayoutUtil.setHorizontalGrabbing(fContainersList.getTreeControl(null)); + LayoutUtil.setHorizontalGrabbing(fContainersList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fContainersList.setButtonsMinWidth(buttonBarWidth); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java index 9fffe95cc3c..8ec639e44c8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java @@ -76,7 +76,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; */ @Deprecated public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage { - private TreeListDialogField fIncludeSymPathsList; private SelectionButtonDialogField fShowInheritedPaths; private ICProject fCurrCProject; @@ -115,7 +114,6 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage private CPElementGroup fTopGroup; private class IncludeSymbolAdapter implements IDialogFieldListener, ITreeListAdapter { - private final Object[] EMPTY_ARR = new Object[0]; // -------- IListAdapter -------- @@ -210,7 +208,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage composite.setLayoutData(new GridData(GridData.FILL_BOTH)); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fIncludeSymPathsList, fShowInheritedPaths}, true); - LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null)); + LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fIncludeSymPathsList.setButtonsMinWidth(buttonBarWidth); @@ -324,7 +322,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage private void addPathToResourceGroup(CPElement element, CPElementGroup parent, CPElementGroup group) { IPath resPath = element.getPath(); IPath[] exclusions = (IPath[])element.getAttribute(CPElement.EXCLUSION); - if ( (group != parent || !group.getResource().equals(element.getResource())) + if ((group != parent || !group.getResource().equals(element.getResource())) && resPath.isPrefixOf(group.getPath()) && (resPath.equals(group.getPath()) || !CoreModelUtil.isExcludedPath( group.getResource().getFullPath().removeFirstSegments(resPath.segmentCount()), exclusions))) { @@ -436,7 +434,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage } else if (elem instanceof CPElementAttribute) { CPElementAttribute attrib = (CPElementAttribute)elem; if (attrib.getKey().equals(CPElement.EXCLUSION)) { - if ( ((IPath[])attrib.getValue()).length > 0) { + if (((IPath[])attrib.getValue()).length > 0) { return true; } } @@ -451,7 +449,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage CPElement element = (CPElement)elem; CPElementGroup parent = element.getParent(); if (removePathFromResourceGroups(element, fIncludeSymPathsList.getElements()) == null) { - updatePathOnResourceGroups( element.getInherited(), fIncludeSymPathsList.getElements()); + updatePathOnResourceGroups(element.getInherited(), fIncludeSymPathsList.getElements()); } fIncludeSymPathsList.refresh(); fIncludeSymPathsList.selectElements(new StructuredSelection(parent)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java index 936a80b493a..6a441c64cba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java @@ -257,7 +257,7 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB composite.setLayoutData(new GridData(GridData.FILL_BOTH)); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fIncludeSymPathsList, fShowInheritedPaths}, true); - LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null)); + LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fIncludeSymPathsList.setButtonsMinWidth(buttonBarWidth); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java index 81ab28bb446..3ce9f809c7d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java @@ -63,7 +63,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField; */ @Deprecated public class CPathLibraryEntryPage extends CPathBasePage { - private ListDialogField fCPathList; private ICProject fCurrCProject; private IPath fProjPath; @@ -172,7 +171,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { Composite composite = new Composite(parent, SWT.NONE); LayoutUtil.doDefaultLayout(composite, new DialogField[] {fLibrariesList}, true); - LayoutUtil.setHorizontalGrabbing(fLibrariesList.getTreeControl(null)); + LayoutUtil.setHorizontalGrabbing(fLibrariesList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fLibrariesList.setButtonsMinWidth(buttonBarWidth); @@ -185,7 +184,6 @@ public class CPathLibraryEntryPage extends CPathBasePage { } private class LibrariesAdapter implements IDialogFieldListener, ITreeListAdapter { - private final Object[] EMPTY_ARR= new Object[0]; // -------- IListAdapter -------- @@ -559,5 +557,4 @@ public class CPathLibraryEntryPage extends CPathBasePage { } return false; } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java index 7f698689f7a..39ea8d45849 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java @@ -56,7 +56,7 @@ public class CPathOrderExportPage extends CPathBasePage { setControl(composite); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fCPathList}, true); - LayoutUtil.setHorizontalGrabbing(fCPathList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fCPathList.getListControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fCPathList.setButtonsMinWidth(buttonBarWidth); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java index 8eec4ea7dd5..8ec565c4794 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java @@ -136,7 +136,7 @@ public class CPathOutputEntryPage extends CPathBasePage { Composite composite = new Composite(parent, SWT.NONE); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fOutputList}, true); - LayoutUtil.setHorizontalGrabbing(fOutputList.getTreeControl(null)); + LayoutUtil.setHorizontalGrabbing(fOutputList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fOutputList.setButtonsMinWidth(buttonBarWidth); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java index 6198be4b933..f6ea7aa3199 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java @@ -106,7 +106,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { setControl(composite); LayoutUtil.doDefaultLayout(composite, new DialogField[] { fProjectsList}, true); - LayoutUtil.setHorizontalGrabbing(fProjectsList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fProjectsList.getListControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fProjectsList.setButtonsMinWidth(buttonBarWidth); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java index 1de114d6661..393d225fb38 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java @@ -134,7 +134,7 @@ public class CPathSourceEntryPage extends CPathBasePage { Composite composite = new Composite(parent, SWT.NONE); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fFoldersList}, true); - LayoutUtil.setHorizontalGrabbing(fFoldersList.getTreeControl(null)); + LayoutUtil.setHorizontalGrabbing(fFoldersList.getTreeControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(24); fFoldersList.setButtonsMinWidth(buttonBarWidth); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java index c46b731b7e1..e480033ee21 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java @@ -124,7 +124,7 @@ public class ExclusionPatternEntryDialog extends StatusDialog { LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2); LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint); - LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null), true); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); applyDialogFont(composite); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java index 68e86a9ff51..3c6ffd7274a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java @@ -75,7 +75,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; */ @Deprecated public class SourceAttachmentBlock { - private IStatusChangeListener fContext; private StringButtonDialogField fFileNameField; @@ -203,7 +202,7 @@ public class SourceAttachmentBlock { // archive name field fFileNameField.doFillIntoGrid(composite, 4); LayoutUtil.setWidthHint(fFileNameField.getTextControl(null), widthHint); - LayoutUtil.setHorizontalGrabbing(fFileNameField.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fFileNameField.getTextControl(null), true); // aditional 'browse workspace' button for normal jars DialogField.createEmptySpace(composite, 3); @@ -219,7 +218,6 @@ public class SourceAttachmentBlock { } private class SourceAttachmentAdapter implements IStringButtonAdapter, IDialogFieldListener { - // -------- IStringButtonAdapter -------- public void changeControlPressed(DialogField field) { attachmentChangeControlPressed(field); @@ -482,5 +480,4 @@ public class SourceAttachmentBlock { }); return result[0]; } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java index 4ed390a4c1c..2c6fca2322f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java @@ -41,7 +41,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; public class IBHistoryListAction extends Action { private class HistoryListDialog extends StatusDialog { - private ListDialogField fHistoryList; private IStatus fHistoryStatus; private ITranslationUnit fResult; @@ -82,7 +81,6 @@ public class IBHistoryListAction extends Action { fHistoryList.selectElements(sel); } - /* * @see Dialog#createDialogArea(Composite) @@ -100,7 +98,7 @@ public class IBHistoryListAction extends Action { LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0); LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); - LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null), true); applyDialogFont(composite); return composite; @@ -119,7 +117,6 @@ public class IBHistoryListAction extends Action { } } - private void doSelectionChanged() { StatusInfo status= new StatusInfo(); List selected= fHistoryList.getSelectedElements(); @@ -160,7 +157,6 @@ public class IBHistoryListAction extends Action { setShellStyle(getShellStyle() | SWT.RESIZE); super.create(); } - } private IBViewPart fView; @@ -182,6 +178,5 @@ public class IBHistoryListAction extends Action { fView.setInput(dialog.getResult()); } } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java index 159de1e6216..2bb8834c739 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java @@ -111,7 +111,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement fUseProjectSettings.setDialogFieldListener(listener); fUseProjectSettings.setLabelText(PreferencesMessages.PropertyAndPreferencePage_useprojectsettings_label); fUseProjectSettings.doFillIntoGrid(composite, 1); - LayoutUtil.setHorizontalGrabbing(fUseProjectSettings.getSelectionButton(null)); + LayoutUtil.setHorizontalGrabbing(fUseProjectSettings.getSelectionButton(null), true); if (offerLink()) { fChangeWorkspaceSettings= createLink(composite, PreferencesMessages.PropertyAndPreferencePage_useworkspacesettings_change); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java index fd74cd35acf..18722bff8b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java @@ -128,7 +128,7 @@ public class TodoTaskInputDialog extends StatusDialog { fNameDialogField.doFillIntoGrid(inner, 2); fPriorityDialogField.doFillIntoGrid(inner, 2); - LayoutUtil.setHorizontalGrabbing(fNameDialogField.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fNameDialogField.getTextControl(null), true); LayoutUtil.setWidthHint(fNameDialogField.getTextControl(null), convertWidthInCharsToPixels(45)); fNameDialogField.postSetFocusOnDialogField(parent.getDisplay()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java index 81391ee6717..6f92d73b818 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java @@ -40,7 +40,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; public class THHistoryListAction extends Action { private class HistoryListDialog extends StatusDialog { - private ListDialogField fHistoryList; private IStatus fHistoryStatus; private ICElement fResult; @@ -81,7 +80,6 @@ public class THHistoryListAction extends Action { fHistoryList.selectElements(sel); } - /* * @see Dialog#createDialogArea(Composite) @@ -99,7 +97,7 @@ public class THHistoryListAction extends Action { LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0); LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); - LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null), true); applyDialogFont(composite); return composite; @@ -117,8 +115,7 @@ public class THHistoryListAction extends Action { okPressed(); } } - - + private void doSelectionChanged() { StatusInfo status= new StatusInfo(); List selected= fHistoryList.getSelectedElements(); @@ -159,7 +156,6 @@ public class THHistoryListAction extends Action { setShellStyle(getShellStyle() | SWT.RESIZE); super.create(); } - } private THViewPart fView; @@ -181,6 +177,5 @@ public class THHistoryListAction extends Action { fView.setInput(dialog.getResult(), null); } } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java index e5e9c73eca5..f9da1a39766 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2008 IBM Corporation and others. + * Copyright (c) 2001, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Rational Software - initial implementation * Markus Schorn (Wind River Systems) + * Sergey Prigogin (Google) *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.dialogfields; @@ -19,7 +20,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Layout; public class LayoutUtil { - /** * Calculates the number of columns needed by field editors */ @@ -153,9 +153,28 @@ public class LayoutUtil { * Makes a control grab all available horizontal space. Assumes that GridData is used. */ public static void setHorizontalGrabbing(Control control) { + setHorizontalGrabbing(control, true); + } + + /** + * Makes a control grab all available horizontal space. Assumes that GridData is used. + * @param value true to grab, false not to grab + */ + public static void setHorizontalGrabbing(Control control, boolean value) { Object ld= control.getLayoutData(); if (ld instanceof GridData) { - ((GridData) ld).grabExcessHorizontalSpace= true; + ((GridData) ld).grabExcessHorizontalSpace= value; + } + } + + /** + * Makes a control grab all available horizontal space. Assumes that GridData is used. + * @param value true to grab, false not to grab + */ + public static void setVerticalGrabbing(Control control, boolean value) { + Object ld= control.getLayoutData(); + if (ld instanceof GridData) { + ((GridData) ld).grabExcessVerticalSpace= value; } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java index a34dd9895aa..4d21e9ea008 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java @@ -82,7 +82,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFie import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; public class NewSourceFolderWizardPage extends NewElementWizardPage { - private static final String PAGE_NAME= "NewSourceFolderWizardPage"; //$NON-NLS-1$ private StringButtonDialogField fProjectField; @@ -185,7 +184,6 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { fProjectField.setText(projPath); fRootDialogField.setText(""); //$NON-NLS-1$ } - // -------- UI Creation --------- @@ -209,7 +207,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { int maxFieldWidth= convertWidthInCharsToPixels(40); LayoutUtil.setWidthHint(fProjectField.getTextControl(null), maxFieldWidth); - LayoutUtil.setHorizontalGrabbing(fProjectField.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fProjectField.getTextControl(null), true); LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth); // Bug #220003 : consistency between New Source Folder dialog and Source Location Property tab. @@ -245,6 +243,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { packRootDialogFieldChanged(field); } } + protected void packRootChangeControlPressed(DialogField field) { if (field == fRootDialogField) { IPath initialPath= new Path(fRootDialogField.getText()); @@ -275,8 +274,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { } updateStatus(new IStatus[] { fProjectStatus, fRootStatus }); } - - + private void updateProjectStatus() { fCurrCProject= null; fIsProjectAsSourceFolder= false; @@ -522,5 +520,4 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { } return null; } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index f3f7bcaad42..1b63765a6f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { - private static final String PREFIX = "ErrorParserBlock"; //$NON-NLS-1$ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ private static final String DESC = PREFIX + ".desc"; //$NON-NLS-1$ @@ -280,7 +279,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { fErrorParserList.setUncheckAllButtonIndex(4); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fErrorParserList}, true); - LayoutUtil.setHorizontalGrabbing(fErrorParserList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fErrorParserList.getListControl(null), true); initializeValues(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 53eb77ad978..2914de9da1f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -58,7 +58,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField; */ @Deprecated public class BinaryParserBlock extends AbstractBinaryParserPage { - private static final int DEFAULT_HEIGHT = 160; private static final String PREFIX = "BinaryParserBlock"; //$NON-NLS-1$ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ @@ -75,8 +74,8 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { protected List initialSelected; protected class BinaryParserConfiguration { - IExtension fExtension; + public BinaryParserConfiguration(IExtension extension) { fExtension = extension; } @@ -104,7 +103,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { } protected class BinaryParserLabelProvider extends LabelProvider { - @Override public String getText(Object element) { return ((BinaryParserConfiguration) element).getName(); @@ -129,7 +127,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { public void doubleClicked(ListDialogField field) { } - }; binaryList = new CheckedListDialogField(listAdapter, buttonLabels, new BinaryParserLabelProvider()) { @@ -198,7 +195,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { Composite listComposite = ControlFactory.createComposite(composite, 1); LayoutUtil.doDefaultLayout(listComposite, new DialogField[]{binaryList}, true); - LayoutUtil.setHorizontalGrabbing(binaryList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(binaryList.getListControl(null), true); int buttonBarWidth = converter.convertWidthInCharsToPixels(15); binaryList.setButtonsMinWidth(buttonBarWidth); @@ -218,7 +215,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { // fire a change event, to quick start. handleBinaryParserChanged(); parent.layout(true); - } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java index 38ed79374c9..31d214c4621 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java @@ -50,7 +50,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; */ public class CHelpConfigurationPropertyPage extends PropertyPage implements IWorkbenchPreferencePage { - private CHelpSettingsDisplay fCHelpSettingsDisplay; private class CHelpBookListLabelProvider extends LabelProvider { @@ -103,7 +102,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements Composite composite= new Composite(parent, SWT.NONE); LayoutUtil.doDefaultLayout(composite, new DialogField[] { fCHelpBookList }, true); - LayoutUtil.setHorizontalGrabbing(fCHelpBookList.getListControl(null)); + LayoutUtil.setHorizontalGrabbing(fCHelpBookList.getListControl(null), true); int buttonBarWidth= converter.convertWidthInCharsToPixels(24); fCHelpBookList.setButtonsMinWidth(buttonBarWidth); @@ -189,5 +188,4 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements // TODO Auto-generated method stub } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java index 384113e585e..243d4791b95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java @@ -53,7 +53,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; * @noextend This class is not intended to be subclassed by clients. */ public class ExPatternEntryDialog extends StatusDialog { - private StringButtonDialogField fExclusionPatternDialog; private StatusInfo fExclusionPatternStatus; @@ -124,7 +123,7 @@ public class ExPatternEntryDialog extends StatusDialog { LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2); LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint); - LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); + LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null), true); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); applyDialogFont(composite); @@ -237,5 +236,4 @@ public class ExPatternEntryDialog extends StatusDialog { } return null; } - }