Packages/bundles that are already imported/added are shown #1195
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
|
|
||
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.resources.IResource; | ||
| import org.eclipse.jdt.core.IJavaElement; | ||
| import org.eclipse.jdt.core.IJavaProject; | ||
| import org.eclipse.jdt.core.IPackageFragment; | ||
| import org.eclipse.jdt.core.JavaCore; | ||
|
|
@@ -41,6 +42,7 @@ | |
| import org.eclipse.jface.viewers.ISelection; | ||
| import org.eclipse.jface.viewers.IStructuredContentProvider; | ||
| import org.eclipse.jface.viewers.IStructuredSelection; | ||
| import org.eclipse.jface.viewers.LabelProvider; | ||
| import org.eclipse.jface.viewers.StructuredSelection; | ||
| import org.eclipse.jface.viewers.TableViewer; | ||
| import org.eclipse.jface.viewers.Viewer; | ||
|
|
@@ -75,6 +77,7 @@ | |
| import org.eclipse.search.ui.NewSearchUI; | ||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.custom.BusyIndicator; | ||
| import org.eclipse.swt.graphics.Image; | ||
| import org.eclipse.swt.layout.GridData; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Display; | ||
|
|
@@ -354,8 +357,8 @@ | |
| if (frag != null) | ||
| try { | ||
| IViewPart part = PDEPlugin.getActivePage().showView(JavaUI.ID_PACKAGES); | ||
| ShowInPackageViewAction action = new ShowInPackageViewAction(part.getSite()); | ||
|
Check warning on line 360 in ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
|
||
| action.run(frag); | ||
|
Check warning on line 361 in ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
|
||
| } catch (PartInitException e) { | ||
| } | ||
| } | ||
|
|
@@ -402,10 +405,10 @@ | |
| IPluginModelBase model = (IPluginModelBase) getPage().getModel(); | ||
| final IProject project = model.getUnderlyingResource().getProject(); | ||
| if (PluginProject.isJavaProject(project)) { | ||
| ILabelProvider labelProvider = new ExportPackgeLabelProvider(); | ||
| final ConditionalListSelectionDialog dialog = new ConditionalListSelectionDialog( | ||
| PDEPlugin.getActiveWorkbenchShell(), labelProvider, | ||
| PDEUIMessages.ExportPackageSection_dialogButtonLabel,fHeader); | ||
| final Collection<String> pckgs = fHeader == null ? Collections.emptySet() : fHeader.getPackageNames(); | ||
| final boolean allowJava = "true".equals(getBundle().getHeader(ICoreConstants.ECLIPSE_JREBUNDLE)); //$NON-NLS-1$ | ||
| Runnable runnable = () -> { | ||
|
|
@@ -437,7 +440,9 @@ | |
| if (fHeader != null) { | ||
| for (Object selectedObject : selected) { | ||
| IPackageFragment candidate = (IPackageFragment) selectedObject; | ||
| if (!fHeader.getPackageNames().contains(candidate.getElementName())){ | ||
| fHeader.addPackage(new ExportPackageObject(fHeader, candidate, getVersionAttribute())); | ||
| } | ||
| } | ||
| } else { | ||
| getBundle().setHeader(getExportedPackageHeader(), getValue(selected)); | ||
|
|
@@ -620,4 +625,27 @@ | |
| Action action = new CalculateUsesAction(proj, (IBundlePluginModelBase) getPage().getModel()); | ||
| action.run(); | ||
| } | ||
|
|
||
| class ExportPackgeLabelProvider extends LabelProvider { | ||
| JavaElementLabelProvider javaElementLabel = new JavaElementLabelProvider(); | ||
| @Override | ||
| public String getText(Object element) { | ||
|
|
||
| if (element instanceof IJavaElement javaElement) { | ||
| String text = javaElementLabel.getText(javaElement); | ||
| final Collection<String> pckgs = fHeader == null ? Collections.emptySet() : fHeader.getPackageNames(); | ||
| if (!pckgs.isEmpty() && pckgs.contains(text)) { | ||
| return text + " " + PDEUIMessages.PluginModelManager_alreadyExported; //$NON-NLS-1$ | ||
| } | ||
|
|
||
| } | ||
| return javaElementLabel.getText(element); | ||
| } | ||
|
|
||
| @Override | ||
| public Image getImage(Object element) { | ||
| return javaElementLabel.getImage(element); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,13 +114,21 @@ | |
|
|
||
| private ImportPackageHeader fHeader; | ||
|
|
||
| public static class ImportItemWrapper { | ||
| Object fUnderlying; | ||
| private boolean isImported = false; | ||
|
|
||
| public boolean isAlreadyImported() { | ||
| return isImported; | ||
| } | ||
|
|
||
| public ImportItemWrapper(Object underlying) { | ||
| fUnderlying = underlying; | ||
| } | ||
|
|
||
| public void setAlreadyImported() { | ||
| this.isImported = true; | ||
| } | ||
| @Override | ||
| public String toString() { | ||
| return getName(); | ||
|
|
@@ -180,7 +188,7 @@ | |
| } | ||
| } | ||
|
|
||
| class ImportPackageDialogLabelProvider extends LabelProvider { | ||
| @Override | ||
| public Image getImage(Object element) { | ||
| return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE); | ||
|
|
@@ -201,6 +209,10 @@ | |
| buffer.append(' '); | ||
| buffer.append(PDELabelProvider.formatVersion(version.toString())); | ||
| } | ||
| if (p.isAlreadyImported() && fHeader != null && fHeader.hasPackage(p.getName())) { | ||
| buffer.append(' '); | ||
| buffer.append(PDEUIMessages.PluginModelManager_alreadyImported); | ||
| } | ||
| return buffer.toString(); | ||
| } | ||
| } | ||
|
|
@@ -408,8 +420,8 @@ | |
| if (frag != null) | ||
| try { | ||
| IViewPart part = PDEPlugin.getActivePage().showView(JavaUI.ID_PACKAGES); | ||
| ShowInPackageViewAction action = new ShowInPackageViewAction(part.getSite()); | ||
|
Check warning on line 423 in ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
|
||
| action.run(frag); | ||
|
Check warning on line 424 in ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
|
||
| } catch (PartInitException e) { | ||
| } | ||
| } | ||
|
|
@@ -464,7 +476,8 @@ | |
| Set<String> names = new HashSet<>(); // set of String names, do not allow the same package to be added twice | ||
| for (int i = 0; i < selected.length; i++) { | ||
| ImportPackageObject impObject = null; | ||
| if (selected[i] instanceof ImportItemWrapper | ||
| && !((ImportItemWrapper) selected[i]).isAlreadyImported()) | ||
| selected[i] = ((ImportItemWrapper) selected[i]).fUnderlying; | ||
|
|
||
| if (selected[i] instanceof ExportPackageDescription) | ||
|
|
@@ -530,8 +543,14 @@ | |
| NameVersionDescriptor nameVersion = new NameVersionDescriptor(exportedPackage.getName(), exportedPackage.getVersion().toString(), NameVersionDescriptor.TYPE_PACKAGE); | ||
| if (("java".equals(name) || name.startsWith("java.")) && !allowJava) //$NON-NLS-1$ //$NON-NLS-2$ | ||
| continue; | ||
| if (nameVersions.add(nameVersion)) { | ||
| ImportItemWrapper importItemWrapper = new ImportItemWrapper(exportedPackage); | ||
| elements.add(importItemWrapper); | ||
| if (fHeader != null && fHeader.hasPackage(name)) { | ||
| importItemWrapper.setAlreadyImported(); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| IPluginModelBase model = (IPluginModelBase) getPage().getPDEEditor().getAggregateModel(); | ||
| if (model instanceof IBundlePluginModelBase) { | ||
|
|
@@ -544,8 +563,13 @@ | |
| String name = pkg.getName(); | ||
| String version = pkg.getVersion(); | ||
| NameVersionDescriptor nameVersion = new NameVersionDescriptor(name, version, NameVersionDescriptor.TYPE_PACKAGE); | ||
| if (nameVersions.add(nameVersion)) { | ||
| ImportItemWrapper importItemWrapper = new ImportItemWrapper(pkg); | ||
| elements.add(importItemWrapper); | ||
| if (fHeader != null && fHeader.hasPackage(name)) { | ||
| importItemWrapper.setAlreadyImported(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of setting
IPluginModelBase currentModelvia a setter and saving it, could you just use the following?Because the less state we have the better. I also don't know if
currentModelcan be null at this point in any usage scenario and if the calledPluginSelectionDialog.getExistingImportsmethod would handle that well.