Skip to content

Commit 424fe1d

Browse files
committed
fix for method deleted in Eclipse 2025-03 (4.35.0)
1 parent c3f5b97 commit 424fe1d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

wolips/plugins/org.objectstyle.wolips.wodclipse.core/java/org/objectstyle/wolips/wodclipse/core/refactoring/AddActionOperation.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import org.eclipse.core.runtime.CoreException;
77
import org.eclipse.jdt.core.Flags;
88
import org.eclipse.jdt.core.IJavaElement;
9+
import org.eclipse.jdt.core.IJavaProject;
910
import org.eclipse.jdt.core.IType;
11+
import org.eclipse.jdt.core.JavaCore;
1012
import org.eclipse.jdt.core.JavaModelException;
1113
import org.eclipse.jdt.core.Signature;
1214
import org.eclipse.jdt.core.formatter.CodeFormatter;
@@ -39,7 +41,7 @@ protected void executeOperation() throws JavaModelException {
3941
}
4042

4143
String actionMethodName = _info.getName();
42-
boolean useGenerics = JavaModelUtil.is50OrHigher(componentType.getJavaProject());
44+
boolean useGenerics = is50OrHigher(componentType.getJavaProject());
4345
String simpleTypeName = Signature.getSimpleName(keyType);
4446

4547
boolean loadPage = !"WOComponent".equals(simpleTypeName) && !"WOActionResults".equals(simpleTypeName);
@@ -66,6 +68,12 @@ protected void executeOperation() throws JavaModelException {
6668
new CreateMethodOperation(componentType, source, false).runOperation(progressMonitor);
6769
}
6870

71+
// this was removed from JavaModelUtil in Eclipse 2025-03 (4.35.0)
72+
// see https://github.com/eclipse-jdt/eclipse.jdt.ui/commit/b9233aa235f0385a580e2fa2f0d2778ae8b9556c
73+
protected static boolean is50OrHigher(IJavaProject project) {
74+
return !JavaModelUtil.isVersionLessThan(JavaModelUtil.getSourceCompliance(project), JavaCore.VERSION_1_5);
75+
}
76+
6977
public static void addAction(AddActionInfo info) throws CoreException {
7078
IEditorPart editorPart = JavaUI.openInEditor(info.getComponentType().getCompilationUnit());
7179
if (editorPart != null) {

wolips/plugins/org.objectstyle.wolips.wodclipse.core/java/org/objectstyle/wolips/wodclipse/core/refactoring/AddKeyOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private IJavaProject getJavaProject() {
199199
}
200200

201201
private String simpleTypeName(String keyType, String keyParameterType) {
202-
boolean useGenerics = JavaModelUtil.is50OrHigher(getJavaProject());
202+
boolean useGenerics = AddActionOperation.is50OrHigher(getJavaProject());
203203
String simpleTypeName;
204204
if (keyParameterType != null && useGenerics) {
205205
simpleTypeName = Signature.getSimpleName(keyType) + "<" + Signature.getSimpleName(keyParameterType) + ">";

0 commit comments

Comments
 (0)