Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/.classpath1
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/BlobStore.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/Mapper.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/UniversalUniqueIdentifier.java52
-rw-r--r--bundles/org.eclipse.equinox.p2.console/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.director/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepositoryFactory.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Constants.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java)26
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java10
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java16
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/XZedSimpleMetadataRepositoryFactory.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ProvidedCapability.java12
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.sar/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ProvidedCapabilityTest.java65
-rw-r--r--bundles/org.eclipse.equinox.p2.testserver/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs59
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java54
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java19
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java14
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java37
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java31
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java53
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java51
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramArgumentAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddSourceBundleAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CheckTrustAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java18
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java16
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java11
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/LinkAction.java22
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramArgumentAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramPropertyAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveSourceBundleAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetJvmAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetProgramPropertyAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java11
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallFeatureAction.java5
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationCache.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java38
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java24
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreferenceInitializer.java169
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/UpdateManagerCompatibility.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/misc/StringMatcher.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/MetadataRepositoryElement.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDragAdapter.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/RepositoryDetailsLabelProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.updatechecker/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.updatesite/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.ui.prefs12
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.cloud/pom.xml2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.discovery/pom.xml2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/pom.xml2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/pom.xml2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/pom.xml2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.sdkui/pom.xml2
-rw-r--r--examples/pom.xml2
-rw-r--r--features/org.eclipse.equinox.p2.core.feature/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.core.feature/forceQualifierUpdate.txt3
-rw-r--r--features/org.eclipse.equinox.p2.core.feature/pom.xml4
-rw-r--r--features/org.eclipse.equinox.p2.discovery.feature/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.discovery.feature/pom.xml4
-rw-r--r--features/org.eclipse.equinox.p2.extras.feature/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.extras.feature/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.p2.extras.feature/pom.xml4
-rw-r--r--features/org.eclipse.equinox.p2.rcp.feature/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.rcp.feature/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.p2.rcp.feature/pom.xml4
-rw-r--r--features/org.eclipse.equinox.p2.sdk/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.sdk/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.p2.sdk/pom.xml4
-rw-r--r--features/org.eclipse.equinox.p2.user.ui/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.user.ui/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.p2.user.ui/pom.xml4
-rw-r--r--org.eclipse.equinox.p2.releng/default.target2
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml2
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml2
-rw-r--r--pom.xml4
159 files changed, 627 insertions, 581 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
index 3b816e0a3..a16aa494a 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml
index e1865d81b..403f01542 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
index 0d9068adb..663f79bfb 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/.classpath b/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/.classpath
index 4f83b2397..6de27b66c 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/.classpath
+++ b/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/pom.xml
index 78d0946a3..18b6f6453 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml
index 34f983665..b246de984 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml
index 61c52b910..d8028f822 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
index 353d9c5aa..02f6b7f2b 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.artifact.repository;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.artifact.repository.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
index 56808d034..e0dc62aba 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java
index c088e95ed..9d4fd8580 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java
@@ -31,7 +31,7 @@ import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExec
import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor.Options;
/**
- * The Pack200Unpacker expects an input containing ".jar.pack.gz" data.
+ * The Pack200Unpacker expects an input containing ".jar.pack.gz" data.
*/
public class Pack200ProcessorStep extends AbstractBufferingStep {
public static final String PACKED_SUFFIX = ".pack.gz"; //$NON-NLS-1$
@@ -55,9 +55,9 @@ public class Pack200ProcessorStep extends AbstractBufferingStep {
detailedResult = true;
} else {
String[] locations = Utils.getPack200Commands("unpack200"); //$NON-NLS-1$
- StringBuffer locationTried = new StringBuffer(100);
- for (int i = 0; i < locations.length; i++) {
- locationTried.append(locations[i]).append(", "); //$NON-NLS-1$
+ StringBuilder locationTried = new StringBuilder(100);
+ for (String location : locations) {
+ locationTried.append(location).append(", "); //$NON-NLS-1$
}
status = new Status(IStatus.ERROR, Activator.ID, MirrorRequest.ARTIFACT_PROCESSING_ERROR, "Unpack facility not configured. The locations searched for unpack200 are: " + locationTried, null); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/BlobStore.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/BlobStore.java
index b22a503a2..f5e786315 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/BlobStore.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/BlobStore.java
@@ -58,9 +58,9 @@ public class BlobStore {
}
/*
- * @see UniversalUniqueIdentifier#appendByteString(StringBuffer, byte)
+ * @see UniversalUniqueIdentifier#appendByteString(StringBuilder, byte)
*/
- private void appendByteString(StringBuffer buffer, byte value) {
+ private void appendByteString(StringBuilder buffer, byte value) {
String hexString;
if (value < 0)
hexString = Integer.toHexString(256 + value);
@@ -77,7 +77,7 @@ public class BlobStore {
* @see UniversalUniqueIdentifier#toString()
*/
private String bytesToHexString(byte[] b) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (byte element : b)
appendByteString(buffer, element);
return buffer.toString();
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/Mapper.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/Mapper.java
index 5699289ec..3301b48ae 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/Mapper.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/Mapper.java
@@ -86,7 +86,7 @@ public class Mapper {
if (repoLocation.endsWith("/")) //$NON-NLS-1$
repoLocation = repoLocation.substring(0, repoLocation.length() - 1);
- StringBuffer output = new StringBuffer(pattern);
+ StringBuilder output = new StringBuilder(pattern);
int index = 0;
while (index < output.length()) {
int beginning = output.indexOf("${", index); //$NON-NLS-1$
@@ -124,7 +124,7 @@ public class Mapper {
@Override
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < filters.length; i++) {
result.append(filters[i]).append('-').append('>').append(outputStrings[i]).append('\n');
}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
index a1a39477b..6143ba749 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -519,7 +519,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
}
private String bytesToHexString(byte[] bytes) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (byte b : bytes) {
String hexString;
if (b < 0)
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/UniversalUniqueIdentifier.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/UniversalUniqueIdentifier.java
index a59cc539c..90fa151e9 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/UniversalUniqueIdentifier.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/UniversalUniqueIdentifier.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -13,10 +13,7 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.repository.simple;
-import java.io.*;
import java.math.BigInteger;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.security.SecureRandom;
import java.util.GregorianCalendar;
import java.util.Random;
@@ -98,7 +95,7 @@ public class UniversalUniqueIdentifier implements java.io.Serializable {
System.arraycopy(byteValue, 0, fBits, 0, BYTES_SIZE);
}
- private void appendByteString(StringBuffer buffer, byte value) {
+ private void appendByteString(StringBuilder buffer, byte value) {
String hexString;
if (value < 0)
@@ -127,7 +124,7 @@ public class UniversalUniqueIdentifier implements java.io.Serializable {
try {
return super.clone();
} catch (CloneNotSupportedException e) {
- Assert.isTrue(false, "Clone not supported");
+ Assert.isTrue(false, "Clone not supported"); //$NON-NLS-1$
return null;
}
}
@@ -148,28 +145,7 @@ public class UniversalUniqueIdentifier implements java.io.Serializable {
private static byte[] computeNodeAddress() {
byte[] address = new byte[NODE_ADDRESS_BYTE_SIZE];
-
- // Seed the secure randomizer with some oft-varying inputs
- int thread = Thread.currentThread().hashCode();
- long time = System.currentTimeMillis();
- int objectId = System.identityHashCode(new String());
- ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- DataOutputStream out = new DataOutputStream(byteOut);
- byte[] ipAddress = getIPAddress();
-
- try {
- if (ipAddress != null)
- out.write(ipAddress);
- out.write(thread);
- out.writeLong(time);
- out.write(objectId);
- out.close();
- } catch (IOException exc) {
- //ignore the failure, we're just trying to come up with a random seed
- }
- byte[] rand = byteOut.toByteArray();
-
- SecureRandom randomizer = new SecureRandom(rand);
+ SecureRandom randomizer = new SecureRandom();
randomizer.nextBytes(address);
// set the MSB of the first octet to 1 to distinguish from IEEE node addresses
@@ -197,24 +173,6 @@ public class UniversalUniqueIdentifier implements java.io.Serializable {
return true;
}
- /**
- Answers the IP address of the local machine using the
- Java API class <code>InetAddress</code>.
-
- @return byte[] the network address in network order
- @see java.net.InetAddress#getLocalHost()
- @see java.net.InetAddress#getAddress()
- */
- protected static byte[] getIPAddress() {
- try {
- return InetAddress.getLocalHost().getAddress();
- } catch (UnknownHostException e) {
- //valid for this to be thrown be a machine with no IP connection
- //It is VERY important NOT to throw this exception
- return null;
- }
- }
-
private static byte[] getNodeAddress() {
return nodeAddress;
}
@@ -337,7 +295,7 @@ public class UniversalUniqueIdentifier implements java.io.Serializable {
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < fBits.length; i++)
appendByteString(buffer, fBits[i]);
return buffer.toString();
diff --git a/bundles/org.eclipse.equinox.p2.console/pom.xml b/bundles/org.eclipse.equinox.p2.console/pom.xml
index 2eab5d19f..401024181 100644
--- a/bundles/org.eclipse.equinox.p2.console/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.console/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.core/pom.xml b/bundles/org.eclipse.equinox.p2.core/pom.xml
index 343e06af7..24b1f888b 100644
--- a/bundles/org.eclipse.equinox.p2.core/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.director.app/pom.xml b/bundles/org.eclipse.equinox.p2.director.app/pom.xml
index b5c779c61..cf6fc6ecb 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.director.app/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.director/pom.xml b/bundles/org.eclipse.equinox.p2.director/pom.xml
index ba587f01c..a9add51ad 100644
--- a/bundles/org.eclipse.equinox.p2.director/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.director/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
index bb31ca642..deb55ea8c 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
index e5c40fe66..f44943056 100644
--- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.discovery/pom.xml
index d234c0ade..48f27cc0f 100644
--- a/bundles/org.eclipse.equinox.p2.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.discovery/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.engine/pom.xml b/bundles/org.eclipse.equinox.p2.engine/pom.xml
index dc9a3a51e..677731276 100644
--- a/bundles/org.eclipse.equinox.p2.engine/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.engine/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml b/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml
index 34a61bdef..fd0d9d0c3 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml b/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml
index 222ea0a31..70f7fe3a2 100644
--- a/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.installer/pom.xml b/bundles/org.eclipse.equinox.p2.installer/pom.xml
index 40cae00ed..013a53c4d 100644
--- a/bundles/org.eclipse.equinox.p2.installer/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.installer/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml b/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
index 7a5b54f76..27c48436f 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
index d210b3bf7..bf349349a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.metadata.repository;singleton:=true
Bundle-Version: 1.3.200.qualifier
-Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.repository.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.equinox.internal.p2.metadata.repository;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
index 164dd1a61..f4cabe269 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java
index 5e8e73c22..714f83f8e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java
@@ -34,6 +34,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository;
import org.eclipse.osgi.util.NLS;
+import org.osgi.framework.FrameworkUtil;
public class CompositeMetadataRepository extends AbstractMetadataRepository implements ICompositeRepository<IInstallableUnit>, IIndexProvider<IInstallableUnit> {
@@ -41,7 +42,9 @@ public class CompositeMetadataRepository extends AbstractMetadataRepository impl
static final public String PI_REPOSITORY_TYPE = "compositeMetadataRepository"; //$NON-NLS-1$
static final public String PROP_ATOMIC_LOADING = "p2.atomic.composite.loading"; //$NON-NLS-1$
- static final public boolean ATOMIC_LOADING_DEFAULT = Boolean.parseBoolean(Activator.getContext().getProperty("eclipse.p2.atomic.composite.loading.default")); //$NON-NLS-1$
+ static final public boolean ATOMIC_LOADING_DEFAULT = Boolean
+ .parseBoolean(FrameworkUtil.getBundle(CompositeMetadataRepository.class).getBundleContext()
+ .getProperty("eclipse.p2.atomic.composite.loading.default")); //$NON-NLS-1$
static final private Integer REPOSITORY_VERSION = 1;
static final public String XML_EXTENSION = ".xml"; //$NON-NLS-1$
@@ -184,7 +187,7 @@ public class CompositeMetadataRepository extends AbstractMetadataRepository impl
if (propagateException) {
removeFromRepoManager(repositoriesToBeRemovedOnFailure);
String msg = NLS.bind(Messages.io_failedRead, getLocation());
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
}
}
}
@@ -312,7 +315,7 @@ public class CompositeMetadataRepository extends AbstractMetadataRepository impl
super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()));
new CompositeRepositoryIO().write(toState(), output, PI_REPOSITORY_TYPE);
} catch (IOException e) {
- LogHelper.log(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_WRITE, NLS.bind(Messages.io_failedWrite, getLocation()), e));
+ LogHelper.log(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_WRITE, NLS.bind(Messages.io_failedWrite, getLocation()), e));
}
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepositoryFactory.java
index 2b5fd1b3f..f2750f670 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepositoryFactory.java
@@ -68,7 +68,7 @@ public class CompositeMetadataRepositoryFactory extends MetadataRepositoryFactor
if (localFile.exists())
return localFile;
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
}
//file is not local, create a cache of the repository metadata
CacheManager cache = getAgent().getService(CacheManager.class);
@@ -78,7 +78,7 @@ public class CompositeMetadataRepositoryFactory extends MetadataRepositoryFactor
if (localFile == null) {
//there is no remote file in either form
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
}
return localFile;
}
@@ -133,10 +133,10 @@ public class CompositeMetadataRepositoryFactory extends MetadataRepositoryFactor
}
} catch (FileNotFoundException e) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
} catch (IOException e) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
} finally {
if (monitor != null)
monitor.done();
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Constants.java
index af95c4f7c..bc095ef3a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Constants.java
@@ -7,34 +7,16 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Cloudsmith Inc - additional implementation
*******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata.repository;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- public static final String ID = "org.eclipse.equinox.p2.metadata.repository"; //$NON-NLS-1$
- public static final String REPO_PROVIDER_XPT = ID + '.' + "metadataRepositories"; //$NON-NLS-1$
-
- private static BundleContext bundleContext;
-
- public static BundleContext getContext() {
- return bundleContext;
- }
+public interface Constants {
- @Override
- public void start(BundleContext aContext) throws Exception {
- bundleContext = aContext;
- }
+ String ID = "org.eclipse.equinox.p2.metadata.repository"; //$NON-NLS-1$
+ String REPO_PROVIDER_XPT = ID + '.' + "metadataRepositories"; //$NON-NLS-1$
- @Override
- public void stop(BundleContext aContext) throws Exception {
- bundleContext = null;
- }
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
index 6ac588359..06707e85a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
@@ -282,7 +282,7 @@ public class LocalMetadataRepository extends AbstractMetadataRepository implemen
super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()), new NullProgressMonitor());
new MetadataRepositoryIO(getProvisioningAgent()).write(this, output);
} catch (IOException e) {
- LogHelper.log(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_WRITE, "Error saving metadata repository: " + getLocation(), e)); //$NON-NLS-1$
+ LogHelper.log(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_WRITE, "Error saving metadata repository: " + getLocation(), e)); //$NON-NLS-1$
}
}
@@ -316,18 +316,18 @@ public class LocalMetadataRepository extends AbstractMetadataRepository implemen
disableSave = true;
runnable.run(monitor);
} catch (OperationCanceledException oce) {
- return new Status(IStatus.CANCEL, Activator.ID, oce.getMessage(), oce);
+ return new Status(IStatus.CANCEL, Constants.ID, oce.getMessage(), oce);
} catch (Throwable e) {
- result = new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e);
+ result = new Status(IStatus.ERROR, Constants.ID, e.getMessage(), e);
} finally {
disableSave = false;
try {
save();
} catch (Exception e) {
if (result != null)
- result = new MultiStatus(Activator.ID, IStatus.ERROR, new IStatus[] {result}, e.getMessage(), e);
+ result = new MultiStatus(Constants.ID, IStatus.ERROR, new IStatus[] {result}, e.getMessage(), e);
else
- result = new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e);
+ result = new Status(IStatus.ERROR, Constants.ID, e.getMessage(), e);
}
}
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java
index c5c2b1e56..62144c4fb 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java
@@ -37,6 +37,7 @@ import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository
import org.eclipse.equinox.p2.repository.metadata.spi.AbstractMetadataRepository.RepositoryState;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
import org.xml.sax.*;
/**
@@ -61,7 +62,8 @@ public class MetadataRepositoryIO {
try {
bufferedInput = new BufferedInputStream(input);
- Parser repositoryParser = new Parser(Activator.getContext(), Activator.ID);
+ Parser repositoryParser = new Parser(
+ FrameworkUtil.getBundle(MetadataRepositoryIO.class).getBundleContext(), Constants.ID);
repositoryParser.setErrorContext(location.toExternalForm());
repositoryParser.parse(input, monitor);
IStatus result = repositoryParser.getStatus();
@@ -81,7 +83,7 @@ public class MetadataRepositoryIO {
}
} catch (IOException ioe) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, ioe));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, ioe));
}
}
@@ -100,15 +102,15 @@ public class MetadataRepositoryIO {
// Constants defining the structure of the XML for a MetadataRepository
// A format version number for metadata repository XML.
- public static final Version COMPATIBLE_VERSION = Version.createOSGi(1, 0, 0);
- public static final Version CURRENT_VERSION = Version.createOSGi(1, 2, 0);
- public static final VersionRange XML_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, Version.createOSGi(2, 0, 0), false);
+ Version COMPATIBLE_VERSION = Version.createOSGi(1, 0, 0);
+ Version CURRENT_VERSION = Version.createOSGi(1, 2, 0);
+ VersionRange XML_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, Version.createOSGi(2, 0, 0), false);
// Constants for processing Instructions
- public static final String PI_REPOSITORY_TARGET = "metadataRepository"; //$NON-NLS-1$
+ String PI_REPOSITORY_TARGET = "metadataRepository"; //$NON-NLS-1$
// Constants for metadata repository elements
- public static final String REPOSITORY_ELEMENT = "repository"; //$NON-NLS-1$
+ String REPOSITORY_ELEMENT = "repository"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
index 3c9fb3e27..35c05e344 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
@@ -65,7 +65,7 @@ public class MetadataRepositoryManager extends AbstractRepositoryManager<IInstal
@Override
protected String getBundleId() {
- return Activator.ID;
+ return Constants.ID;
}
@Override
@@ -79,7 +79,7 @@ public class MetadataRepositoryManager extends AbstractRepositoryManager<IInstal
@Override
protected String getRepositoryProviderExtensionPointId() {
- return Activator.REPO_PROVIDER_XPT;
+ return Constants.REPO_PROVIDER_XPT;
}
@Override
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java
index 58760f910..387cd39f5 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java
@@ -60,7 +60,7 @@ public class SimpleMetadataRepositoryFactory extends MetadataRepositoryFactory {
if (localFile.exists())
return localFile;
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
}
// file is not local, create a cache of the repository metadata
CacheManager cache = getAgent().getService(CacheManager.class);
@@ -71,7 +71,7 @@ public class SimpleMetadataRepositoryFactory extends MetadataRepositoryFactory {
// there is no remote file in either form - this should not really happen as
// createCache should bail out with exception if something is wrong. This is an internal
// error.
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, Messages.repoMan_internalError, null));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, Messages.repoMan_internalError, null));
}
return localFile;
}
@@ -123,10 +123,10 @@ public class SimpleMetadataRepositoryFactory extends MetadataRepositoryFactory {
}
} catch (FileNotFoundException e) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
} catch (IOException e) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
} finally {
if (monitor != null)
monitor.done();
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/XZedSimpleMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/XZedSimpleMetadataRepositoryFactory.java
index 1e8ae4de9..eac9824bf 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/XZedSimpleMetadataRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/XZedSimpleMetadataRepositoryFactory.java
@@ -51,7 +51,7 @@ public class XZedSimpleMetadataRepositoryFactory extends MetadataRepositoryFacto
if (localFile.exists())
return localFile;
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, null));
}
// file is not local, create a cache of the repository metadata
CacheManager cache = getAgent().getService(CacheManager.class);
@@ -62,7 +62,7 @@ public class XZedSimpleMetadataRepositoryFactory extends MetadataRepositoryFacto
// there is no remote file in either form - this should not really happen as
// createCache should bail out with exception if something is wrong. This is an internal
// error.
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, Messages.repoMan_internalError, null));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, Messages.repoMan_internalError, null));
}
return localFile;
}
@@ -101,10 +101,10 @@ public class XZedSimpleMetadataRepositoryFactory extends MetadataRepositoryFacto
}
} catch (FileNotFoundException e) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
} catch (IOException e) {
String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
+ throw new ProvisionException(new Status(IStatus.ERROR, Constants.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
} finally {
if (monitor != null)
monitor.done();
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
index 09cd7531e..bb0ebce75 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;
import org.eclipse.equinox.internal.p2.metadata.RequiredPropertiesMatch;
-import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
+import org.eclipse.equinox.internal.p2.metadata.repository.Constants;
import org.eclipse.equinox.internal.p2.persistence.XMLWriter;
import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.metadata.expression.*;
@@ -422,7 +422,7 @@ public class MetadataWriter extends XMLWriter implements XMLConstants {
}
}
} catch (IllegalStateException ise) {
- LogHelper.log(new Status(IStatus.INFO, Activator.ID, "Error writing the copyright URL: " + copyright.getLocation())); //$NON-NLS-1$
+ LogHelper.log(new Status(IStatus.INFO, Constants.ID, "Error writing the copyright URL: " + copyright.getLocation())); //$NON-NLS-1$
}
cdata(copyright.getBody(), true);
end(COPYRIGHT_ELEMENT);
diff --git a/bundles/org.eclipse.equinox.p2.metadata/pom.xml b/bundles/org.eclipse.equinox.p2.metadata/pom.xml
index 486e6d3ef..a34371a54 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ProvidedCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ProvidedCapability.java
index 5b22d2960..9c251928d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ProvidedCapability.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ProvidedCapability.java
@@ -61,21 +61,23 @@ public class ProvidedCapability implements IProvidedCapability, IMemberProvider
// Verify the version
Object version = resolvedProps.get(PROPERTY_VERSION);
if (version != null) {
- Assert.isTrue(props.get(PROPERTY_VERSION) instanceof Version);
+ Assert.isTrue(version instanceof Version);
} else {
resolvedProps.put(PROPERTY_VERSION, Version.emptyVersion);
}
- this.properties = Collections.unmodifiableMap(props);
+ this.properties = Collections.unmodifiableMap(resolvedProps);
}
public ProvidedCapability(String namespace, String name, Version version) {
Assert.isNotNull(namespace, NLS.bind(Messages.provided_capability_namespace_not_defined, null));
Assert.isNotNull(name, NLS.bind(Messages.provided_capability_name_not_defined, namespace));
this.namespace = namespace;
- this.properties = new HashMap<>();
- properties.put(namespace, name);
- properties.put(PROPERTY_VERSION, version == null ? Version.emptyVersion : version);
+
+ Map<String, Object> props = new HashMap<>();
+ props.put(namespace, name);
+ props.put(PROPERTY_VERSION, version == null ? Version.emptyVersion : version);
+ this.properties = Collections.unmodifiableMap(props);
}
@Override
diff --git a/bundles/org.eclipse.equinox.p2.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml
index f42c2d080..5cd13f658 100644
--- a/bundles/org.eclipse.equinox.p2.operations/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
index ff9d57186..8badf2de6 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
diff --git a/bundles/org.eclipse.equinox.p2.publisher/pom.xml b/bundles/org.eclipse.equinox.p2.publisher/pom.xml
index 2866249f7..5a6bafb88 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.publisher/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
index bac1a7fb5..c1a5fe2d4 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
index 06f8403e7..e0f4642dc 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.repository/pom.xml b/bundles/org.eclipse.equinox.p2.repository/pom.xml
index 6f6a6e9b2..da7d350d8 100644
--- a/bundles/org.eclipse.equinox.p2.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.sar/pom.xml b/bundles/org.eclipse.equinox.p2.sar/pom.xml
index 110b7b88a..2b87473ea 100644
--- a/bundles/org.eclipse.equinox.p2.sar/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.sar/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
index dcc19dc73..5b0c73f83 100644
--- a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml b/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
index 31a0fa53c..9e736eef5 100644
--- a/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml b/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml
index dd49c68c8..d0089307b 100644
--- a/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
index af7fa130c..258ac549f 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
index ce9e7831e..37a219b68 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
index d2533dad8..1f3f517f6 100644
--- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.tests;singleton:=true
-Bundle-Version: 1.7.700.qualifier
+Bundle-Version: 1.7.800.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.equinox.p2.tests.TestActivator
Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index ed216556b..b33be1d55 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -10,13 +10,13 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.tests</artifactId>
- <version>1.7.700-SNAPSHOT</version>
+ <version>1.7.800-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ProvidedCapabilityTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ProvidedCapabilityTest.java
index d1478c731..44875a623 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ProvidedCapabilityTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ProvidedCapabilityTest.java
@@ -13,7 +13,11 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.metadata;
-import org.eclipse.equinox.p2.metadata.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.equinox.p2.metadata.IProvidedCapability;
+import org.eclipse.equinox.p2.metadata.MetadataFactory;
+import org.eclipse.equinox.p2.metadata.Version;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
/**
@@ -28,4 +32,63 @@ public class ProvidedCapabilityTest extends AbstractProvisioningTest {
assertFalse("1.1", cap.equals(notEqual));
assertFalse("1.1", notEqual.equals(cap));
}
+
+ public void testProperties_Unmodifiable() {
+ String namespace = "aNamespace";
+ String name = "name";
+ Version version = Version.createOSGi(2, 0, 0);
+
+ Map properties = new HashMap<>();
+ properties.put(namespace, name);
+ properties.put(IProvidedCapability.PROPERTY_VERSION, version);
+
+ IProvidedCapability capability1 = MetadataFactory.createProvidedCapability(namespace, properties);
+ IProvidedCapability capability2 = MetadataFactory.createProvidedCapability(namespace, name, version);
+ assertEquals(capability1, capability2);
+
+ try {
+ capability1.getProperties().put("key", "value");
+ fail("properties must be unmodifiable");
+ } catch (UnsupportedOperationException e) {
+ // ok
+ }
+
+ try {
+ capability2.getProperties().put("key", "value");
+ fail("properties must be unmodifiable");
+ } catch (UnsupportedOperationException e) {
+ // ok
+ }
+ }
+
+ public void testProperties_Immutable() {
+ String namespace = "aNamespace";
+ String name = "name";
+ Version version = Version.createOSGi(2, 0, 0);
+
+ Map properties = new HashMap<>();
+ properties.put(namespace, name);
+ properties.put(IProvidedCapability.PROPERTY_VERSION, version);
+
+ IProvidedCapability capability1 = MetadataFactory.createProvidedCapability(namespace, properties);
+ IProvidedCapability capability2 = MetadataFactory.createProvidedCapability(namespace, name, version);
+
+ // mutate original value
+ properties.put(IProvidedCapability.PROPERTY_VERSION, Version.createOSGi(9, 9, 9));
+
+ assertEquals(capability1, capability2);
+ }
+
+ public void testProperties_NoVersion() {
+ String namespace = "aNamespace";
+ String name = "name";
+
+ Map properties = new HashMap<>();
+ properties.put(namespace, name);
+ // no version this time
+
+ IProvidedCapability capability1 = MetadataFactory.createProvidedCapability(namespace, properties);
+ IProvidedCapability capability2 = MetadataFactory.createProvidedCapability(namespace, name, null);
+ assertEquals(capability1, capability2);
+ }
}
diff --git a/bundles/org.eclipse.equinox.p2.testserver/pom.xml b/bundles/org.eclipse.equinox.p2.testserver/pom.xml
index ad82a5d55..7e8228121 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.testserver/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.equinox.p2.tests-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs
index d1dc2cc40..2575694e1 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs
@@ -7,6 +7,15 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -16,20 +25,27 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
@@ -37,39 +53,78 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
index f8b5ab049..ce4278f6b 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java
index ac07ab4d4..9a1958e4a 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java
@@ -20,10 +20,12 @@ public class Activator implements BundleActivator {
public static final String ID = "org.eclipse.equinox.p2.touchpoint.eclipse"; //$NON-NLS-1$
private static BundleContext context = null;
+ @Override
public void start(BundleContext ctx) throws Exception {
Activator.context = ctx;
}
+ @Override
public void stop(BundleContext ctx) throws Exception {
Activator.context = null;
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java
index 66cbafa27..ed3090ac8 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AgentFromInstall.java
@@ -21,38 +21,48 @@ import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
import org.eclipse.equinox.p2.core.*;
/**
- * Given an eclipse installation folder and / or an eclipse configuration folder,
- * this class creates the agent representing the system point at.
+ * Given an eclipse installation folder and / or an eclipse configuration
+ * folder, this class creates the agent representing the system point at.
*/
public class AgentFromInstall {
- //Input
+ // Input
private File configurationFolder;
private File installFolder;
private IProvisioningAgentProvider agentProvider;
- //Figured out
+ // Figured out
private String profileId;
private String p2DataAreaURI;
private String userSpecifiedProfileId;
- private AgentFromInstall(IProvisioningAgentProvider agentProvider, File installFolder, File configurationFolder, String profileId) {
+ private AgentFromInstall(IProvisioningAgentProvider agentProvider, File installFolder, File configurationFolder,
+ String profileId) {
this.installFolder = installFolder;
this.configurationFolder = configurationFolder;
this.agentProvider = agentProvider;
this.userSpecifiedProfileId = profileId;
}
- /**
- * Creates an agent deriving the p2 data area from the information contained in the installFolder or the configurationFolder.
- * In the returned agent, the services will be initialized such that the SELF variable is bound to the default profile referred to in the configuration files.
- *
- * @param agentProvider an instance of an agent provider from which the agent will be created.
- * @param installFolder null or a file referring to the installation folder of eclipse.
- * @param configurationFolder null or a file referring to the configuration folder of eclipse.
- * @param profileId null or the name of the expected profile. This value is used when the detection of the profile id from the configuration file does not succeed.
+ /**
+ * Creates an agent deriving the p2 data area from the information contained in
+ * the installFolder or the configurationFolder. In the returned agent, the
+ * services will be initialized such that the SELF variable is bound to the
+ * default profile referred to in the configuration files.
+ *
+ * @param agentProvider an instance of an agent provider from which the
+ * agent will be created.
+ * @param installFolder null or a file referring to the installation
+ * folder of eclipse.
+ * @param configurationFolder null or a file referring to the configuration
+ * folder of eclipse.
+ * @param profileId null or the name of the expected profile. This
+ * value is used when the detection of the profile id
+ * from the configuration file does not succeed.
*/
- static public IProvisioningAgent createAgentFrom(IProvisioningAgentProvider agentProvider, File installFolder, File configurationFolder, String profileId) {
- AgentFromInstall newInstance = new AgentFromInstall(agentProvider, installFolder, configurationFolder, profileId);
+ static public IProvisioningAgent createAgentFrom(IProvisioningAgentProvider agentProvider, File installFolder,
+ File configurationFolder, String profileId) {
+ AgentFromInstall newInstance = new AgentFromInstall(agentProvider, installFolder, configurationFolder,
+ profileId);
return newInstance.loadAgent();
}
@@ -78,11 +88,12 @@ public class AgentFromInstall {
try {
agent = agentProvider.createAgent(URIUtil.fromString(p2DataAreaURI));
} catch (ProvisionException e) {
- //Can't happen
+ // Can't happen
} catch (URISyntaxException e) {
- //Can't happen since we are always constructing the string from code that manipulate files (included the code in the Manipulator)
+ // Can't happen since we are always constructing the string from code that
+ // manipulate files (included the code in the Manipulator)
}
- agent.registerService("FORCED_SELF", profileId);
+ agent.registerService("FORCED_SELF", profileId); //$NON-NLS-1$
return agent;
}
@@ -92,7 +103,8 @@ public class AgentFromInstall {
return false;
Manipulator manipulator = fwk.getManipulator();
LauncherData launcherData = manipulator.getLauncherData();
- launcherData.setFwConfigLocation(configurationFolder != null ? configurationFolder : new File(installFolder, "configuration/config.ini")); //$NON-NLS-1$
+ launcherData.setFwConfigLocation(configurationFolder != null ? configurationFolder
+ : new File(installFolder, "configuration/config.ini")); //$NON-NLS-1$
launcherData.setHome(installFolder);
try {
manipulator.load();
@@ -121,11 +133,11 @@ public class AgentFromInstall {
}
}
- private File getProfileRegistryFolder(File p2Folder) {
+ private static File getProfileRegistryFolder(File p2Folder) {
return new File(p2Folder, "org.eclipse.equinox.p2.engine/profileRegistry/"); //$NON-NLS-1$
}
- private String findProfile(File profileDirectory) {
+ private static String findProfile(File profileDirectory) {
final String PROFILE_EXT = ".profile"; //$NON-NLS-1$
File[] profileDirectories = profileDirectory.listFiles(new FileFilter() {
@Override
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java
index 3abf3cb44..bb4c15036 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java
@@ -29,11 +29,13 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
private static final String REPOSITORY_TYPE = AggregatedBundleRepository.class.getName();
private final Collection<IFileArtifactRepository> bundleRepositories;
- public AggregatedBundleRepository(IProvisioningAgent agent, Collection<IFileArtifactRepository> bundleRepositories) {
+ public AggregatedBundleRepository(IProvisioningAgent agent,
+ Collection<IFileArtifactRepository> bundleRepositories) {
super(agent, REPOSITORY_TYPE, REPOSITORY_TYPE, "1.0", null, null, null, null); //$NON-NLS-1$
this.bundleRepositories = bundleRepositories;
}
+ @Override
public File getArtifactFile(IArtifactKey key) {
for (IFileArtifactRepository repository : bundleRepositories) {
File artifactFile = repository.getArtifactFile(key);
@@ -43,6 +45,7 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
return null;
}
+ @Override
public File getArtifactFile(IArtifactDescriptor descriptor) {
for (IFileArtifactRepository repository : bundleRepositories) {
File artifactFile = repository.getArtifactFile(descriptor);
@@ -52,6 +55,7 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
return null;
}
+ @Override
public boolean contains(IArtifactDescriptor descriptor) {
for (IFileArtifactRepository repository : bundleRepositories) {
if (repository.contains(descriptor))
@@ -60,6 +64,7 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
return false;
}
+ @Override
public boolean contains(IArtifactKey key) {
for (IFileArtifactRepository repository : bundleRepositories) {
if (repository.contains(key))
@@ -68,8 +73,9 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
return false;
}
+ @Override
public IArtifactDescriptor[] getArtifactDescriptors(IArtifactKey key) {
- Set<IArtifactDescriptor> artifactDescriptors = new HashSet<IArtifactDescriptor>();
+ Set<IArtifactDescriptor> artifactDescriptors = new HashSet<>();
for (IFileArtifactRepository repository : bundleRepositories) {
IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);
if (descriptors != null)
@@ -78,38 +84,45 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
return artifactDescriptors.toArray(new IArtifactDescriptor[artifactDescriptors.size()]);
}
+ @Override
public IStatus getArtifact(IArtifactDescriptor descriptor, OutputStream destination, IProgressMonitor monitor) {
throw new UnsupportedOperationException(Messages.artifact_retrieval_unsupported);
}
+ @Override
public IStatus getRawArtifact(IArtifactDescriptor descriptor, OutputStream destination, IProgressMonitor monitor) {
throw new UnsupportedOperationException(Messages.artifact_retrieval_unsupported);
}
+ @Override
public IStatus getArtifacts(IArtifactRequest[] requests, IProgressMonitor monitor) {
throw new UnsupportedOperationException(Messages.artifact_retrieval_unsupported);
}
+ @Override
public OutputStream getOutputStream(IArtifactDescriptor descriptor) {
throw new UnsupportedOperationException(Messages.artifact_write_unsupported);
}
/**
* Exposed for testing and debugging purposes.
+ *
* @noreference This method is not intended to be referenced by clients.
*/
public Collection<IFileArtifactRepository> testGetBundleRepositories() {
return bundleRepositories;
}
+ @Override
public IQueryResult<IArtifactKey> query(IQuery<IArtifactKey> query, IProgressMonitor monitor) {
// Query all the all the repositories
IQueryable<IArtifactKey> queryable = QueryUtil.compoundQueryable(bundleRepositories);
return queryable.query(query, monitor);
}
+ @Override
public IQueryable<IArtifactDescriptor> descriptorQueryable() {
- List<IQueryable<IArtifactDescriptor>> descQueryables = new ArrayList<IQueryable<IArtifactDescriptor>>(bundleRepositories.size());
+ List<IQueryable<IArtifactDescriptor>> descQueryables = new ArrayList<>(bundleRepositories.size());
for (IFileArtifactRepository repository : bundleRepositories)
descQueryables.add(repository.descriptorQueryable());
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java
index 4d9ab57c2..afa04ed1c 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java
@@ -38,8 +38,9 @@ public class EclipseMarkSetProvider extends MarkSetProvider {
private Collection<IArtifactKey> artifactKeyList = null;
+ @Override
public MarkSet[] getMarkSets(IProvisioningAgent agent, IProfile inProfile) {
- artifactKeyList = new HashSet<IArtifactKey>();
+ artifactKeyList = new HashSet<>();
IArtifactRepository repositoryToGC = Util.getBundlePoolRepository(agent, inProfile);
if (repositoryToGC == null)
return new MarkSet[0];
@@ -68,7 +69,7 @@ public class EclipseMarkSetProvider extends MarkSetProvider {
}
}
- private List<Feature> getAllFeatures(Configuration cfg) {
+ private static List<Feature> getAllFeatures(Configuration cfg) {
if (cfg == null)
return Collections.emptyList();
List<Site> sites = cfg.getSites();
@@ -82,7 +83,7 @@ public class EclipseMarkSetProvider extends MarkSetProvider {
return result;
}
- private IProfile getCurrentProfile(IProvisioningAgent agent) {
+ private static IProfile getCurrentProfile(IProvisioningAgent agent) {
IProfileRegistry pr = agent.getService(IProfileRegistry.class);
if (pr == null)
return null;
@@ -99,6 +100,7 @@ public class EclipseMarkSetProvider extends MarkSetProvider {
}
}
+ @Override
public IArtifactRepository getRepository(IProvisioningAgent agent, IProfile aProfile) {
return Util.getBundlePoolRepository(agent, aProfile);
}
@@ -107,7 +109,7 @@ public class EclipseMarkSetProvider extends MarkSetProvider {
artifactKeyList.addAll(findCorrespondinArtifacts(new WhatIsRunning().getBundlesBeingRun(), repo));
}
- private IArtifactKey searchArtifact(String searchedId, Version searchedVersion, String classifier,
+ private static IArtifactKey searchArtifact(String searchedId, Version searchedVersion, String classifier,
IArtifactRepository repo) {
// This is somewhat cheating since normally we should get the artifact key from
// the IUs that were representing the running system (e.g. we could get that
@@ -123,8 +125,8 @@ public class EclipseMarkSetProvider extends MarkSetProvider {
}
// Find for each bundle info a corresponding artifact in repo
- private List<IArtifactKey> findCorrespondinArtifacts(BundleInfo[] bis, IArtifactRepository repo) {
- ArrayList<IArtifactKey> toRetain = new ArrayList<IArtifactKey>();
+ private static List<IArtifactKey> findCorrespondinArtifacts(BundleInfo[] bis, IArtifactRepository repo) {
+ ArrayList<IArtifactKey> toRetain = new ArrayList<>();
for (int i = 0; i < bis.length; i++) {
// if version is "0.0.0", we will use null to find all versions, see bug 305710
Version version = BundleInfo.EMPTY_VERSION.equals(bis[i].getVersion()) ? null
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java
index e64b01ee7..265b3661c 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java
@@ -41,13 +41,13 @@ public class EclipseTouchpoint extends Touchpoint {
private static final Object PARM_AGENT = "agent"; //$NON-NLS-1$
private static final String NATIVE_TOUCHPOINT_ID = "org.eclipse.equinox.p2.touchpoint.natives"; //$NON-NLS-1$
- private static List<String> NATIVE_ACTIONS = Arrays.asList(new String[] {"mkdir", "rmdir"}); //$NON-NLS-1$//$NON-NLS-2$
+ private static List<String> NATIVE_ACTIONS = Arrays.asList(new String[] { "mkdir", "rmdir" }); //$NON-NLS-1$//$NON-NLS-2$
private static final String VALIDATE_PROFILE = "org.eclipse.equinox.internal.p2.touchpoint.eclipse.validateProfile"; //$NON-NLS-1$
- private static Map<IProfile, LazyManipulator> manipulators = new WeakHashMap<IProfile, LazyManipulator>();
- private static Map<IProfile, PlatformConfigurationWrapper> wrappers = new WeakHashMap<IProfile, PlatformConfigurationWrapper>();
- private static Map<IProfile, SourceManipulator> sourceManipulators = new WeakHashMap<IProfile, SourceManipulator>();
- private static Map<IProfile, Map<IInstallableUnit, IInstallableUnit>> preparedIUs = new WeakHashMap<IProfile, Map<IInstallableUnit, IInstallableUnit>>();
+ private static Map<IProfile, LazyManipulator> manipulators = new WeakHashMap<>();
+ private static Map<IProfile, PlatformConfigurationWrapper> wrappers = new WeakHashMap<>();
+ private static Map<IProfile, SourceManipulator> sourceManipulators = new WeakHashMap<>();
+ private static Map<IProfile, Map<IInstallableUnit, IInstallableUnit>> preparedIUs = new WeakHashMap<>();
private static synchronized LazyManipulator getManipulator(IProvisioningAgent agent, IProfile profile) {
LazyManipulator manipulator = manipulators.get(profile);
@@ -58,13 +58,15 @@ public class EclipseTouchpoint extends Touchpoint {
return manipulator;
}
- private static synchronized void saveManipulator(IProfile profile) throws FrameworkAdminRuntimeException, IOException {
+ private static synchronized void saveManipulator(IProfile profile)
+ throws FrameworkAdminRuntimeException, IOException {
LazyManipulator manipulator = manipulators.remove(profile);
if (manipulator != null)
manipulator.save(false);
}
- private static synchronized PlatformConfigurationWrapper getPlatformConfigurationWrapper(IProvisioningAgent agent, IProfile profile, LazyManipulator manipulator) {
+ private static synchronized PlatformConfigurationWrapper getPlatformConfigurationWrapper(IProvisioningAgent agent,
+ IProfile profile, LazyManipulator manipulator) {
PlatformConfigurationWrapper wrapper = wrappers.get(profile);
if (wrapper == null) {
File configLocation = Util.getConfigurationFolder(profile);
@@ -107,7 +109,7 @@ public class EclipseTouchpoint extends Touchpoint {
private static synchronized void savePreparedIU(IProfile profile, IInstallableUnit iu) {
Map<IInstallableUnit, IInstallableUnit> preparedProfileIUs = preparedIUs.get(profile);
if (preparedProfileIUs == null) {
- preparedProfileIUs = new HashMap<IInstallableUnit, IInstallableUnit>();
+ preparedProfileIUs = new HashMap<>();
preparedIUs.put(profile, preparedProfileIUs);
}
preparedProfileIUs.put(iu, iu);
@@ -124,6 +126,7 @@ public class EclipseTouchpoint extends Touchpoint {
preparedIUs.remove(profile);
}
+ @Override
public IStatus prepare(IProfile profile) {
try {
if (hasPreparedIUs(profile))
@@ -134,6 +137,7 @@ public class EclipseTouchpoint extends Touchpoint {
return Status.OK_STATUS;
}
+ @Override
public IStatus commit(IProfile profile) {
MultiStatus status = new MultiStatus(Activator.ID, IStatus.OK, null, null);
try {
@@ -161,25 +165,31 @@ public class EclipseTouchpoint extends Touchpoint {
return status;
}
+ @Override
public IStatus rollback(IProfile profile) {
clearProfileState(profile);
return Status.OK_STATUS;
}
+ @Override
public String qualifyAction(String actionId) {
String touchpointQualifier = NATIVE_ACTIONS.contains(actionId) ? NATIVE_TOUCHPOINT_ID : Activator.ID;
return touchpointQualifier + "." + actionId; //$NON-NLS-1$
}
- public IStatus initializePhase(IProgressMonitor monitor, IProfile profile, String phaseId, Map<String, Object> touchpointParameters) {
+ @Override
+ public IStatus initializePhase(IProgressMonitor monitor, IProfile profile, String phaseId,
+ Map<String, Object> touchpointParameters) {
IProvisioningAgent agent = (IProvisioningAgent) touchpointParameters.get(PARM_AGENT);
LazyManipulator manipulator = getManipulator(agent, profile);
touchpointParameters.put(PARM_MANIPULATOR, manipulator);
touchpointParameters.put(PARM_SOURCE_BUNDLES, getSourceManipulator(profile));
- touchpointParameters.put(PARM_PLATFORM_CONFIGURATION, getPlatformConfigurationWrapper(agent, profile, manipulator));
+ touchpointParameters.put(PARM_PLATFORM_CONFIGURATION,
+ getPlatformConfigurationWrapper(agent, profile, manipulator));
return null;
}
+ @Override
public IStatus initializeOperand(IProfile profile, Map<String, Object> parameters) {
IInstallableUnit iu = (IInstallableUnit) parameters.get(PARM_IU);
IArtifactKey artifactKey = (IArtifactKey) parameters.get(PARM_ARTIFACT);
@@ -200,7 +210,8 @@ public class EclipseTouchpoint extends Touchpoint {
return Status.OK_STATUS;
}
- public IInstallableUnit prepareIU(IProvisioningAgent agent, IProfile profile, IInstallableUnit iu, IArtifactKey artifactKey) {
+ public IInstallableUnit prepareIU(IProvisioningAgent agent, IProfile profile, IInstallableUnit iu,
+ IArtifactKey artifactKey) {
IInstallableUnit preparedIU = getPreparedIU(profile, iu);
if (preparedIU != null)
return preparedIU;
@@ -237,7 +248,7 @@ public class EclipseTouchpoint extends Touchpoint {
throw new IllegalStateException(Messages.unexpected_prepareiu_error);
}
- private IStatus validateProfile(IProfile profile) {
+ private static IStatus validateProfile(IProfile profile) {
// by default we validate
if (Boolean.FALSE.toString().equals(profile.getProperty(VALIDATE_PROFILE)))
return Status.OK_STATUS;
@@ -246,7 +257,7 @@ public class EclipseTouchpoint extends Touchpoint {
try {
c = Class.forName("org.eclipse.equinox.p2.planner.IPlanner"); //$NON-NLS-1$
} catch (ClassNotFoundException e) {
- //ignore and proceed without validation
+ // ignore and proceed without validation
return null;
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
index 9d29e2358..c7e342f28 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
@@ -25,10 +25,12 @@ import org.osgi.util.tracker.ServiceTracker;
public class LazyManipulator implements Manipulator {
- private final static String FILTER_OBJECTCLASS = "(" + Constants.OBJECTCLASS + '=' + FrameworkAdmin.class.getName() + ')'; //$NON-NLS-1$
+ private final static String FILTER_OBJECTCLASS = "(" + Constants.OBJECTCLASS + '=' + FrameworkAdmin.class.getName() //$NON-NLS-1$
+ + ')';
private final static String filterFwName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_FW_NAME + "=Equinox)"; //$NON-NLS-1$ //$NON-NLS-2$
- private final static String filterLauncherName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME + "=Eclipse.exe)"; //$NON-NLS-1$ //$NON-NLS-2$
- private final static String filterFwAdmin = "(&" + FILTER_OBJECTCLASS + filterFwName + filterLauncherName + ')'; //$NON-NLS-1$;
+ private final static String filterLauncherName = "(" + FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME //$NON-NLS-1$
+ + "=Eclipse.exe)"; //$NON-NLS-1$
+ private final static String filterFwAdmin = "(&" + FILTER_OBJECTCLASS + filterFwName + filterLauncherName + ')'; //$NON-NLS-1$ ;
private Manipulator manipulator;
private final IProfile profile;
@@ -57,7 +59,7 @@ public class LazyManipulator implements Manipulator {
try {
manipulator.load();
} catch (IllegalStateException e) {
- //if fwJar is not included, this exception will be thrown. But ignore it.
+ // if fwJar is not included, this exception will be thrown. But ignore it.
LogHelper.log(Util.createError(Messages.error_loading_manipulator, e));
throw new IllegalStateException(Messages.error_loading_manipulator);
} catch (FrameworkAdminRuntimeException e) {
@@ -66,21 +68,22 @@ public class LazyManipulator implements Manipulator {
LogHelper.log(Util.createError(Messages.error_loading_manipulator, e));
throw new IllegalStateException(Messages.error_loading_manipulator);
}
- //TODO These values should be inserted by a configuration unit (bug 204124)
+ // TODO These values should be inserted by a configuration unit (bug 204124)
manipulator.getConfigData().setProperty("eclipse.p2.profile", profile.getProfileId()); //$NON-NLS-1$
- manipulator.getConfigData().setProperty("eclipse.p2.data.area", Util.getAgentLocation(agent).getRootLocation().toString()); //$NON-NLS-1$
+ manipulator.getConfigData().setProperty("eclipse.p2.data.area", //$NON-NLS-1$
+ Util.getAgentLocation(agent).getRootLocation().toString());
}
public static FrameworkAdmin getFrameworkAdmin() {
ServiceTracker<FrameworkAdmin, FrameworkAdmin> fwAdminTracker = null;
try {
Filter filter = Activator.getContext().createFilter(filterFwAdmin);
- fwAdminTracker = new ServiceTracker<FrameworkAdmin, FrameworkAdmin>(Activator.getContext(), filter, null);
+ fwAdminTracker = new ServiceTracker<>(Activator.getContext(), filter, null);
fwAdminTracker.open();
FrameworkAdmin fwAdmin = fwAdminTracker.getService();
return fwAdmin;
} catch (InvalidSyntaxException e) {
- //Can't happen we are writing the filter ourselves
+ // Can't happen we are writing the filter ourselves
return null;
} finally {
if (fwAdminTracker != null)
@@ -88,13 +91,14 @@ public class LazyManipulator implements Manipulator {
}
}
- private Manipulator getFrameworkManipulator() {
+ private static Manipulator getFrameworkManipulator() {
FrameworkAdmin fwAdmin = getFrameworkAdmin();
if (fwAdmin != null)
return fwAdmin.getManipulator();
return null;
}
+ @Override
public void save(boolean backup) throws IOException, FrameworkAdminRuntimeException {
if (manipulator != null)
manipulator.save(backup);
@@ -102,45 +106,54 @@ public class LazyManipulator implements Manipulator {
// DELEGATE METHODS
+ @Override
public BundlesState getBundlesState() throws FrameworkAdminRuntimeException {
loadDelegate();
return manipulator.getBundlesState();
}
+ @Override
public ConfigData getConfigData() throws FrameworkAdminRuntimeException {
loadDelegate();
return manipulator.getConfigData();
}
+ @Override
public BundleInfo[] getExpectedState() throws IllegalStateException, IOException, FrameworkAdminRuntimeException {
loadDelegate();
return manipulator.getExpectedState();
}
+ @Override
public LauncherData getLauncherData() throws FrameworkAdminRuntimeException {
loadDelegate();
return manipulator.getLauncherData();
}
+ @Override
public long getTimeStamp() {
loadDelegate();
return manipulator.getTimeStamp();
}
+ @Override
public void initialize() {
loadDelegate();
manipulator.initialize();
}
+ @Override
public void load() throws IllegalStateException, FrameworkAdminRuntimeException {
loadDelegate();
}
+ @Override
public void setConfigData(ConfigData configData) {
loadDelegate();
manipulator.setConfigData(configData);
}
+ @Override
public void setLauncherData(LauncherData launcherData) {
loadDelegate();
manipulator.setLauncherData(launcherData);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java
index 75b8742c6..90e954d62 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java
@@ -26,10 +26,10 @@ import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.osgi.service.environment.Constants;
import org.eclipse.osgi.util.NLS;
-/**
- * This class provides a wrapper for reading and writing platform.xml.
+/**
+ * This class provides a wrapper for reading and writing platform.xml.
*
- * Only a minimal set of operations is exposed.
+ * Only a minimal set of operations is exposed.
*/
public class PlatformConfigurationWrapper {
@@ -46,10 +46,9 @@ public class PlatformConfigurationWrapper {
* just use the Location service here because we may not be installing into
* ourselves. (see https://bugs.eclipse.org/354552)
*
- * First try and calculate the location based relative to the data provided
- * in the manipulator's launcher data. If that doesn't work then calculate
- * it based on the location of known JARs. If that still doesn't work then
- * return null.
+ * First try and calculate the location based relative to the data provided in
+ * the manipulator's launcher data. If that doesn't work then calculate it based
+ * on the location of known JARs. If that still doesn't work then return null.
*/
private static URL getOSGiInstallArea(Manipulator manipulator) {
@@ -64,7 +63,8 @@ public class PlatformConfigurationWrapper {
}
}
- // next try and calculate the value based on the location of the framework (OSGi) jar.
+ // next try and calculate the value based on the location of the framework
+ // (OSGi) jar.
File fwkJar = launcherData.getFwJar();
if (fwkJar != null) {
try {
@@ -74,15 +74,17 @@ public class PlatformConfigurationWrapper {
}
}
- // finally calculate the value based on the location of the launcher executable itself
+ // finally calculate the value based on the location of the launcher executable
+ // itself
File launcherFile = launcherData.getLauncher();
if (launcherFile != null) {
if (Constants.OS_MACOSX.equals(launcherData.getOS())) {
- //the equinox launcher will look 3 levels up on the mac when going from executable to launcher.jar
- //see org.eclipse.equinox.executable/library/eclipse.c : findStartupJar();
+ // the equinox launcher will look 3 levels up on the mac when going from
+ // executable to launcher.jar
+ // see org.eclipse.equinox.executable/library/eclipse.c : findStartupJar();
IPath launcherPath = new Path(launcherFile.getAbsolutePath());
if (launcherPath.segmentCount() > 2) {
- //removing "Eclipse.app/Contents/MacOS/eclipse"
+ // removing "Eclipse.app/Contents/MacOS/eclipse"
launcherPath = launcherPath.removeLastSegments(2);
try {
return launcherPath.toFile().toURI().toURL();
@@ -110,7 +112,7 @@ public class PlatformConfigurationWrapper {
if (bis[i].getLocation().getScheme().equals("file")) //$NON-NLS-1$
return fromOSGiJarToOSGiInstallArea(bis[i].getLocation().getPath()).toURI().toURL();
} catch (MalformedURLException e) {
- //do nothing
+ // do nothing
}
}
if (searchFor.equals(OSGI))
@@ -161,9 +163,9 @@ public class PlatformConfigurationWrapper {
}
/*
- * Return the default policy to use when creating a new site. If there are
- * any sites with the MANAGED-ONLY policy, then that is the default.
- * Otherwise the default is USER-EXCLUDE.
+ * Return the default policy to use when creating a new site. If there are any
+ * sites with the MANAGED-ONLY policy, then that is the default. Otherwise the
+ * default is USER-EXCLUDE.
*/
private String getDefaultPolicy() {
for (Site site : configuration.getSites()) {
@@ -176,7 +178,7 @@ public class PlatformConfigurationWrapper {
/*
* Create and return a site object based on the given location.
*/
- private Site createSite(URI location, String policy) {
+ private static Site createSite(URI location, String policy) {
Site result = new Site();
result.setUrl(location.toString());
result.setPolicy(policy);
@@ -199,15 +201,15 @@ public class PlatformConfigurationWrapper {
if (nextFile.equals(file))
return nextSite;
} catch (URISyntaxException e) {
- //ignore incorrectly formed site
+ // ignore incorrectly formed site
}
}
return null;
}
/*
- * Look in the configuration and return the site which contains the feature
- * with the given identifier and version. Return null if there is none.
+ * Look in the configuration and return the site which contains the feature with
+ * the given identifier and version. Return null if there is none.
*/
private Site getSite(String id, String version) {
List<Site> sites = configuration.getSites();
@@ -221,7 +223,8 @@ public class PlatformConfigurationWrapper {
return null;
}
- public IStatus addFeatureEntry(File file, String id, String version, String pluginIdentifier, String pluginVersion, boolean primary, String application, URL[] root, String linkFile) {
+ public IStatus addFeatureEntry(File file, String id, String version, String pluginIdentifier, String pluginVersion,
+ boolean primary, String application, URL[] root, String linkFile) {
loadDelegate();
if (configuration == null)
return new Status(IStatus.WARNING, Activator.ID, Messages.platform_config_unavailable, null);
@@ -229,10 +232,12 @@ public class PlatformConfigurationWrapper {
URI fileURL = null;
File featureDir = file.getParentFile();
if (featureDir == null || !featureDir.getName().equals("features")) //$NON-NLS-1$
- return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.parent_dir_features, file.getAbsolutePath()), null);
+ return new Status(IStatus.ERROR, Activator.ID,
+ NLS.bind(Messages.parent_dir_features, file.getAbsolutePath()), null);
File locationDir = featureDir.getParentFile();
if (locationDir == null)
- return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.cannot_calculate_extension_location, file.getAbsolutePath()), null);
+ return new Status(IStatus.ERROR, Activator.ID,
+ NLS.bind(Messages.cannot_calculate_extension_location, file.getAbsolutePath()), null);
fileURL = locationDir.toURI();
Site site = getSite(fileURL);
@@ -293,7 +298,7 @@ public class PlatformConfigurationWrapper {
}
private static String makeFeatureURL(String id, String version) {
- return FEATURES + id + "_" + version + "/"; //$NON-NLS-1$ //$NON-NLS-2$;
+ return FEATURES + id + "_" + version + "/"; //$NON-NLS-1$ //$NON-NLS-2$ ;
}
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
index 79d7fa4c3..8074469c6 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
@@ -113,7 +113,7 @@ public class Util {
public static IFileArtifactRepository getAggregatedBundleRepository(IProvisioningAgent agent, IProfile profile,
int repoFilter) {
- List<IFileArtifactRepository> bundleRepositories = new ArrayList<IFileArtifactRepository>();
+ List<IFileArtifactRepository> bundleRepositories = new ArrayList<>();
// we check for a shared bundle pool first as it should be preferred over the
// user bundle pool in a shared install
@@ -332,7 +332,7 @@ public class Util {
}
if (os.equals(org.eclipse.osgi.service.environment.Constants.OS_MACOSX)) {
- return "../MacOS/" + name;
+ return "../MacOS/" + name; //$NON-NLS-1$
}
return name;
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java
index bfafdd8d9..884df1997 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java
@@ -22,7 +22,7 @@ public class WhatIsRunning {
return getFrameworkManipulator().getConfigData().getBundles();
}
- private Manipulator getFrameworkManipulator() {
+ private static Manipulator getFrameworkManipulator() {
FrameworkAdmin fwAdmin = LazyManipulator.getFrameworkAdmin();
if (fwAdmin != null)
return fwAdmin.getRunningManipulator();
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java
index f324b3e80..d65fcf9b6 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java
@@ -25,13 +25,15 @@ import org.eclipse.osgi.util.NLS;
public class AddJVMArgumentAction extends ProvisioningAction {
public static final String ID = "addJvmArg"; //$NON-NLS-1$
- protected static final String STORAGE = "org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions" + File.separator + "jvmargs"; //$NON-NLS-1$//$NON-NLS-2$
+ protected static final String STORAGE = "org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions" //$NON-NLS-1$
+ + File.separator + "jvmargs"; //$NON-NLS-1$
protected static final String XMX = "-Xmx"; //$NON-NLS-1$
protected static final String XMS = "-Xms"; //$NON-NLS-1$
protected static final String XX_MAX_PERM_SIZE = "-XX:MaxPermSize="; //$NON-NLS-1$
protected static final String PREFIX_USER_VALUE = "eclipse.userDefined:"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
String jvmArg = (String) parameters.get(ActionConstants.PARM_JVM_ARG);
if (jvmArg == null)
@@ -39,6 +41,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
return addArg(jvmArg, parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
String jvmArg = (String) parameters.get(ActionConstants.PARM_JVM_ARG);
if (jvmArg == null)
@@ -51,7 +54,8 @@ public class AddJVMArgumentAction extends ProvisioningAction {
}
protected static IStatus addArg(String arg, Map<String, Object> parameters) {
- LauncherData launcherData = ((Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR)).getLauncherData();
+ LauncherData launcherData = ((Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR))
+ .getLauncherData();
File storageArea = (File) parameters.get(ActionConstants.PARM_PROFILE_DATA_DIRECTORY);
try {
if (arg.startsWith(XMS))
@@ -71,7 +75,8 @@ public class AddJVMArgumentAction extends ProvisioningAction {
return Status.OK_STATUS;
}
- protected static void addByteArg(String arg, String flag, LauncherData launcherData, File storageArea) throws IOException {
+ protected static void addByteArg(String arg, String flag, LauncherData launcherData, File storageArea)
+ throws IOException {
Properties storedValues = load(storageArea);
String currentArg = getCurrentArg(flag, launcherData.getJvmArgs());
@@ -87,7 +92,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
save(storedValues, storageArea);
}
- // Throws exception if the argument is not a valid byte argument
+ // Throws exception if the argument is not a valid byte argument
protected static void validateValue(String arg) {
getByteValue(arg, getBytePower(arg));
}
@@ -100,7 +105,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
// User has removed value from file
setUserArg(storedValues, flag, null);
else if (maxValue == null || !maxValue.equals(currentValue.substring(flag.length())))
- // User has set an initial value, or modified the file
+ // User has set an initial value, or modified the file
setUserArg(storedValues, flag, currentValue.substring(flag.length()));
}
@@ -132,7 +137,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
}
}
- // Returns: 1 when a>b, 0 when a=b, -1 when a<b
+ // Returns: 1 when a>b, 0 when a=b, -1 when a<b
protected static int compareSize(String a, String b) {
double aVal, bVal;
int aPower = getBytePower(a);
@@ -140,7 +145,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
aVal = getByteValue(a, aPower);
bVal = getByteValue(b, bPower);
- // Ensure a value is expressed with the highest power (e.g. 2G not 2048M)
+ // Ensure a value is expressed with the highest power (e.g. 2G not 2048M)
while (aVal > 1024) {
aVal /= 1024;
aPower += 10;
@@ -154,7 +159,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
return 1;
else if (aPower < bPower && bVal != 0)
return -1;
- // Both have same power, so direct comparison
+ // Both have same power, so direct comparison
else if (aVal > bVal)
return 1;
else if (aVal < bVal)
@@ -175,24 +180,24 @@ public class AddJVMArgumentAction extends ProvisioningAction {
}
private static int getBytePower(String arg) {
- // If last digit determines if the value is in bytes,
- // kilobytes, megabytes, or gigabytes
+ // If last digit determines if the value is in bytes,
+ // kilobytes, megabytes, or gigabytes
switch (arg.charAt(arg.length() - 1)) {
- case 'k' :
- case 'K' :
- return 10;
- case 'm' :
- case 'M' :
- return 20;
- case 'g' :
- case 'G' :
- return 30;
- default :
- return 0;
+ case 'k':
+ case 'K':
+ return 10;
+ case 'm':
+ case 'M':
+ return 20;
+ case 'g':
+ case 'G':
+ return 30;
+ default:
+ return 0;
}
}
- // Get the current used argument if there is one
+ // Get the current used argument if there is one
protected static String getCurrentArg(String flag, String[] jvmArgs) {
for (int i = 0; i < jvmArgs.length; i++)
if (jvmArgs[i] != null && jvmArgs[i].startsWith(flag))
@@ -271,7 +276,7 @@ public class AddJVMArgumentAction extends ProvisioningAction {
FileOutputStream out = null;
File file = new File(storageArea, STORAGE);
if (!file.exists())
- // Ensure parent directory exists
+ // Ensure parent directory exists
file.getParentFile().mkdirs();
try {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramArgumentAction.java
index 08ca6dbe5..158abf075 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramArgumentAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramArgumentAction.java
@@ -24,6 +24,7 @@ import org.eclipse.osgi.util.NLS;
public class AddProgramArgumentAction extends ProvisioningAction {
public static final String ID = "addProgramArg"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String programArg = (String) parameters.get(ActionConstants.PARM_PROGRAM_ARG);
@@ -57,6 +58,7 @@ public class AddProgramArgumentAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String programArg = (String) parameters.get(ActionConstants.PARM_PROGRAM_ARG);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java
index 30a597086..dc628f87b 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java
@@ -45,6 +45,7 @@ public class AddProgramPropertyAction extends ProvisioningAction {
return buffer.toString();
}
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String propName = (String) parameters.get(ActionConstants.PARM_PROP_NAME);
@@ -75,6 +76,7 @@ public class AddProgramPropertyAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String propName = (String) parameters.get(ActionConstants.PARM_PROP_NAME);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java
index 2b5a6bc56..14b391a8d 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddRepositoryAction.java
@@ -27,6 +27,7 @@ import org.eclipse.equinox.p2.engine.IProfileRegistry;
public class AddRepositoryAction extends RepositoryAction {
public static final String ID = "addRepository"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
try {
IProvisioningAgent agent = getAgent(parameters);
@@ -52,6 +53,7 @@ public class AddRepositoryAction extends RepositoryAction {
return ID;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
try {
IProvisioningAgent agent = getAgent(parameters);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddSourceBundleAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddSourceBundleAction.java
index 679a0a2f2..2e09d9790 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddSourceBundleAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddSourceBundleAction.java
@@ -30,10 +30,12 @@ import org.eclipse.osgi.util.NLS;
public class AddSourceBundleAction extends ProvisioningAction {
public static final String ID = "addSourceBundle"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
return AddSourceBundleAction.addSourceBundle(parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return RemoveSourceBundleAction.removeSourceBundle(parameters);
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CheckTrustAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CheckTrustAction.java
index 0860dd56f..201535517 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CheckTrustAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CheckTrustAction.java
@@ -36,6 +36,7 @@ public class CheckTrustAction extends ProvisioningAction {
public static final String ID = "checkTrust"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
if (iu == null)
@@ -58,6 +59,7 @@ public class CheckTrustAction extends ProvisioningAction {
return null;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return Status.OK_STATUS;
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java
index bdd2abf00..a7186cf0b 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java
@@ -29,10 +29,12 @@ public class ChmodAction extends ProvisioningAction {
private static final String ACTION_CHMOD = "chmod"; //$NON-NLS-1$
private static final boolean WINDOWS = java.io.File.separatorChar == '\\';
+ @Override
public IStatus execute(Map<String, Object> parameters) {
String targetDir = (String) parameters.get(ActionConstants.PARM_TARGET_DIR);
if (targetDir == null)
- return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_TARGET_DIR, ACTION_CHMOD));
+ return Util
+ .createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_TARGET_DIR, ACTION_CHMOD));
if (targetDir.equals(ActionConstants.PARM_AT_ARTIFACT)) {
try {
targetDir = Util.resolveArtifactParam(parameters);
@@ -48,16 +50,19 @@ public class ChmodAction extends ProvisioningAction {
String targetFile = (String) parameters.get(ActionConstants.PARM_TARGET_FILE);
if (targetFile == null)
- return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_TARGET_FILE, ACTION_CHMOD));
+ return Util
+ .createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_TARGET_FILE, ACTION_CHMOD));
String permissions = (String) parameters.get(ActionConstants.PARM_PERMISSIONS);
if (permissions == null)
- return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_PERMISSIONS, ACTION_CHMOD));
+ return Util
+ .createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_PERMISSIONS, ACTION_CHMOD));
String optionsString = (String) parameters.get(ActionConstants.PARM_OPTIONS);
// Check that file exist
File probe = new File(targetDir + IPath.SEPARATOR + targetFile);
if (!probe.exists())
- return Util.createError(NLS.bind(Messages.action_0_failed_file_1_doesNotExist, ACTION_CHMOD, probe.toString()));
+ return Util.createError(
+ NLS.bind(Messages.action_0_failed_file_1_doesNotExist, ACTION_CHMOD, probe.toString()));
String options[] = null;
if (optionsString != null) {
@@ -83,8 +88,9 @@ public class ChmodAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
- //TODO: implement undo ??
+ // TODO: implement undo ??
return Status.OK_STATUS;
}
@@ -117,7 +123,7 @@ public class ChmodAction extends ProvisioningAction {
}
}
- private void readOffStream(InputStream inputStream) {
+ private static void readOffStream(InputStream inputStream) {
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
try {
while (reader.readLine() != null) {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
index 279addd8b..7cb5074ad 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
@@ -29,6 +29,7 @@ public class CollectAction extends ProvisioningAction {
public static final String ID = "collect"; //$NON-NLS-1$
public static final String ARTIFACT_FOLDER = "artifact.folder"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
IProvisioningAgent agent = (IProvisioningAgent) parameters.get(ActionConstants.PARM_AGENT);
IProfile profile = (IProfile) parameters.get(ActionConstants.PARM_PROFILE);
@@ -41,11 +42,13 @@ public class CollectAction extends ProvisioningAction {
}
@SuppressWarnings("unchecked")
- Collection<IArtifactRequest[]> artifactRequests = (Collection<IArtifactRequest[]>) parameters.get(ActionConstants.PARM_ARTIFACT_REQUESTS);
+ Collection<IArtifactRequest[]> artifactRequests = (Collection<IArtifactRequest[]>) parameters
+ .get(ActionConstants.PARM_ARTIFACT_REQUESTS);
artifactRequests.add(requests);
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
// nothing to do for now
return Status.OK_STATUS;
@@ -71,7 +74,8 @@ public class CollectAction extends ProvisioningAction {
}
// TODO: Here we may want to consult multiple caches
- static IArtifactRequest[] collect(IProvisioningAgent agent, IProfile profile, IInstallableUnit installableUnit) throws ProvisionException {
+ static IArtifactRequest[] collect(IProvisioningAgent agent, IProfile profile, IInstallableUnit installableUnit)
+ throws ProvisionException {
Collection<IArtifactKey> toDownload = installableUnit.getArtifacts();
if (toDownload == null || toDownload.size() == 0)
return IArtifactRepositoryManager.NO_ARTIFACT_REQUEST;
@@ -81,11 +85,13 @@ public class CollectAction extends ProvisioningAction {
if (bundlePool == null)
throw new ProvisionException(Util.createError(NLS.bind(Messages.no_bundle_pool, profile.getProfileId())));
- List<IArtifactRequest> requests = new ArrayList<IArtifactRequest>();
+ List<IArtifactRequest> requests = new ArrayList<>();
for (IArtifactKey key : toDownload) {
if (!aggregatedRepositoryView.contains(key)) {
- Map<String, String> repositoryProperties = CollectAction.createArtifactDescriptorProperties(installableUnit);
- requests.add(Util.getArtifactRepositoryManager(agent).createMirrorRequest(key, bundlePool, null, repositoryProperties, profile.getProperty(IProfile.PROP_STATS_PARAMETERS)));
+ Map<String, String> repositoryProperties = CollectAction
+ .createArtifactDescriptorProperties(installableUnit);
+ requests.add(Util.getArtifactRepositoryManager(agent).createMirrorRequest(key, bundlePool, null,
+ repositoryProperties, profile.getProperty(IProfile.PROP_STATS_PARAMETERS)));
}
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
index 9aab8d648..f105de603 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
@@ -33,10 +33,12 @@ import org.eclipse.osgi.util.NLS;
public class InstallBundleAction extends ProvisioningAction {
public static final String ID = "installBundle"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
return InstallBundleAction.installBundle(parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return UninstallBundleAction.uninstallBundle(parameters);
}
@@ -50,7 +52,7 @@ public class InstallBundleAction extends ProvisioningAction {
if (bundleId == null)
return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_BUNDLE, ID));
- //TODO: eventually remove this. What is a fragment doing here??
+ // TODO: eventually remove this. What is a fragment doing here??
if (QueryUtil.isFragment(iu)) {
System.out.println("What is a fragment doing here!!! -- " + iu); //$NON-NLS-1$
return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java
index d8b39566f..81f5e291b 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallFeatureAction.java
@@ -32,17 +32,20 @@ public class InstallFeatureAction extends ProvisioningAction {
private static final String UPDATE_FEATURE_PLUGIN_PROP = "org.eclipse.update.feature.plugin"; //$NON-NLS-1$
private static final String UPDATE_FEATURE_PRIMARY_PROP = "org.eclipse.update.feature.primary"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
return InstallFeatureAction.installFeature(parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return UninstallFeatureAction.uninstallFeature(parameters);
}
public static IStatus installFeature(Map<String, Object> parameters) {
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
- PlatformConfigurationWrapper configuration = (PlatformConfigurationWrapper) parameters.get(EclipseTouchpoint.PARM_PLATFORM_CONFIGURATION);
+ PlatformConfigurationWrapper configuration = (PlatformConfigurationWrapper) parameters
+ .get(EclipseTouchpoint.PARM_PLATFORM_CONFIGURATION);
String feature = (String) parameters.get(ActionConstants.PARM_FEATURE);
String featureId = (String) parameters.get(ActionConstants.PARM_FEATURE_ID);
String featureVersion = (String) parameters.get(ActionConstants.PARM_FEATURE_VERSION);
@@ -80,8 +83,10 @@ public class InstallFeatureAction extends ProvisioningAction {
String pluginId = iu.getProperty(UPDATE_FEATURE_PLUGIN_PROP);
boolean isPrimary = Boolean.parseBoolean(iu.getProperty(UPDATE_FEATURE_PRIMARY_PROP));
String application = iu.getProperty(UPDATE_FEATURE_APPLICATION_PROP);
- // TODO this isn't right... but we will leave it for now because we don't actually use the value in the install
+ // TODO this isn't right... but we will leave it for now because we don't
+ // actually use the value in the install
String pluginVersion = artifactKey.getVersion().toString();
- return configuration.addFeatureEntry(file, featureId, featureVersion, pluginId, pluginVersion, isPrimary, application, /*root*/null, iu.getProperty(Site.PROP_LINK_FILE));
+ return configuration.addFeatureEntry(file, featureId, featureVersion, pluginId, pluginVersion, isPrimary,
+ application, /* root */null, iu.getProperty(Site.PROP_LINK_FILE));
}
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/LinkAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/LinkAction.java
index 9c34f2511..1ea9bc70e 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/LinkAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/LinkAction.java
@@ -26,6 +26,7 @@ public class LinkAction extends ProvisioningAction {
public static final String ID = "ln"; //$NON-NLS-1$
private static final boolean WINDOWS = java.io.File.separatorChar == '\\';
+ @Override
public IStatus execute(Map<String, Object> parameters) {
String targetDir = (String) parameters.get(ActionConstants.PARM_TARGET_DIR);
if (targetDir == null)
@@ -57,26 +58,29 @@ public class LinkAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return null;
}
/**
- * Creates a link to the source file linkTarget - the created link is targetDir/linkName.
- * TODO: Only runs on systems with a "ln -s" command supported.
- * TODO: Does not report errors if the "ln -s" fails
- * @param targetDir the directory where the link is created
+ * Creates a link to the source file linkTarget - the created link is
+ * targetDir/linkName. TODO: Only runs on systems with a "ln -s" command
+ * supported. TODO: Does not report errors if the "ln -s" fails
+ *
+ * @param targetDir the directory where the link is created
* @param linkTarget the source
- * @param linkName the name of the created link
- * @param force if overwrite of existing file should be performed.
+ * @param linkName the name of the created link
+ * @param force if overwrite of existing file should be performed.
*/
- private void ln(String targetDir, String linkTarget, String linkName, boolean force) {
+ private static void ln(String targetDir, String linkTarget, String linkName, boolean force) {
if (WINDOWS)
return;
Runtime r = Runtime.getRuntime();
try {
- Process process = r.exec(new String[] {"ln", "-s" + (force ? "f" : ""), linkTarget, targetDir + IPath.SEPARATOR + linkName}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ Process process = r.exec(new String[] { "ln", "-s" + (force ? "f" : ""), linkTarget, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ targetDir + IPath.SEPARATOR + linkName });
readOffStream(process.getErrorStream());
readOffStream(process.getInputStream());
try {
@@ -90,7 +94,7 @@ public class LinkAction extends ProvisioningAction {
}
}
- private void readOffStream(InputStream inputStream) {
+ private static void readOffStream(InputStream inputStream) {
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
try {
while (reader.readLine() != null) {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
index 5f805f8af..cc940ad82 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
@@ -27,6 +27,7 @@ import org.eclipse.osgi.util.NLS;
public class MarkStartedAction extends ProvisioningAction {
public static final String ID = "markStarted"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
@@ -35,7 +36,8 @@ public class MarkStartedAction extends ProvisioningAction {
return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_STARTED, ID));
}
- // Changes to this object will be reflected in the backing runtime configuration store
+ // Changes to this object will be reflected in the backing runtime configuration
+ // store
BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
if (bundleInfo == null) {
return Util.createWarning(NLS.bind(Messages.failed_find_bundleinfo, iu));
@@ -51,6 +53,7 @@ public class MarkStartedAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Boolean previousStarted = (Boolean) getMemento().get(ActionConstants.PARM_PREVIOUS_STARTED);
if (previousStarted == null) {
@@ -60,7 +63,8 @@ public class MarkStartedAction extends ProvisioningAction {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
- // Changes to this object will be reflected in the backing runtime configuration store
+ // Changes to this object will be reflected in the backing runtime configuration
+ // store
BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
if (bundleInfo == null) {
return Util.createWarning(NLS.bind(Messages.failed_find_bundleinfo, iu));
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java
index bc733872b..b7c987924 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java
@@ -28,6 +28,7 @@ import org.eclipse.osgi.util.NLS;
public class RemoveJVMArgumentAction extends ProvisioningAction {
public static final String ID = "removeJvmArg"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
String jvmArg = (String) parameters.get(ActionConstants.PARM_JVM_ARG);
if (jvmArg == null)
@@ -36,6 +37,7 @@ public class RemoveJVMArgumentAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
String jvmArg = (String) parameters.get(ActionConstants.PARM_JVM_ARG);
if (jvmArg == null)
@@ -45,7 +47,8 @@ public class RemoveJVMArgumentAction extends ProvisioningAction {
}
public static IStatus removeArg(String arg, Map<String, Object> parameters) {
- LauncherData launcherData = ((Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR)).getLauncherData();
+ LauncherData launcherData = ((Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR))
+ .getLauncherData();
File storageArea = (File) parameters.get(ActionConstants.PARM_PROFILE_DATA_DIRECTORY);
try {
@@ -66,7 +69,8 @@ public class RemoveJVMArgumentAction extends ProvisioningAction {
return Status.OK_STATUS;
}
- private static void removeByteArg(String arg, String flag, LauncherData launcherData, File storageArea) throws IOException {
+ private static void removeByteArg(String arg, String flag, LauncherData launcherData, File storageArea)
+ throws IOException {
Properties storedValues = AddJVMArgumentAction.load(storageArea);
String argValue = arg.substring(flag.length());
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramArgumentAction.java
index 7e4824dac..923eafad8 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramArgumentAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramArgumentAction.java
@@ -26,6 +26,7 @@ public class RemoveProgramArgumentAction extends ProvisioningAction {
public static final String ID = "removeProgramArg"; //$NON-NLS-1$
public static final String EMPTY_ARGUMENT = ""; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String programArg = (String) parameters.get(ActionConstants.PARM_PROGRAM_ARG);
@@ -51,6 +52,7 @@ public class RemoveProgramArgumentAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String programArg = (String) parameters.get(ActionConstants.PARM_PROGRAM_ARG);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramPropertyAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramPropertyAction.java
index ae46ce101..19410bbe7 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramPropertyAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveProgramPropertyAction.java
@@ -27,6 +27,7 @@ import org.eclipse.osgi.util.NLS;
public class RemoveProgramPropertyAction extends ProvisioningAction {
public static final String ID = "removeProgramProperty"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String propName = (String) parameters.get(ActionConstants.PARM_PROP_NAME);
@@ -57,6 +58,7 @@ public class RemoveProgramPropertyAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String propName = (String) parameters.get(ActionConstants.PARM_PROP_NAME);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java
index d0ba4bea2..c1811578f 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveRepositoryAction.java
@@ -27,6 +27,7 @@ import org.eclipse.equinox.p2.engine.IProfileRegistry;
public class RemoveRepositoryAction extends RepositoryAction {
public static final String ID = "removeRepository"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
try {
IProvisioningAgent agent = getAgent(parameters);
@@ -47,6 +48,7 @@ public class RemoveRepositoryAction extends RepositoryAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
try {
IProvisioningAgent agent = getAgent(parameters);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveSourceBundleAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveSourceBundleAction.java
index 4eccc230e..d2fcda0f1 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveSourceBundleAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveSourceBundleAction.java
@@ -30,10 +30,12 @@ import org.eclipse.osgi.util.NLS;
public class RemoveSourceBundleAction extends ProvisioningAction {
public static final String ID = "removeSourceBundle"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
return RemoveSourceBundleAction.removeSourceBundle(parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return AddSourceBundleAction.addSourceBundle(parameters);
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java
index 0b6868dae..2532dc4f0 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java
@@ -260,7 +260,7 @@ abstract class RepositoryAction extends ProvisioningAction {
/*
* Copied from AbstractRepositoryManager
*/
- private String getKey(URI location) {
+ private static String getKey(URI location) {
String key = location.toString().replace('/', '_');
// remove trailing slash
if (key.endsWith("_")) //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetJvmAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetJvmAction.java
index 9a682eb1e..1005ac00c 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetJvmAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetJvmAction.java
@@ -33,6 +33,7 @@ import org.eclipse.osgi.util.NLS;
public class SetJvmAction extends ProvisioningAction {
public static final String ID = "setJvm"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
String jvmArg = (String) parameters.get(ActionConstants.PARM_JVM);
if (jvmArg == null)
@@ -47,6 +48,7 @@ public class SetJvmAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
String jvmArg = (String) parameters.get(ActionConstants.PARM_JVM);
if (jvmArg == null)
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java
index 2e74c6bc6..ce6f5878b 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java
@@ -27,15 +27,18 @@ import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
public class SetLauncherNameAction extends ProvisioningAction {
public static final String ID = "setLauncherName"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
IProfile profile = (IProfile) parameters.get(ActionConstants.PARM_PROFILE);
- getMemento().put(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME, profile.getProperty(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME));
+ getMemento().put(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME,
+ profile.getProperty(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME));
String launcherName = (String) parameters.get(ActionConstants.PARM_LAUNCHERNAME);
setLauncher(manipulator, profile, launcherName);
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
IProfile profile = (IProfile) parameters.get(ActionConstants.PARM_PROFILE);
@@ -45,7 +48,8 @@ public class SetLauncherNameAction extends ProvisioningAction {
}
private static void setLauncher(Manipulator manipulator, IProfile profile, String launcherName) {
- //Get the launcherData before changing the name so we don't lose anything from the old launcher.ini
+ // Get the launcherData before changing the name so we don't lose anything from
+ // the old launcher.ini
LauncherData launcherData = manipulator.getLauncherData();
if (launcherName != null)
((Profile) profile).setProperty(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME, launcherName);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetProgramPropertyAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetProgramPropertyAction.java
index 0630090cc..a24e1672f 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetProgramPropertyAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetProgramPropertyAction.java
@@ -24,6 +24,7 @@ import org.eclipse.osgi.util.NLS;
public class SetProgramPropertyAction extends ProvisioningAction {
public static final String ID = "setProgramProperty"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String propName = (String) parameters.get(ActionConstants.PARM_PROP_NAME);
@@ -43,6 +44,7 @@ public class SetProgramPropertyAction extends ProvisioningAction {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
String propName = (String) parameters.get(ActionConstants.PARM_PROP_NAME);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
index 787ee678f..9efb50802 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
@@ -27,6 +27,7 @@ import org.eclipse.osgi.util.NLS;
public class SetStartLevelAction extends ProvisioningAction {
public static final String ID = "setStartLevel"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
@@ -35,7 +36,8 @@ public class SetStartLevelAction extends ProvisioningAction {
return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_START_LEVEL, ID));
}
- // Changes to this object will be reflected in the backing runtime configuration store
+ // Changes to this object will be reflected in the backing runtime configuration
+ // store
BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
if (bundleInfo == null) {
return Util.createWarning(NLS.bind(Messages.failed_find_bundleinfo, iu));
@@ -51,10 +53,12 @@ public class SetStartLevelAction extends ProvisioningAction {
bundleInfo.setStartLevel(Integer.parseInt(startLevel));
return Status.OK_STATUS;
} catch (NumberFormatException e) {
- return Util.createError(NLS.bind(Messages.error_parsing_startlevel, startLevel, bundleInfo.getSymbolicName()), e);
+ return Util.createError(
+ NLS.bind(Messages.error_parsing_startlevel, startLevel, bundleInfo.getSymbolicName()), e);
}
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
Integer previousStartLevel = (Integer) getMemento().get(ActionConstants.PARM_PREVIOUS_START_LEVEL);
if (previousStartLevel == null) {
@@ -63,7 +67,8 @@ public class SetStartLevelAction extends ProvisioningAction {
Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
- // Changes to this object will be reflected in the backing runtime configuration store
+ // Changes to this object will be reflected in the backing runtime configuration
+ // store
BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
if (bundleInfo == null) {
return Util.createWarning(NLS.bind(Messages.failed_find_bundleinfo, iu));
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
index 869d76750..cbd1ea1fa 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
@@ -28,10 +28,12 @@ import org.eclipse.osgi.util.NLS;
public class UninstallBundleAction extends ProvisioningAction {
public static final String ID = "uninstallBundle"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
return UninstallBundleAction.uninstallBundle(parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return InstallBundleAction.installBundle(parameters);
}
@@ -44,13 +46,14 @@ public class UninstallBundleAction extends ProvisioningAction {
return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_BUNDLE, ID));
}
- //TODO: eventually remove this. What is a fragment doing here??
+ // TODO: eventually remove this. What is a fragment doing here??
if (QueryUtil.isFragment(iu)) {
System.out.println("What is a fragment doing here!!! -- " + iu); //$NON-NLS-1$
return Status.OK_STATUS;
}
- // Changes to this object will be reflected in the backing runtime configuration store
+ // Changes to this object will be reflected in the backing runtime configuration
+ // store
BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
if (bundleInfo == null) {
return Util.createWarning(NLS.bind(Messages.failed_find_bundleinfo, iu));
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallFeatureAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallFeatureAction.java
index 152e2ddd3..127f3f1b7 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallFeatureAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallFeatureAction.java
@@ -25,17 +25,20 @@ import org.eclipse.osgi.util.NLS;
public class UninstallFeatureAction extends ProvisioningAction {
public static final String ID = "uninstallFeature"; //$NON-NLS-1$
+ @Override
public IStatus execute(Map<String, Object> parameters) {
return UninstallFeatureAction.uninstallFeature(parameters);
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
return InstallFeatureAction.installFeature(parameters);
}
public static IStatus uninstallFeature(Map<String, Object> parameters) {
IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
- PlatformConfigurationWrapper configuration = (PlatformConfigurationWrapper) parameters.get(EclipseTouchpoint.PARM_PLATFORM_CONFIGURATION);
+ PlatformConfigurationWrapper configuration = (PlatformConfigurationWrapper) parameters
+ .get(EclipseTouchpoint.PARM_PLATFORM_CONFIGURATION);
String feature = (String) parameters.get(ActionConstants.PARM_FEATURE);
String featureId = (String) parameters.get(ActionConstants.PARM_FEATURE_ID);
String featureVersion = (String) parameters.get(ActionConstants.PARM_FEATURE_VERSION);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationCache.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationCache.java
index 09ec40422..f8dc9de3e 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationCache.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationCache.java
@@ -23,7 +23,7 @@ import java.util.Map;
*
*/
public class ConfigurationCache {
- private static Map<String, CacheEntry> cache = new HashMap<String, CacheEntry>();
+ private static Map<String, CacheEntry> cache = new HashMap<>();
// class used to represent cache values
static class CacheEntry {
@@ -43,9 +43,9 @@ public class ConfigurationCache {
}
/*
- * Return the configuration object in the cache which is represented
- * by the given file. Do a check on disk to see if the cache is up-to-date.
- * If not, then treat it as a cache miss.
+ * Return the configuration object in the cache which is represented by the
+ * given file. Do a check on disk to see if the cache is up-to-date. If not,
+ * then treat it as a cache miss.
*/
public static Configuration get(File file) {
String key = toKey(file);
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java
index de0ccdd28..c1c5c0542 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java
@@ -26,7 +26,7 @@ import org.w3c.dom.*;
import org.xml.sax.SAXException;
/**
- * Parser for platform.xml files.
+ * Parser for platform.xml files.
*
* @since 1.0
*/
@@ -35,8 +35,8 @@ public class ConfigurationParser implements ConfigurationConstants {
private URL osgiInstallArea;
/*
- * Parse the given file handle which points to a platform.xml file and a configuration object.
- * Returns null if the file doesn't exist.
+ * Parse the given file handle which points to a platform.xml file and a
+ * configuration object. Returns null if the file doesn't exist.
*/
static Configuration parse(File file, URL osgiInstallArea) throws ProvisionException {
return new ConfigurationParser(osgiInstallArea).internalParse(file);
@@ -47,10 +47,9 @@ public class ConfigurationParser implements ConfigurationConstants {
}
/*
- * Create a feature object based on the given DOM node.
- * Return the new feature.
+ * Create a feature object based on the given DOM node. Return the new feature.
*/
- private Feature createFeature(Node node, Site site) {
+ private static Feature createFeature(Node node, Site site) {
Feature result = new Feature(site);
String id = getAttribute(node, ATTRIBUTE_ID);
if (id != null)
@@ -102,7 +101,7 @@ public class ConfigurationParser implements ConfigurationConstants {
/*
* Create the features from the given DOM node.
*/
- private void createFeatures(Node node, Site site) {
+ private static void createFeatures(Node node, Site site) {
NodeList children = node.getChildNodes();
int size = children.getLength();
for (int i = 0; i < size; i++) {
@@ -154,11 +153,10 @@ public class ConfigurationParser implements ConfigurationConstants {
}
/*
- * Convert the given url string to an absolute url. If the string is
- * platform:/base/ then return a string which represents the osgi
- * install area.
+ * Convert the given url string to an absolute url. If the string is
+ * platform:/base/ then return a string which represents the osgi install area.
*/
- private URI getLocation(URI location, URI osgiArea) {
+ private static URI getLocation(URI location, URI osgiArea) {
if (osgiArea == null)
return location;
if (PLATFORM_BASE.equals(location.toString()))
@@ -167,10 +165,9 @@ public class ConfigurationParser implements ConfigurationConstants {
}
/*
- * Return the attribute with the given name, or null if it does
- * not exist.
+ * Return the attribute with the given name, or null if it does not exist.
*/
- private String getAttribute(Node node, String name) {
+ private static String getAttribute(Node node, String name) {
NamedNodeMap attributes = node.getAttributes();
Node temp = attributes.getNamedItem(name);
return temp == null ? null : temp.getNodeValue();
@@ -179,7 +176,7 @@ public class ConfigurationParser implements ConfigurationConstants {
/*
* Load the given file into a DOM document.
*/
- private Document load(InputStream input) throws ParserConfigurationException, IOException, SAXException {
+ private static Document load(InputStream input) throws ParserConfigurationException, IOException, SAXException {
// load the feature xml
DocumentBuilderFactory factory = SecureXMLUtil.newSecureDocumentBuilderFactory();
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -197,8 +194,8 @@ public class ConfigurationParser implements ConfigurationConstants {
}
/*
- * Parse the given file handle which points to a platform.xml file and a configuration object.
- * Returns null if the file doesn't exist.
+ * Parse the given file handle which points to a platform.xml file and a
+ * configuration object. Returns null if the file doesn't exist.
*/
private Configuration internalParse(File file) throws ProvisionException {
if (!file.exists()) {
@@ -227,8 +224,7 @@ public class ConfigurationParser implements ConfigurationConstants {
}
/*
- * Process the given DOM document and create the appropriate
- * site objects.
+ * Process the given DOM document and create the appropriate site objects.
*/
private Configuration process(Document document) {
Node node = getConfigElement(document);
@@ -250,7 +246,7 @@ public class ConfigurationParser implements ConfigurationConstants {
return configuration;
}
- private Configuration createConfiguration(Node node) {
+ private static Configuration createConfiguration(Node node) {
Configuration result = new Configuration();
String value = getAttribute(node, ATTRIBUTE_DATE);
if (value != null)
@@ -267,7 +263,7 @@ public class ConfigurationParser implements ConfigurationConstants {
return result;
}
- private Node getConfigElement(Document doc) {
+ private static Node getConfigElement(Document doc) {
NodeList children = doc.getChildNodes();
int size = children.getLength();
for (int i = 0; i < size; i++) {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java
index 82abd4668..942c6bc4d 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Feature.java
@@ -122,7 +122,7 @@ public class Feature {
return true;
}
- private boolean equals(Object one, Object two) {
+ private static boolean equals(Object one, Object two) {
return one == null ? two == null : one.equals(two);
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
index 49a23964c..1052f50ad 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
index 4b0f13e34..15962f796 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml
index 4f58d4eda..691ac56f5 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml b/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml
index 9ad068ee1..005906ade 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
index 0e0a55838..4576d50a4 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml b/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
index 49063015a..5efed4151 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF
index 5b57c0e65..08fa69d05 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.p2.ui.sdk.scheduler;singleton:=true
-Bundle-Version: 1.4.300.qualifier
+Bundle-Version: 1.4.400.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
index ffa0fc88f..5e6e81edf 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.ui.sdk.scheduler</artifactId>
- <version>1.4.300-SNAPSHOT</version>
+ <version>1.4.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java
index 117ba25dc..5b5bc9ba6 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java
@@ -33,10 +33,11 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
/**
- * Activator class for the automatic updates plugin. The automatic updates plugin
- * is responsible for scheduling background update checks, based on update settings
- * specified by end user settings. The implementation of update checking is provided
- * by another plugin that provides an IUpdateChecker implementation.
+ * Activator class for the automatic updates plugin. The automatic updates
+ * plugin is responsible for scheduling background update checks, based on
+ * update settings specified by end user settings. The implementation of update
+ * checking is provided by another plugin that provides an IUpdateChecker
+ * implementation.
*/
public class AutomaticUpdatePlugin extends AbstractUIPlugin {
@@ -84,8 +85,6 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
context = bundleContext;
IProvisioningAgent agent = ServiceHelper.getService(getContext(), IProvisioningAgent.class);
session = new ProvisioningSession(agent);
-
- PreferenceInitializer.migratePreferences();
}
@Override
@@ -128,7 +127,7 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
}
/*
- * Overridden to use a profile scoped preference store.
+ * Overridden to use a profile scoped preference store.
*/
@Override
public IPreferenceStore getPreferenceStore() {
@@ -137,7 +136,8 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
final IAgentLocation agentLocation = getAgentLocation();
if (agentLocation == null)
return super.getPreferenceStore();
- preferenceStore = new ScopedPreferenceStore(new ProfileScope(agentLocation, IProfileRegistry.SELF), PLUGIN_ID);
+ preferenceStore = new ScopedPreferenceStore(new ProfileScope(agentLocation, IProfileRegistry.SELF),
+ PLUGIN_ID);
}
return preferenceStore;
}
@@ -156,7 +156,10 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
try {
preferenceStore.save();
} catch (IOException e) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, AutomaticUpdatePlugin.PLUGIN_ID, 0, AutomaticUpdateMessages.ErrorSavingPreferences, e), StatusManager.LOG | StatusManager.SHOW);
+ StatusManager.getManager()
+ .handle(new Status(IStatus.ERROR, AutomaticUpdatePlugin.PLUGIN_ID, 0,
+ AutomaticUpdateMessages.ErrorSavingPreferences, e),
+ StatusManager.LOG | StatusManager.SHOW);
}
}
@@ -182,7 +185,8 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
}
public IProvisioningAgentProvider getAgentProvider() {
- ServiceReference<IProvisioningAgentProvider> ref = getContext().getServiceReference(IProvisioningAgentProvider.class);
+ ServiceReference<IProvisioningAgentProvider> ref = getContext()
+ .getServiceReference(IProvisioningAgentProvider.class);
if (ref == null)
return null;
IProvisioningAgentProvider agentProvider = getContext().getService(ref);
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreferenceInitializer.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreferenceInitializer.java
index eb4e836f3..96b4ee1cc 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreferenceInitializer.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreferenceInitializer.java
@@ -15,177 +15,12 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.ui.sdk.scheduler;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.preferences.*;
-import org.eclipse.equinox.p2.core.IAgentLocation;
-import org.eclipse.equinox.p2.engine.IProfileRegistry;
-import org.eclipse.equinox.p2.engine.ProfileScope;
-import org.eclipse.ui.statushandlers.StatusManager;
-import org.osgi.service.prefs.BackingStoreException;
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.DefaultScope;
import org.osgi.service.prefs.Preferences;
public class PreferenceInitializer extends AbstractPreferenceInitializer {
- private static final String P_ENABLED = "enabled"; //$NON-NLS-1$
- private static final String UPDATE_PLUGIN_ID = "org.eclipse.update.scheduler"; //$NON-NLS-1$
- private static final String SDK_UI_PLUGIN_ID = "org.eclipse.equinox.p2.ui.sdk"; //$NON-NLS-1$
-
- public static void migratePreferences() {
- // Migrate preference values that were stored in alternate locations.
- // 1) migrate from instance scope (during 3.5 development) to profile
- // scope (final 3.5 format)
- // 2) if applicable, migrate from 3.4 prefs kept in a different bundle
- // 3) if applicable, migrate from 3.3 prefs known by Update Manager
- // 4) check value of auto update reminder time and if it is a localized string, change it to the english string
- // (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=321568)
- final IAgentLocation agentLocation = AutomaticUpdatePlugin.getDefault().getAgentLocation();
- if (agentLocation == null)
- return;
- Preferences pref = new ProfileScope(agentLocation, IProfileRegistry.SELF).getNode(AutomaticUpdatePlugin.PLUGIN_ID);
- try {
- if (pref.keys().length == 0) {
- // migrate preferences from instance scope to profile scope
- Preferences oldPref = InstanceScope.INSTANCE.getNode(AutomaticUpdatePlugin.PLUGIN_ID);
- String[] keys = oldPref.keys();
- for (int i = 0; i < keys.length; i++)
- pref.put(keys[i], oldPref.get(keys[i], "")); //$NON-NLS-1$
-
- if (keys.length > 0)
- pref.flush();
- }
- } catch (BackingStoreException e) {
- handleException(e, AutomaticUpdateMessages.ErrorLoadingPreferenceKeys);
- }
-
- // Have we migrated from 3.4 pref values?
- boolean migrated34 = pref.getBoolean(PreferenceConstants.PREF_MIGRATED_34, false);
- boolean node34exists = false;
- if (!migrated34) {
- // first look for the 3.4 automatic update preferences, which were
- // located in a different bundle than now, in the instance scope.
- Preferences instanceScope = Platform.getPreferencesService().getRootNode().node(InstanceScope.SCOPE);
- try {
- node34exists = instanceScope.nodeExists(SDK_UI_PLUGIN_ID);
- } catch (BackingStoreException e1) {
- // nothing to report, assume node does not exist
- }
- if (node34exists) {
- Preferences node34 = instanceScope.node(SDK_UI_PLUGIN_ID);
- // We only migrate the preferences associated with auto update.
- // Other preferences still remain in that bundle and are handled
- // there. We don't migrate if the value was never set.
- // We use string literals rather than pref constants because we want to
- // ensure we match the 3.4 values.
- if (pref.get(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED, null) == null && node34.get("enabled", null) != null) { //$NON-NLS-1$
- pref.putBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED, node34.getBoolean("enabled", false)); //$NON-NLS-1$
- }
- if (pref.get(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, null) == null && node34.get("schedule", null) != null) { //$NON-NLS-1$
- pref.put(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, node34.get("schedule", //$NON-NLS-1$
- PreferenceConstants.PREF_UPDATE_ON_STARTUP));
- }
- if (pref.get(PreferenceConstants.PREF_DOWNLOAD_ONLY, null) == null && node34.get("download", null) != null) { //$NON-NLS-1$
- pref.putBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY, node34.getBoolean("download", false)); //$NON-NLS-1$
- }
- if (pref.get(PreferenceConstants.PREF_REMIND_SCHEDULE, null) == null && node34.get("remindOnSchedule", null) != null) { //$NON-NLS-1$
- pref.putBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE, node34.getBoolean("remindOnSchedule", false)); //$NON-NLS-1$
- }
- if (pref.get(PreferenceConstants.PREF_REMIND_ELAPSED, null) == null && node34.get("remindElapsedTime", null) != null) { //$NON-NLS-1$
- pref.put(PreferenceConstants.PREF_REMIND_ELAPSED, node34.get("remindElapsedTime", //$NON-NLS-1$
- PreferenceConstants.PREF_REMIND_30Minutes));
- }
- }
- // mark the pref that says we've migrated
- pref.putBoolean(PreferenceConstants.PREF_MIGRATED_34, true);
- try {
- pref.flush();
- } catch (BackingStoreException e) {
- handleException(e, AutomaticUpdateMessages.ErrorSavingPreferences);
- }
- }
- // pref used to track 3.3 migration
- // Have we initialized the auto update prefs from previous
- // releases?
- boolean autoUpdateInit = pref.getBoolean(PreferenceConstants.PREF_AUTO_UPDATE_INIT, false);
-
- if (!migrated34 && !autoUpdateInit) {
- // Look for the 3.3 UM automatic update preferences. We will
- // not migrate them if we already pulled values from 3.4.
- // However, we always want to turn off the UM automatic update
- // checker if it is found to be on.
- Preferences instanceScope = Platform.getPreferencesService().getRootNode().node(InstanceScope.SCOPE);
- try {
- boolean updateNodeExists = instanceScope.nodeExists(UPDATE_PLUGIN_ID);
- Preferences prefUM = instanceScope.node(UPDATE_PLUGIN_ID);
- boolean enableUpdate = prefUM.getBoolean(P_ENABLED, false);
- // set p2 automatic update preference to match UM preference,
- // only if we haven't already set a value.
- if (pref.get(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED, null) == null && updateNodeExists) {
- pref.putBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED, enableUpdate);
- }
- // turn off UM automatic update preference if it exists
- if (updateNodeExists) {
- prefUM.putBoolean(P_ENABLED, false);
- prefUM.flush();
- }
- // mark the pref that says we migrated
- pref.putBoolean(PreferenceConstants.PREF_AUTO_UPDATE_INIT, true);
- pref.flush();
- } catch (BackingStoreException e) {
- handleException(e, AutomaticUpdateMessages.ErrorSavingClassicPreferences);
- }
- }
-
- // Migrate "look for updates on schedule (daily at fixed time, or weekly, at fixed weekday and time)".
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=498116
- final String autoUpdateSchedule = pref.get(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, null);
- if (autoUpdateSchedule != null) {
- if (PreferenceConstants.PREF_UPDATE_ON_SCHEDULE.equals(autoUpdateSchedule)) {
- //Before neon.2, the update schedule could be specified to be done daily or at a specific day and time
- pref.put(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, PreferenceConstants.PREF_UPDATE_ON_FUZZY_SCHEDULE);
- final String PRE_NEON2_PREF_KEY_FOR_SCHEDULE = "day"; //$NON-NLS-1$
- String day = pref.get(PRE_NEON2_PREF_KEY_FOR_SCHEDULE, null);
- if (day != null) {
- if (AutomaticUpdateMessages.Pre_neon2_pref_value_everyday.equals(day)) {
- pref.put(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE, AutomaticUpdateScheduler.FUZZY_RECURRENCE[0]);
- } else {
- pref.put(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE, AutomaticUpdateScheduler.FUZZY_RECURRENCE[1]);
- }
- } else {
- pref.put(AutomaticUpdateScheduler.P_FUZZY_RECURRENCE, AutomaticUpdateScheduler.FUZZY_RECURRENCE[1]);
- }
- }
- }
-
- // All migration is done, check that the value of the auto update reminder time is *not* localized
- // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=321568
- String value = pref.get(PreferenceConstants.PREF_REMIND_ELAPSED, PreferenceConstants.PREF_REMIND_30Minutes);
- for (int i = 0; i < AutomaticUpdatesPopup.ELAPSED_VALUES.length; i++)
- if (AutomaticUpdatesPopup.ELAPSED_VALUES[i].equals(value))
- // it's a known value, all is well, no need to go further.
- return;
- try {
- // The stored value is not a known value. See if it is a localized value and if so, use the corresponding value string instead.
- for (int i = 0; i < AutomaticUpdatesPopup.ELAPSED_LOCALIZED_STRINGS.length; i++)
- if (AutomaticUpdatesPopup.ELAPSED_LOCALIZED_STRINGS[i].equals(value)) {
- pref.put(PreferenceConstants.PREF_REMIND_ELAPSED, AutomaticUpdatesPopup.ELAPSED_VALUES[i]);
- pref.flush();
- return;
- }
- // The string does not reflect a known value, nor does it reflect the current locale.
- // Set it to the default value. Note that we've never handled a change of locale properly in the
- // preference migration, so losing a not known setting is not a regression. At least we tried to
- // handle the current locale...
- pref.put(PreferenceConstants.PREF_REMIND_ELAPSED, PreferenceConstants.PREF_REMIND_30Minutes);
- pref.flush();
- } catch (BackingStoreException e) {
- handleException(e, AutomaticUpdateMessages.ErrorSavingPreferences);
- }
- }
-
- private static void handleException(Exception e, String message) {
- StatusManager.getManager().handle(new Status(IStatus.ERROR, AutomaticUpdatePlugin.PLUGIN_ID, 0, message, e), StatusManager.LOG);
- }
-
@Override
public void initializeDefaultPreferences() {
// initialize the default scope
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
index 2cfed941e..bc46ebd68 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index 056559c14..a42189cdc 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.p2.ui;singleton:=true
-Bundle-Version: 2.5.600.qualifier
+Bundle-Version: 2.5.700.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.ui.ProvUIActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -34,7 +34,8 @@ Export-Package: org.eclipse.equinox.internal.p2.ui;
Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.core.expressions,
- org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.e4.ui.dialogs;bundle-version="1.1.600"
Import-Package: com.ibm.icu.text,
javax.xml.parsers,
org.eclipse.equinox.internal.p2.artifact.repository,
diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml
index 81d1b38ac..234eeb862 100644
--- a/bundles/org.eclipse.equinox.p2.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml
@@ -14,11 +14,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.ui</artifactId>
- <version>2.5.600-SNAPSHOT</version>
+ <version>2.5.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/UpdateManagerCompatibility.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/UpdateManagerCompatibility.java
index b2e78262a..ab481eddd 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/UpdateManagerCompatibility.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/UpdateManagerCompatibility.java
@@ -256,7 +256,7 @@ public class UpdateManagerCompatibility {
}
private static String getWritableXMLString(String value) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (value == null)
return buf.toString();
for (int i = 0; i < value.length(); i++) {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java
index 4fba0afbe..e07c2ff6b 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java
@@ -617,7 +617,7 @@ public class AvailableIUsPage extends ProvisioningWizardPage implements ISelecta
// Now look for IU's
java.util.List<IInstallableUnit> selected = getSelectedIUs();
if (selected.size() == 1) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
String filterString = availableIUGroup.getFilterString();
String description = selected.get(0).getProperty(IInstallableUnit.PROP_DESCRIPTION, null);
if (description != null) {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java
index 54fc8bded..e1d2c2a51 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/CopyUtils.java
@@ -35,7 +35,7 @@ public class CopyUtils {
private static final String CONTROL_ID = "org.eclipse.equinox.p2.ui.CopyControlId"; //$NON-NLS-1$
public static String getIndentedClipboardText(Object[] elements, IUDetailsLabelProvider labelProvider) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < elements.length; i++) {
if (i > 0)
buffer.append(NEWLINE);
@@ -74,7 +74,7 @@ public class CopyUtils {
}
}
- private static void appendIndention(StringBuffer buffer, Object element) {
+ private static void appendIndention(StringBuilder buffer, Object element) {
Object parent;
while (element instanceof ProvElement && (parent = ((ProvElement) element).getParent(element)) != null) {
buffer.append(NESTING_INDENT);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java
index 0e05ea409..0b87d3edb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java
@@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.ui.dialogs;
+import org.eclipse.e4.ui.dialogs.filteredtree.FilteredTree;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
import org.eclipse.equinox.internal.p2.ui.ProvUI;
import org.eclipse.equinox.internal.p2.ui.ProvUIProvisioningListener;
import org.eclipse.equinox.internal.p2.ui.model.ProfileElement;
@@ -23,8 +25,6 @@ import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
/**
* An InstalledIUGroup is a reusable UI component that displays the
@@ -57,8 +57,9 @@ public class InstalledIUGroup extends StructuredIUGroup {
@Override
protected StructuredViewer createViewer(Composite parent) {
// Table of installed IU's
- FilteredTree filteredTree = new FilteredTree(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, new PatternFilter(), true);
- filteredTree.getFilterControl().setFocus(); //Steal focus, consistent with org.eclipse.ui.internal.about.AboutPluginsPage
+ FilteredTree filteredTree = new FilteredTree(parent,
+ SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, new PatternFilter());
+ filteredTree.getFilterControl().setFocus(); // Steal focus, consistent with org.eclipse.ui.internal.about.AboutPluginsPage
TreeViewer installedIUViewer = filteredTree.getViewer();
// Filters and sorters before establishing content, so we don't refresh unnecessarily.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java
index 7a66fe517..f7a80f761 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java
@@ -280,7 +280,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti
@Override
protected String getClipboardText(Control control) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
Object[] elements = getSelectedElements();
for (int i = 0; i < elements.length; i++) {
if (i > 0)
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java
index db3a65f1e..920a3fa43 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateSingleIUPage.java
@@ -80,7 +80,7 @@ public class UpdateSingleIUPage extends ProvisioningWizardPage {
}
private String getUpdateText(IInstallableUnit iu) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(new IUDetailsLabelProvider().getClipboardText(getUpdate().replacement, CopyUtils.DELIMITER));
buffer.append(CopyUtils.NEWLINE);
buffer.append(CopyUtils.NEWLINE);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
index 26c38d3cf..df2e585e5 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
@@ -94,8 +94,8 @@ RepositoryManipulationPage_RefreshOperationCanceled=Operation canceled.
RepositoryManipulationPage_Edit=&Edit
RepositoryManipulationPage_RefreshConnection=Re&load
RepositoryManipulationPage_Remove=&Remove
-RepositoryManipulationPage_RemoveConfirmMessage=Are you sure you want to remove the selected items?
-RepositoryManipulationPage_RemoveConfirmSingleMessage=Are you sure you want to remove {0}?
+RepositoryManipulationPage_RemoveConfirmMessage=Remove the selected items?
+RepositoryManipulationPage_RemoveConfirmSingleMessage=Remove {0}?
RepositoryManipulationPage_RemoveConfirmTitle=Remove Sites
RepositoryManipulationPage_TestConnectionSuccess=Information for "{0}" has been reloaded from the server.
RepositoryManipulationPage_TestConnectionTitle=Reload
@@ -151,8 +151,8 @@ UserValidationDialog_PasswordLabel=&Password:
UserValidationDialog_SavePasswordButton=&Save password
UserValidationDialog_UsernameLabel=&Username:
ColocatedRepositoryManipulator_AddSiteOperationLabel=Add Site
-RevertProfilePage_ConfirmDeleteMultipleConfigs=Deleting the selected configurations from the installation history will free up the disk space used to store the configurations. However, you will no longer be able to revert your installation to these configurations. Are you sure you want to delete the configurations?
-RevertProfilePage_ConfirmDeleteSingleConfig=Deleting the configuration from the installation history will free up the disk space used to store it. However, you will no longer be able to revert your installation to this configuration. Are you sure you want to delete it?
+RevertProfilePage_ConfirmDeleteMultipleConfigs=Deleting the selected configurations from the installation history will free up the disk space used to store the configurations. However, you will no longer be able to revert your installation to these configurations. Delete the configurations?
+RevertProfilePage_ConfirmDeleteSingleConfig=Deleting the configuration from the installation history will free up the disk space used to store it. However, you will no longer be able to revert your installation to this configuration. Delete it?
RevertProfilePage_Delete=&Delete
RevertProfilePage_CancelButtonLabel=Cancel
RevertProfilePage_DeleteMultipleConfigurationsTitle=Delete Configurations
@@ -170,7 +170,7 @@ InstallWizardPage_Title=Install Details
PreselectedIUInstallWizard_Title=Install
PreselectedIUInstallWizard_Description=Check the items that you wish to install.
PlatformUpdateTitle = Software Updates
-PlatformRestartMessage = Would you like to restart {0} to apply the changes?
+PlatformRestartMessage = Restart {0} to apply the changes?
Policy_RequiresUpdateManagerMessage=A feature that you have selected uses install procedures that are not compatible with the current installation support. This feature can only be installed by the older Update Manager. \
\
Do you want to launch the older Update Manager?
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/misc/StringMatcher.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/misc/StringMatcher.java
index f6c5ade56..990bb9e83 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/misc/StringMatcher.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/misc/StringMatcher.java
@@ -289,7 +289,7 @@ public class StringMatcher {
Vector<String> temp = new Vector<>();
int pos = 0;
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
while (pos < fLength) {
char c = fPattern.charAt(pos++);
switch (c) {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java
index 5d7a19aba..4bcfd6489 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java
@@ -167,7 +167,7 @@ public class CategoryElement extends RemoteQueriedElement implements IIUElement
IInstallableUnit iu = getIU();
if (iu == null)
return "NULL"; //$NON-NLS-1$
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("Category Element - "); //$NON-NLS-1$
result.append(getMergeKey(iu));
result.append(" (merging IUs: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/MetadataRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/MetadataRepositoryElement.java
index a1a9295e8..2bbe0b19b 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/MetadataRepositoryElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/MetadataRepositoryElement.java
@@ -234,7 +234,7 @@ public class MetadataRepositoryElement extends RootElement implements IRepositor
@Override
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("Metadata Repository Element - "); //$NON-NLS-1$
result.append(URIUtil.toUnencodedString(location));
if (hasQueryable())
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java
index cce455c06..588cbba71 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java
@@ -207,7 +207,7 @@ public class IUDetailsLabelProvider extends ColumnLabelProvider implements ITabl
}
public String getClipboardText(Object element, String columnDelimiter) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < columnConfig.length; i++) {
if (i != 0)
result.append(columnDelimiter);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDragAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDragAdapter.java
index 9979ad1eb..cc071c6ef 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDragAdapter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDragAdapter.java
@@ -63,7 +63,7 @@ public class IUDragAdapter extends DragSourceAdapter {
}
// Get a text description of each IU and set as the drag data
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
for (int i = 0; i < ius.length; i++) {
buffer.append(ius[i].toString());
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/RepositoryDetailsLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/RepositoryDetailsLabelProvider.java
index 59d85ab36..959799bc6 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/RepositoryDetailsLabelProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/RepositoryDetailsLabelProvider.java
@@ -94,7 +94,7 @@ public class RepositoryDetailsLabelProvider extends LabelProvider implements ITa
}
public String getClipboardText(Object element, String columnDelimiter) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getColumnText(element, COL_NAME));
result.append(columnDelimiter);
result.append(getColumnText(element, COL_LOCATION));
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java
index 571db6925..011e4d59e 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java
@@ -155,7 +155,7 @@ public class AcceptLicensesWizardPage extends WizardPage {
IUColumnConfig versionColumn;
static String getIUName(IInstallableUnit iu) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
String name = iu.getProperty(IInstallableUnit.PROP_NAME, null);
if (name != null)
buf.append(name);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
index 73e02c7e0..8955bf7ff 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
@@ -902,7 +902,7 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
if (elements.length == 0)
elements = getElements();
String text = ""; //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < elements.length; i++) {
buffer.append(labelProvider.getClipboardText(elements[i], CopyUtils.DELIMITER));
if (i > 0)
diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml b/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml
index 8c4c03378..1c726442d 100644
--- a/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/pom.xml b/bundles/org.eclipse.equinox.p2.updatesite/pom.xml
index 3eef2f04c..eb575ed2a 100644
--- a/bundles/org.eclipse.equinox.p2.updatesite/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.updatesite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml
index 3571f9fa9..50b152c4e 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.ui.prefs
index ab03d20c5..e60150d53 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/.settings/org.eclipse.jdt.ui.prefs
@@ -14,15 +14,18 @@ sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -38,6 +41,9 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_semicolons=false
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -51,10 +57,14 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
index ce00d8602..48b84986d 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true
-Bundle-Version: 1.3.300.qualifier
+Bundle-Version: 1.3.400.qualifier
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
index 5e523ca11..ba3d418cc 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.simpleconfigurator</artifactId>
- <version>1.3.300-SNAPSHOT</version>
+ <version>1.3.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
index b1587874a..e6c0a4437 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
@@ -501,6 +501,6 @@ class ConfigApplier {
}
private String getVersionRange(String version) {
- return version == null ? null : new StringBuffer().append('[').append(version).append(',').append(version).append(']').toString();
+ return version == null ? null : new StringBuilder().append('[').append(version).append(',').append(version).append(']').toString();
}
}
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
index 900967985..a6763deac 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
@@ -80,7 +80,7 @@ public class ConfiguratorCommandProvider implements CommandProvider {
}
private String getHelp(String commandName) {
- StringBuffer help = new StringBuffer();
+ StringBuilder help = new StringBuilder();
if (commandName == null) {
help.append("---"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java
index 1df62acb1..c5a7499e6 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java
@@ -67,7 +67,7 @@ public class BundleInfo {
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("BundleInfo("); //$NON-NLS-1$
if (symbolicName != null)
buffer.append(symbolicName);
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java
index 4d9a56ac1..e7c945452 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java
@@ -141,7 +141,7 @@ public class URIUtil {
* @return An unencoded string representation of the URI
*/
public static String toUnencodedString(URI uri) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
String scheme = uri.getScheme();
if (scheme != null)
result.append(scheme).append(':');
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/pom.xml b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/pom.xml
index 5b011a1b5..7e2702ba9 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/pom.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.equinox.p2.examples.rcp.cloud</artifactId>
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/pom.xml b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/pom.xml
index 399e38e90..ae7fda9c7 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/pom.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/pom.xml b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/pom.xml
index 0e6bc699a..454afcf55 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/pom.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.equinox.p2.examples.rcp.prestartupdate</artifactId>
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/pom.xml b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/pom.xml
index afb7ab207..721279fc8 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/pom.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility</artifactId>
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/pom.xml b/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/pom.xml
index 552ba6b91..3298a1cc8 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/pom.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/pom.xml b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/pom.xml
index b323bf240..56ae44208 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/pom.xml
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 323d18d6d..e06e9e804 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.equinox.p2.examples</artifactId>
diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml
index dd18f8860..b01638aef 100644
--- a/features/org.eclipse.equinox.p2.core.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.core.feature"
label="%featureName"
- version="1.6.300.qualifier"
+ version="1.6.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.core.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.p2.core.feature/forceQualifierUpdate.txt
index b8798b91e..4916f68a5 100644
--- a/features/org.eclipse.equinox.p2.core.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.p2.core.feature/forceQualifierUpdate.txt
@@ -16,4 +16,5 @@ Bug 510206 - Please update to xz-java 1.5
Bug 518051 - Update to xz-java 1.6
Bug 529908 - Update xz-java 1.8
Bug 444188 - Fix concurrent access to listener collections
-Bug 542873 - IBuild I20181217-1800 failed due to unresolved project dependencies. \ No newline at end of file
+Bug 542873 - IBuild I20181217-1800 failed due to unresolved project dependencies.
+Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800 \ No newline at end of file
diff --git a/features/org.eclipse.equinox.p2.core.feature/pom.xml b/features/org.eclipse.equinox.p2.core.feature/pom.xml
index afcd26309..c858aef6a 100644
--- a/features/org.eclipse.equinox.p2.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.core.feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
- <version>1.6.300-SNAPSHOT</version>
+ <version>1.6.400-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.p2.discovery.feature/feature.xml b/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
index ec46743f0..14bd1ac7e 100644
--- a/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.discovery.feature"
label="%featureName"
- version="1.2.300.qualifier"
+ version="1.2.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
index 4d4d01ee9..1a9a43279 100644
--- a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId>
- <version>1.2.300-SNAPSHOT</version>
+ <version>1.2.400-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.equinox.p2.extras.feature/feature.xml b/features/org.eclipse.equinox.p2.extras.feature/feature.xml
index a6c164434..dd392bf26 100644
--- a/features/org.eclipse.equinox.p2.extras.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.extras.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.extras.feature"
label="%featureName"
- version="1.4.500.qualifier"
+ version="1.4.600.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.extras.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.p2.extras.feature/forceQualifierUpdate.txt
index 845877fc3..14e118e9e 100644
--- a/features/org.eclipse.equinox.p2.extras.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.p2.extras.feature/forceQualifierUpdate.txt
@@ -3,3 +3,4 @@ Bug 403352 - Update all parent versions to match our build stream
Bug 407389 - Source features are partially broken
Bug 458346 - Unusual, hard to decipher error in I-build
Bug 506597 - Build failure on I20161026-2000
+Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800
diff --git a/features/org.eclipse.equinox.p2.extras.feature/pom.xml b/features/org.eclipse.equinox.p2.extras.feature/pom.xml
index b71139eaa..0d17afb84 100644
--- a/features/org.eclipse.equinox.p2.extras.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.extras.feature/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
- <version>1.4.500-SNAPSHOT</version>
+ <version>1.4.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.equinox.p2.rcp.feature/feature.xml b/features/org.eclipse.equinox.p2.rcp.feature/feature.xml
index 5ea21425d..403ed4ee1 100644
--- a/features/org.eclipse.equinox.p2.rcp.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.rcp.feature"
label="%featureName"
- version="1.4.500.qualifier"
+ version="1.4.600.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.rcp.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.p2.rcp.feature/forceQualifierUpdate.txt
index 845877fc3..14e118e9e 100644
--- a/features/org.eclipse.equinox.p2.rcp.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.p2.rcp.feature/forceQualifierUpdate.txt
@@ -3,3 +3,4 @@ Bug 403352 - Update all parent versions to match our build stream
Bug 407389 - Source features are partially broken
Bug 458346 - Unusual, hard to decipher error in I-build
Bug 506597 - Build failure on I20161026-2000
+Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800
diff --git a/features/org.eclipse.equinox.p2.rcp.feature/pom.xml b/features/org.eclipse.equinox.p2.rcp.feature/pom.xml
index 1c95a2854..3b18faf03 100644
--- a/features/org.eclipse.equinox.p2.rcp.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.rcp.feature/pom.xml
@@ -14,13 +14,13 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.rcp.feature</artifactId>
- <version>1.4.500-SNAPSHOT</version>
+ <version>1.4.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.equinox.p2.sdk/feature.xml b/features/org.eclipse.equinox.p2.sdk/feature.xml
index 6f74e31a7..cae03b5d0 100644
--- a/features/org.eclipse.equinox.p2.sdk/feature.xml
+++ b/features/org.eclipse.equinox.p2.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.sdk"
label="%featureName"
- version="3.11.500.qualifier"
+ version="3.11.600.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.p2.sdk/forceQualifierUpdate.txt
index 68d4d22cc..34c1b8e40 100644
--- a/features/org.eclipse.equinox.p2.sdk/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.p2.sdk/forceQualifierUpdate.txt
@@ -10,3 +10,4 @@ Bug 419647 - React to ECF feature restructuring
Bug 432209 - needs to touch 3 equinox/p2 features, for qualifier change in org.sat4j.pb
Bug 458346 - Unusual, hard to decipher error in I-build
Bug 506597 - Build failure on I20161026-2000
+Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800
diff --git a/features/org.eclipse.equinox.p2.sdk/pom.xml b/features/org.eclipse.equinox.p2.sdk/pom.xml
index bfd05f5f8..0c688b566 100644
--- a/features/org.eclipse.equinox.p2.sdk/pom.xml
+++ b/features/org.eclipse.equinox.p2.sdk/pom.xml
@@ -15,11 +15,11 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.sdk</artifactId>
- <version>3.11.500-SNAPSHOT</version>
+ <version>3.11.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.p2.user.ui/feature.xml b/features/org.eclipse.equinox.p2.user.ui/feature.xml
index 8a4c2fb91..f46874388 100644
--- a/features/org.eclipse.equinox.p2.user.ui/feature.xml
+++ b/features/org.eclipse.equinox.p2.user.ui/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.user.ui"
label="%featureName"
- version="2.4.500.qualifier"
+ version="2.4.600.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.user.ui/forceQualifierUpdate.txt b/features/org.eclipse.equinox.p2.user.ui/forceQualifierUpdate.txt
index 845877fc3..14e118e9e 100644
--- a/features/org.eclipse.equinox.p2.user.ui/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.p2.user.ui/forceQualifierUpdate.txt
@@ -3,3 +3,4 @@ Bug 403352 - Update all parent versions to match our build stream
Bug 407389 - Source features are partially broken
Bug 458346 - Unusual, hard to decipher error in I-build
Bug 506597 - Build failure on I20161026-2000
+Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800
diff --git a/features/org.eclipse.equinox.p2.user.ui/pom.xml b/features/org.eclipse.equinox.p2.user.ui/pom.xml
index 8f367cb53..aa3582bb5 100644
--- a/features/org.eclipse.equinox.p2.user.ui/pom.xml
+++ b/features/org.eclipse.equinox.p2.user.ui/pom.xml
@@ -14,13 +14,13 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.user.ui</artifactId>
- <version>2.4.500-SNAPSHOT</version>
+ <version>2.4.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/org.eclipse.equinox.p2.releng/default.target b/org.eclipse.equinox.p2.releng/default.target
index b2a39930b..ca3e39fa9 100644
--- a/org.eclipse.equinox.p2.releng/default.target
+++ b/org.eclipse.equinox.p2.releng/default.target
@@ -4,7 +4,7 @@
<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
<unit id="org.eclipse.core.tests.harness" version="0.0.0"/>
<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.13-I-builds"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.14-I-builds"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml
index 98cc09374..7e915d639 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml
index d9fca3a0b..798ce191b 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.eclipse</groupId>
diff --git a/pom.xml b/pom.xml
index 48d874851..5660cacb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,13 +15,13 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox.p2</groupId>
<artifactId>rt.equinox.p2</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.14.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

Back to the top