Skip to content

Commit

Permalink
Move org.eclipse.m2e.sourclookup* to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
mickaelistria committed Jun 2, 2022
1 parent 36f3ff3 commit d4c976b
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 15 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.m2e.sourcelookup.ui/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
2 changes: 1 addition & 1 deletion org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.core;bundle-version="3.9.0",
org.eclipse.core.resources,
org.eclipse.debug.core
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.m2e.sourcelookup.ui
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public class ImportBinaryProjectHandler extends AbstractHandler {
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);

if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
if (selection instanceof IStructuredSelection structuredSelection && !selection.isEmpty()) {
try {
importBinaryProjects(((IStructuredSelection) selection).getFirstElement());
importBinaryProjects(structuredSelection.getFirstElement());
} catch (DebugException e) {
throw new ExecutionException("Could not import binary project", e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@ private String toString(ISourceContainer container) {
StringBuilder sb = new StringBuilder();
sb.append(container.getClass().getSimpleName()).append(" ").append(container.getName());

if (container instanceof PackageFragmentRootSourceContainer) {
sb.append(" ").append(
((PackageFragmentRootSourceContainer) container).getPackageFragmentRoot().getJavaProject().getProject());
if (container instanceof PackageFragmentRootSourceContainer fragmentRoot) {
sb.append(" ").append(fragmentRoot.getPackageFragmentRoot().getJavaProject().getProject());
}

return sb.toString();
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.sourcelookup/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=17
8 changes: 4 additions & 4 deletions org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.m2e.sourcelookup;singleton:=true
Bundle-Version: 1.18.0.qualifier
Bundle-Version: 1.19.0.qualifier
Bundle-Vendor: Eclipse.org - m2e
Bundle-Name: M2E Source Lookup Core
Require-Bundle: org.eclipse.m2e.launching;bundle-version="1.16.0",
org.eclipse.m2e.core;bundle-version="1.16.0",
Require-Bundle: org.eclipse.m2e.launching;bundle-version="2.0.0",
org.eclipse.m2e.core;bundle-version="2.0.0",
org.eclipse.m2e.maven.runtime;bundle-version="1.16.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.jdt.debug;bundle-version="3.8.0",
Expand All @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="1.16.0",
org.eclipse.core.variables;bundle-version="3.2.0",
org.apache.commons.codec;bundle-version="1.14.0"
Import-Package: org.slf4j;version="[1.6.2,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Eclipse-BundleShape: dir
Export-Package: org.eclipse.m2e.sourcelookup.internal.launch;x-friends:="org.eclipse.m2e.sourcelookup.ui,org.eclipse.m2e.binaryproject"
Expand Down

0 comments on commit d4c976b

Please sign in to comment.