Fix incomplete computation of version ranges for quick-fixes

Follow-up on
- #2120

Author: HannesWell

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/ManifestUtils.java

@@ -406,7 +406,7 @@ public static Optional<VersionRange> createConsumerRequirementRange(Version vers
 					new Version(version.getMajor() + 1, 0, 0), //
 					VersionRange.RIGHT_OPEN));
 		}
-		return null;
+		return Optional.empty();
 	}
 
 	/**

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/JavaResolutionFactory.java

@@ -15,7 +15,6 @@
 
 import java.text.MessageFormat;
 import java.util.Arrays;
-import java.util.Optional;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -196,25 +195,24 @@ protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws Co
 					}
 					BundleDescription requiredBundle = getChangeObject();
 					String pluginId = requiredBundle.getSymbolicName();
+					VersionRange versionRange = ManifestUtils
+							.createConsumerRequirementRange(requiredBundle.getVersion()).orElse(null);
 					IPluginImport[] imports = base.getPluginBase().getImports();
 					if (!isUndo()) {
 						if (Arrays.stream(imports).map(IPluginImport::getId).anyMatch(pluginId::equals)) {
 							return;
 						}
 						IPluginImport impt = base.getPluginFactory().createImport();
 						impt.setId(pluginId);
-						Optional<String> versionRange = ManifestUtils
-								.createConsumerRequirementRange(requiredBundle.getVersion())
-								.map(VersionRange::toString);
-						if (versionRange.isPresent()) {
-							impt.setVersion(versionRange.get());
+						if (versionRange != null) {
+							impt.setVersion(versionRange.toString());
 						}
 						base.getPluginBase().add(impt);
 					} else {
 						for (IPluginImport pluginImport : imports) {
-							if (pluginImport.getId().equals(pluginId)) {
+							if (pluginImport.getId().equals(pluginId) && (versionRange == null
+									|| versionRange.includes(Version.parseVersion(pluginImport.getVersion())))) {
 								base.getPluginBase().remove(pluginImport);
-								// TODO: Consider version too!
 							}
 						}
 					}