Empty package removed from manifest while refactoring

Author: Neha Burnwal

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java

@@ -69,6 +69,38 @@ public static Change createMoveToPackageChange(IFile file, MoveFromChange change
 		return null;
 	}
 
+	public static Change createEmptyPackageChange(IFile file, String packageName, IProgressMonitor monitor)
+			throws CoreException {
+		try {
+			Bundle bundle = getBundle(file, monitor);
+			if (bundle == null) {
+				return null;
+			}
+
+			BundleModel model = (BundleModel) bundle.getModel();
+			BundleTextChangeListener listener = new BundleTextChangeListener(model.getDocument());
+			bundle.getModel().addModelChangedListener(listener);
+
+			BasePackageHeader header = (BasePackageHeader) bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
+			if (header != null && header.hasPackage(packageName)) {
+				removePackage(header, packageName);
+			}
+			TextEdit[] operations = listener.getTextOperations();
+			if (operations.length > 0) {
+				TextFileChange change = new TextFileChange("", file); //$NON-NLS-1$
+				MultiTextEdit multi = new MultiTextEdit();
+				multi.addChildren(operations);
+				change.setEdit(multi);
+				PDEModelUtility.setChangeTextType(change, file);
+				return change;
+			}
+		} catch (CoreException | MalformedTreeException e) {
+		} finally {
+			FileBuffers.getTextFileBufferManager().disconnect(file.getFullPath(), LocationKind.NORMALIZE, monitor);
+		}
+		return null;
+	}
+
 	public static MoveFromChange createMovePackageChange(IFile file, Object[] elements, IProgressMonitor monitor) throws CoreException {
 		try {
 			Bundle bundle = getBundle(file, monitor);

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeMoveParticipant.java

@@ -13,7 +13,10 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.refactoring;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -93,6 +96,34 @@ protected void addChange(CompositeChange result, IProgressMonitor pm) throws Cor
 				result.add(change);
 			}
 		}
+
+		Map<IPackageFragment, List<IType>> movedByPackage = new HashMap<>();
+		fElements.forEach((element, newName) -> {
+			IType type = (IType) element;
+			IPackageFragment pkg = type.getPackageFragment();
+
+			movedByPackage.computeIfAbsent(pkg, k -> new ArrayList<>()).add(type);
+		});
+
+		for (Map.Entry<IPackageFragment, List<IType>> entry : movedByPackage.entrySet()) {
+			IPackageFragment pkg = entry.getKey();
+			List<IType> movingTypes = entry.getValue();
+
+			try {
+				IJavaElement[] children = pkg.getChildren();
+				int totalFiles = children.length;
+				int movingCount = movingTypes.size();
+				if (totalFiles == movingCount) {
+					Change change = BundleManifestChange.createEmptyPackageChange(file, pkg.getElementName(), pm);
+					if (change != null) {
+						result.add(change);
+					}
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
+
 	}
 
 }