Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

JBIDE-18793 - Compile errors in arquillian when using Mars target platform #101

Merged
merged 1 commit into from
Nov 20, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ public NewArquillianJUnitTestCasePageOne(NewTestCaseWizardPageTwo page2, NewArqu
protected void doWidgetSelected(SelectionEvent e) {
super.doWidgetSelected(e);
saveWidgetValues();
getContainer().updateButtons();
}
};
fMethodStubsButtons.setLabelText(WizardMessages.NewTestCaseWizardPageOne_method_Stub_label);
Expand Down Expand Up @@ -316,20 +317,6 @@ public void createControl(Composite parent) {
createSeparator(composite, nColumns);
createClassUnderTestControls(composite, nColumns);
createBuildPathConfigureControls(composite, nColumns);

fMethodStubsButtons.getSelectionButton(IDX_DEPLOYMENT).addSelectionListener(new SelectionAdapter() {

@Override
public void widgetDefaultSelected(SelectionEvent e) {
getContainer().updateButtons();
}

@Override
public void widgetSelected(SelectionEvent e) {
getContainer().updateButtons();
}

});

setControl(composite);

Expand Down Expand Up @@ -1073,14 +1060,14 @@ protected IStatus superClassChanged() {
@Override
public boolean canFlipToNextPage() {
return super.canFlipToNextPage() &&
(getClassUnderTest() != null || fMethodStubsButtons.getSelectionButton(IDX_DEPLOYMENT).getSelection() );
(getClassUnderTest() != null || fMethodStubsButtons.isSelected(IDX_DEPLOYMENT) );
}

@Override
public IWizardPage getNextPage() {
if (getClassUnderTest() != null) {
super.getNextPage();
} else if (fMethodStubsButtons.getSelectionButton(IDX_DEPLOYMENT).getSelection()) {
} else if (fMethodStubsButtons.isSelected(IDX_DEPLOYMENT)) {
IWizard wizard = getWizard();
if (wizard instanceof NewArquillianJUnitTestWizard) {
return ((NewArquillianJUnitTestWizard) wizard).getNewArquillianJUnitTestCaseDeploymentPage();
Expand Down Expand Up @@ -1159,6 +1146,6 @@ private String getDefaultSuperClassName() {
}

public boolean isGenerateDeploymentMethod() {
return fMethodStubsButtons.getSelectionButton(IDX_DEPLOYMENT).getSelection();
return fMethodStubsButtons.isSelected(IDX_DEPLOYMENT);
}
}