mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

bug 288032: [Scanner Discovery] One can't change arguments of scanner discovery command

Browse source 
Added disablement of command and arguments when checkbox is disabled
This commit is contained in:
Andrew Gvozdev 2009-08-31 00:39:53 +00:00
parent 622b077bbf
commit 6c7528057e
1 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/GCCPerProjectSCDProfilePage.java
View file

@ -82,7 +82,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
((GridData)bopEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true; ((GridData)bopEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true;
bopEnabledButton.addSelectionListener(new SelectionAdapter() { bopEnabledButton.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleModifyOpenFileText(); handleModifyOpenFileText();
} }
}); });
@ -96,7 +96,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
((GridData) bopLoadButton.getLayoutData()).minimumWidth = 120; ((GridData) bopLoadButton.getLayoutData()).minimumWidth = 120;
bopLoadButton.addSelectionListener(new SelectionAdapter() { bopLoadButton.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent event) { public void widgetSelected(SelectionEvent event) {
handleBOPLoadFileButtonSelected(); handleBOPLoadFileButtonSelected();
} }
}); });
@ -119,7 +119,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
browseButton.addSelectionListener(new SelectionAdapter() { browseButton.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent event) { public void widgetSelected(SelectionEvent event) {
handleBOPBrowseButtonSelected(); handleBOPBrowseButtonSelected();
} }
@ -129,7 +129,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
String fileName = getBopOpenFileText(); String fileName = getBopOpenFileText();
IPath filterPath; IPath filterPath;
if (fileName.length() == 0 && getContainer().getProject() != null) { if (fileName.length() == 0 && getContainer().getProject() != null) {
filterPath = getContainer().getProject().getLocation(); filterPath = getContainer().getProject().getLocation();
} }
else { else {
IPath filePath = new Path(fileName); IPath filePath = new Path(fileName);
@ -154,8 +154,8 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
((GridData)sipEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true; ((GridData)sipEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true;
sipEnabledButton.addSelectionListener(new SelectionAdapter() { sipEnabledButton.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
// bopLoadButton.setEnabled(sipEnabledButton.getSelection()); handleSIPEnabledButtonSelected();
} }
}); });
@ -177,7 +177,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
siBrowseButton.addSelectionListener(new SelectionAdapter() { siBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent event) { public void widgetSelected(SelectionEvent event) {
handleSIPBrowseButtonSelected(); handleSIPBrowseButtonSelected();
} }
@ -218,6 +218,8 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
instance = this; instance = this;
} }
initializeValues(); initializeValues();
handleSIPEnabledButtonSelected();
} }
protected boolean handleModifyOpenFileText() { protected boolean handleModifyOpenFileText() {
@ -236,7 +238,12 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
} }
protected void handleModifyRunArgsText() { protected void handleModifyRunArgsText() {
getContainer().updateContainer(); getContainer().updateContainer();
}
protected void handleSIPEnabledButtonSelected() {
sipRunCommandText.setEnabled(sipEnabledButton.getSelection());
sipRunArgsText.setEnabled(sipEnabledButton.getSelection());
} }
private String getBopOpenFileText() { private String getBopOpenFileText() {
@ -274,10 +281,10 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
} }
private void initializeValues() { private void initializeValues() {
IScannerConfigBuilderInfo2 builderInfo = getContainer().getBuildInfo(); IScannerConfigBuilderInfo2 builderInfo = getContainer().getBuildInfo();
String providerId = getProviderIDForSelectedProfile(); String providerId = getProviderIDForSelectedProfile();
bopEnabledButton.setSelection(builderInfo.isBuildOutputParserEnabled()); bopEnabledButton.setSelection(builderInfo.isBuildOutputParserEnabled());
setBopOpenFileText(builderInfo.getBuildOutputFilePath()); setBopOpenFileText(builderInfo.getBuildOutputFilePath());
sipEnabledButton.setSelection(builderInfo.isProviderOutputParserEnabled(providerId)); sipEnabledButton.setSelection(builderInfo.isProviderOutputParserEnabled(providerId));
sipRunCommandText.setText(builderInfo.getProviderRunCommand(providerId)); sipRunCommandText.setText(builderInfo.getProviderRunCommand(providerId));
@ -285,12 +292,12 @@ public class GCCPerProjectSCDProfilePage 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<String> providerIDs = builderInfo.getProviderIdList(); List<String> providerIDs = builderInfo.getProviderIdList();
if(providerIDs.size() == 0) if(providerIDs.size() == 0)
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
return providerIDs.iterator().next(); return providerIDs.iterator().next();
} }
private void handleBOPLoadFileButtonSelected() { private void handleBOPLoadFileButtonSelected() {
@ -306,7 +313,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
readerJob.addJobChangeListener(new JobChangeAdapter() { readerJob.addJobChangeListener(new JobChangeAdapter() {
@Override @Override
public void done(IJobChangeEvent event) { public void done(IJobChangeEvent event) {
synchronized (lock) { synchronized (lock) {
if (!instance.shell.isDisposed()) { if (!instance.shell.isDisposed()) {
instance.shell.getDisplay().asyncExec(new Runnable() { instance.shell.getDisplay().asyncExec(new Runnable() {
@ -337,7 +344,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
* @see org.eclipse.cdt.ui.dialogs.ICOptionPage#isValid() * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#isValid()
*/ */
@Override @Override
public boolean isValid() { public boolean isValid() {
return isValid; return isValid;
} }
@ -345,7 +352,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
* @see org.eclipse.jface.dialogs.IDialogPage#getErrorMessage() * @see org.eclipse.jface.dialogs.IDialogPage#getErrorMessage()
*/ */
@Override @Override
public String getErrorMessage() { public String getErrorMessage() {
return (isValid) ? null : SI_ERROR; return (isValid) ? null : SI_ERROR;
} }
@ -353,7 +360,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
* @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 @Override
protected void populateBuildInfo(IScannerConfigBuilderInfo2 buildInfo) { protected void populateBuildInfo(IScannerConfigBuilderInfo2 buildInfo) {
if (buildInfo != null) { if (buildInfo != null) {
buildInfo.setBuildOutputFileActionEnabled(true); buildInfo.setBuildOutputFileActionEnabled(true);
buildInfo.setBuildOutputFilePath(getBopOpenFileText()); buildInfo.setBuildOutputFilePath(getBopOpenFileText());
@ -369,7 +376,7 @@ public class GCCPerProjectSCDProfilePage extends AbstractDiscoveryPage {
* @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 @Override
protected void restoreFromBuildinfo(IScannerConfigBuilderInfo2 buildInfo) { protected void restoreFromBuildinfo(IScannerConfigBuilderInfo2 buildInfo) {
if (buildInfo != null) { if (buildInfo != null) {
setBopOpenFileText(buildInfo.getBuildOutputFilePath()); setBopOpenFileText(buildInfo.getBuildOutputFilePath());
bopEnabledButton.setSelection(buildInfo.isBuildOutputParserEnabled()); bopEnabledButton.setSelection(buildInfo.isBuildOutputParserEnabled());