summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-04-03 15:38:04 -0400
committerAlexander Kurtakov2018-06-13 09:28:26 -0400
commit47188bd002fd035df0966fa5639609752496c3f0 (patch)
tree63cec851f0a4f84c0415ed8c78ec769b3e107602
parent799da4a57410d3d2a15c3ef49421e052aced6ab4 (diff)
downloadrt.equinox.p2-47188bd002fd035df0966fa5639609752496c3f0.zip
rt.equinox.p2-47188bd002fd035df0966fa5639609752496c3f0.tar.gz
rt.equinox.p2-47188bd002fd035df0966fa5639609752496c3f0.tar.xz
Minor - Fix typos
Rename "licence" to "license". All code changes are in tests or in classes of internal packages, therefore no public API changes. Change-Id: I39713a9a9c46cf230947e33765383cddb6d102c4 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Version.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java22
4 files changed, 19 insertions, 19 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Version.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Version.java
index a2db4ce..edc5049 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Version.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Version.java
@@ -17,7 +17,7 @@ import java.util.WeakHashMap;
import org.eclipse.equinox.internal.p2.metadata.*;
/**
- * A class that represents a Version in the Omni Version format. A Version can be though of as an
+ * A class that represents a Version in the Omni Version format. A Version can be thought of as an
* array of comparable elements and an optional pad value. The pad value is used when comparing
* two versions with a different number of segments.
*
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java
index eb8c883..93c0c71 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java
@@ -130,13 +130,13 @@ public class InstallWizardTest extends WizardTest {
}
}
- public void testInstallWizardWithoutLicenceBypass() throws Exception {
+ public void testInstallWizardWithoutLicenseBypass() throws Exception {
ArrayList<IInstallableUnit> iusInvolved = new ArrayList<>();
iusInvolved.add(toInstall);
InstallOperation op = new MyNewInstallOperation(getSession(), iusInvolved);
op.setProfileId(TESTPROFILE);
PreselectedIUInstallWizard wizard = new PreselectedIUInstallWizard(getProvisioningUI(), op, iusInvolved, null);
- wizard.setBypassLicencePage(false);
+ wizard.setBypassLicensePage(false);
ProvisioningWizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard);
dialog.setBlockOnOpen(false);
dialog.open();
@@ -149,7 +149,7 @@ public class InstallWizardTest extends WizardTest {
// simulate the next button by getting next page and showing
InstallWizardPage installWizardPage = (InstallWizardPage) selectableIUsPage.getNextPage();
- assertFalse("Licence page bypass flag must be false", wizard.isBypassLicencePage());
+ assertFalse("License page bypass flag must be false", wizard.isBypassLicensePage());
IWizardPage licensePage = installWizardPage.getNextPage();
assertTrue("Expected instance of AcceptLicensesWizardPage", licensePage instanceof AcceptLicensesWizardPage);
@@ -160,13 +160,13 @@ public class InstallWizardTest extends WizardTest {
}
}
- public void testInstallWizardWithLicenceBypass() throws Exception {
+ public void testInstallWizardWithLicenseBypass() throws Exception {
ArrayList<IInstallableUnit> iusInvolved = new ArrayList<>();
iusInvolved.add(toInstall);
InstallOperation op = new MyNewInstallOperation(getSession(), iusInvolved);
op.setProfileId(TESTPROFILE);
PreselectedIUInstallWizard wizard = new PreselectedIUInstallWizard(getProvisioningUI(), op, iusInvolved, null);
- wizard.setBypassLicencePage(true);
+ wizard.setBypassLicensePage(true);
ProvisioningWizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard);
dialog.setBlockOnOpen(false);
dialog.open();
@@ -179,7 +179,7 @@ public class InstallWizardTest extends WizardTest {
// simulate the next button by getting next page and showing
InstallWizardPage installWizardPage = (InstallWizardPage) selectableIUsPage.getNextPage();
- assertTrue("Licence page bypass flag must be true", wizard.isBypassLicencePage());
+ assertTrue("License page bypass flag must be true", wizard.isBypassLicensePage());
IWizardPage licensePage = installWizardPage.getNextPage();
assertNull("Expected instance of AcceptLicensesWizardPage must be null", licensePage);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java
index 6ff3382..7430bff 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUWizard.java
@@ -56,7 +56,7 @@ public class UpdateSingleIUWizard extends Wizard {
mainPage = createMainPage();
addPage(mainPage);
- if (!WizardWithLicenses.canBypassLicencePage()) {
+ if (!WizardWithLicenses.canBypassLicensePage()) {
AcceptLicensesWizardPage page = createLicensesPage();
page.update(null, operation);
if (page.hasLicensesToAccept())
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java
index ea0b190..d4ace32 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/WizardWithLicenses.java
@@ -31,26 +31,26 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard {
private static final String BYPASS_LICENSE_PAGE = "bypassLicensePage"; //$NON-NLS-1$
AcceptLicensesWizardPage licensePage;
- boolean bypassLicencePage;
+ boolean bypassLicensePage;
/*
* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#addPages()
*/
- public boolean isBypassLicencePage() {
- return bypassLicencePage;
+ public boolean isBypassLicensePage() {
+ return bypassLicensePage;
}
- public void setBypassLicencePage(boolean bypassLicencePage) {
- this.bypassLicencePage = bypassLicencePage;
+ public void setBypassLicensePage(boolean bypassLicensePage) {
+ this.bypassLicensePage = bypassLicensePage;
}
@Override
public void addPages() {
super.addPages();
- if (!bypassLicencePage) {
+ if (!bypassLicensePage) {
licensePage = createLicensesPage();
addPage(licensePage);
}
@@ -58,7 +58,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard {
public WizardWithLicenses(ProvisioningUI ui, ProfileChangeOperation operation, Object[] initialSelections, LoadMetadataRepositoryJob job) {
super(ui, operation, initialSelections, job);
- this.bypassLicencePage = canBypassLicencePage();
+ this.bypassLicensePage = canBypassLicensePage();
}
protected AcceptLicensesWizardPage createLicensesPage() {
@@ -79,7 +79,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard {
// ensure there are actually licenses that need acceptance.
IWizardPage proposedPage = super.getNextPage(page);
- if (!bypassLicencePage) {
+ if (!bypassLicensePage) {
if (proposedPage == licensePage && licensePage != null) {
if (!licensePage.hasLicensesToAccept()) {
proposedPage = null;
@@ -95,7 +95,7 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard {
@Override
protected void planChanged() {
super.planChanged();
- if (!bypassLicencePage) {
+ if (!bypassLicensePage) {
licensePage.update(ElementUtils.elementsToIUs(planSelections).toArray(new IInstallableUnit[0]), operation);
}
}
@@ -107,14 +107,14 @@ public abstract class WizardWithLicenses extends ProvisioningOperationWizard {
@Override
public boolean performFinish() {
- if (!bypassLicencePage) {
+ if (!bypassLicensePage) {
licensePage.performFinish();
}
return super.performFinish();
}
- public static boolean canBypassLicencePage() {
+ public static boolean canBypassLicensePage() {
IScopeContext[] contexts = new IScopeContext[] {InstanceScope.INSTANCE, DefaultScope.INSTANCE, BundleDefaultsScope.INSTANCE, ConfigurationScope.INSTANCE};
boolean bypass = Platform.getPreferencesService().getBoolean(ProvUIActivator.PLUGIN_ID, BYPASS_LICENSE_PAGE, false, contexts);
return bypass;