Missed code/files while Conflict resolution

eclipse-pde · Oct 23, 2024 · 8717f18 · 8717f18
1 parent 7b670f6
commit 8717f18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEJavaHelper.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEJavaHelper.java
@@ -362,7 +362,7 @@ public static HashMap<String, IPackageFragment> getPackageFragmentsHash2(IJavaPr
 					if (name.length() == 0) {
 						name = "."; //$NON-NLS-1$
 					}
-					if ((fragment.hasChildren() || fragment.getNonJavaResources().length > 0) && !existingPackages.contains(name)) {
+					if ((fragment.hasChildren() || fragment.getNonJavaResources().length > 0)) {
 						if (!name.equals("java") || !name.startsWith("java.") || allowJava) { //$NON-NLS-1$ //$NON-NLS-2$
 							map.put(fragment.getPath().makeRelative() + "_" + fragment.getElementName(), fragment); //$NON-NLS-1$
 						}

diff --git a/...rg.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java b/...rg.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
@@ -77,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;
@@ -640,6 +641,11 @@ public String getText(Object element) {
 			}
 			return javaElementLabel.getText(element);
 		}
+
+		@Override
+		public Image getImage(Object element) {
+			return javaElementLabel.getImage(element);
+		}
 	}
 
 }