From 89febaac134140f608cdb2f957bc0b0d9cf709ba Mon Sep 17 00:00:00 2001 From: Quentin Le Menez Date: Tue, 22 Nov 2016 15:56:27 +0100 Subject: [Releng] [Oxygen] Update to the new Aggregator file Signed-off-by: Quentin Le Menez --- .../META-INF/MANIFEST.MF | 6 +++--- .../AddSetupRepositoryUpdateAnnotationHandler.java | 19 +++++++++++-------- .../internal/popup/actions/DependencyUpdater.java | 4 ++-- .../internal/popup/actions/OomphSetupUpdater.java | 2 +- .../internal/popup/actions/UpdateDependencies.java | 6 +++--- 5 files changed, 20 insertions(+), 17 deletions(-) (limited to 'plugins/developer/org.eclipse.papyrus.releng.tools') diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF index 1bf342485a3..74c7b13b0ce 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", - org.eclipse.b3.aggregator;bundle-version="[1.0.0,2.0.0)", - org.eclipse.b3.aggregator.legacy;bundle-version="[1.0.0,2.0.0)", org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)", org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)", com.google.guava;bundle-version="11.0.0", org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)", - fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional + fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional, + org.eclipse.cbi.p2repo.aggregator;bundle-version="1.0.0", + org.eclipse.cbi.p2repo.aggregator.legacy;bundle-version="1.0.0" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java index bc0d8e22361..54f5c963804 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java @@ -22,11 +22,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.b3.aggregator.Aggregation; -import org.eclipse.b3.aggregator.AggregatorPackage; -import org.eclipse.b3.aggregator.Contribution; -import org.eclipse.b3.aggregator.MappedRepository; -import org.eclipse.b3.aggregator.transformer.TransformationManager; +import org.eclipse.cbi.p2repo.aggregator.Aggregation; +import org.eclipse.cbi.p2repo.aggregator.AggregatorPackage; +import org.eclipse.cbi.p2repo.aggregator.Contribution; +import org.eclipse.cbi.p2repo.aggregator.MappedRepository; +import org.eclipse.cbi.p2repo.aggregator.transformer.TransformationManager; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -84,7 +84,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler { List elements = loadContributionsAndRepositories(rset, URI.createPlatformResourceURI(aggrFile.getFullPath().toString(), true)); - Map updates = new HashMap(); + Map updates = new HashMap<>(); for (Repository repo : repositories) { FilteredItemsSelectionDialog dlg = createSelectionDialog(activeShell, repo, elements); if (dlg.open() == Window.OK) { @@ -113,7 +113,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler { } private Collection getSelectedRepositories(Object context) { - List result = new ArrayList(); + List result = new ArrayList<>(); Object variable = null; if (context instanceof ExecutionEvent) { @@ -141,7 +141,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler { // Ensure that the Aggregator model is loaded because the model plug-in doesn't register it AggregatorPackage.eINSTANCE.eClass(); - List result = new ArrayList(); + List result = new ArrayList<>(); Resource resource; try { @@ -382,6 +382,7 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler { this.index = index; } + @Override public Contribution getContribution() { return contribution; } @@ -394,10 +395,12 @@ public class AddSetupRepositoryUpdateAnnotationHandler extends AbstractHandler { return index; } + @Override public String getLabel() { return String.format("%s - %s", contribution.getLabel(), repository.getLocation()); } + @Override public String getDetails() { if ((contribution.getDescription() != null) && (contribution.getDescription().length() > 0)) { return String.format("%s (%s) - %s", contribution.getLabel(), contribution.getDescription(), repository.getLocation()); diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java index 67ae1abfcb4..55364d2e18c 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java @@ -23,8 +23,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.b3.aggregator.Contribution; -import org.eclipse.b3.aggregator.MappedRepository; +import org.eclipse.cbi.p2repo.aggregator.Contribution; +import org.eclipse.cbi.p2repo.aggregator.MappedRepository; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java index c0852df4589..8794a4295f9 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.eclipse.b3.aggregator.Contribution; +import org.eclipse.cbi.p2repo.aggregator.Contribution; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java index cad56874b2b..a38c3d86c56 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java @@ -23,9 +23,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.eclipse.b3.aggregator.Aggregation; -import org.eclipse.b3.aggregator.AggregatorPackage; -import org.eclipse.b3.aggregator.transformer.TransformationManager; +import org.eclipse.cbi.p2repo.aggregator.Aggregation; +import org.eclipse.cbi.p2repo.aggregator.AggregatorPackage; +import org.eclipse.cbi.p2repo.aggregator.transformer.TransformationManager; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -- cgit v1.2.3