mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-09 01:05:38 +02:00
bug 288032: cleanup, @Overrides
This commit is contained in:
parent
52a34918ad
commit
0c33320268
1 changed files with 18 additions and 11 deletions
|
@ -65,7 +65,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
|
|
||||||
// Add the profile UI contribution.
|
// Add the profile UI contribution.
|
||||||
Group profileGroup = ControlFactory.createGroup(page,
|
Group profileGroup = ControlFactory.createGroup(page,
|
||||||
MakeUIPlugin.getResourceString(PROFILE_GROUP_LABEL), 3);
|
MakeUIPlugin.getResourceString("ScannerConfigOptionsDialog.profile.group.label"), 3); //$NON-NLS-1$
|
||||||
|
|
||||||
GridData gd = (GridData) profileGroup.getLayoutData();
|
GridData gd = (GridData) profileGroup.getLayoutData();
|
||||||
gd.grabExcessHorizontalSpace = true;
|
gd.grabExcessHorizontalSpace = true;
|
||||||
|
@ -80,6 +80,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
((GridData)bopEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true;
|
((GridData)bopEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true;
|
||||||
bopEnabledButton.addSelectionListener(new SelectionAdapter() {
|
bopEnabledButton.addSelectionListener(new SelectionAdapter() {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void widgetSelected(SelectionEvent e) {
|
public void widgetSelected(SelectionEvent e) {
|
||||||
handleModifyOpenFileText();
|
handleModifyOpenFileText();
|
||||||
}
|
}
|
||||||
|
@ -95,6 +96,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
((GridData) bopLoadButton.getLayoutData()).minimumWidth = 120;
|
((GridData) bopLoadButton.getLayoutData()).minimumWidth = 120;
|
||||||
bopLoadButton.addSelectionListener(new SelectionAdapter() {
|
bopLoadButton.addSelectionListener(new SelectionAdapter() {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void widgetSelected(SelectionEvent event) {
|
public void widgetSelected(SelectionEvent event) {
|
||||||
handleBOPLoadFileButtonSelected();
|
handleBOPLoadFileButtonSelected();
|
||||||
}
|
}
|
||||||
|
@ -118,6 +120,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
((GridData) browseButton.getLayoutData()).minimumWidth = 120;
|
((GridData) browseButton.getLayoutData()).minimumWidth = 120;
|
||||||
browseButton.addSelectionListener(new SelectionAdapter() {
|
browseButton.addSelectionListener(new SelectionAdapter() {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void widgetSelected(SelectionEvent event) {
|
public void widgetSelected(SelectionEvent event) {
|
||||||
handleBOPBrowseButtonSelected();
|
handleBOPBrowseButtonSelected();
|
||||||
}
|
}
|
||||||
|
@ -216,6 +219,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
readerJob.setPriority(Job.LONG);
|
readerJob.setPriority(Job.LONG);
|
||||||
readerJob.addJobChangeListener(new JobChangeAdapter() {
|
readerJob.addJobChangeListener(new JobChangeAdapter() {
|
||||||
|
|
||||||
|
@Override
|
||||||
public void done(IJobChangeEvent event) {
|
public void done(IJobChangeEvent event) {
|
||||||
//lock.acquire();
|
//lock.acquire();
|
||||||
synchronized (lock) {
|
synchronized (lock) {
|
||||||
|
@ -248,6 +252,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage#isValid()
|
* @see org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage#isValid()
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
protected boolean isValid() {
|
protected boolean isValid() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -255,6 +260,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage#populateBuildInfo(org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2)
|
* @see org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage#populateBuildInfo(org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2)
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
protected void populateBuildInfo(IScannerConfigBuilderInfo2 buildInfo) {
|
protected void populateBuildInfo(IScannerConfigBuilderInfo2 buildInfo) {
|
||||||
if (buildInfo != null) {
|
if (buildInfo != null) {
|
||||||
buildInfo.setBuildOutputFileActionEnabled(true);
|
buildInfo.setBuildOutputFileActionEnabled(true);
|
||||||
|
@ -267,6 +273,7 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage#restoreFromBuildinfo(org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2)
|
* @see org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage#restoreFromBuildinfo(org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2)
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
protected void restoreFromBuildinfo(IScannerConfigBuilderInfo2 buildInfo) {
|
protected void restoreFromBuildinfo(IScannerConfigBuilderInfo2 buildInfo) {
|
||||||
if (buildInfo != null) {
|
if (buildInfo != null) {
|
||||||
setBopOpenFileText(buildInfo.getBuildOutputFilePath());
|
setBopOpenFileText(buildInfo.getBuildOutputFilePath());
|
||||||
|
@ -277,10 +284,10 @@ public class GCCPerFileSCDProfilePage extends AbstractDiscoveryPage {
|
||||||
private String getProviderIDForSelectedProfile() {
|
private String getProviderIDForSelectedProfile() {
|
||||||
IScannerConfigBuilderInfo2 builderInfo = getContainer().getBuildInfo();
|
IScannerConfigBuilderInfo2 builderInfo = getContainer().getBuildInfo();
|
||||||
// Provider IDs for selected profile
|
// Provider IDs for selected profile
|
||||||
List providerIDs = builderInfo.getProviderIdList();
|
List<String> providerIDs = builderInfo.getProviderIdList();
|
||||||
if(providerIDs.size() == 0)
|
if(providerIDs.size() == 0)
|
||||||
return "";
|
return ""; //$NON-NLS-1$
|
||||||
return (String)providerIDs.iterator().next();
|
return providerIDs.iterator().next();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue