Move eclipse only code for Delegate into own class

1 files changed, 21 insertions, 11 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegatePortal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegatePortal.java
index 3d8c86c9..01e4bb18 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegatePortal.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegatePortal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2020 The Project Lombok Authors.
+ * Copyright (C) 2012-2021 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,34 +31,44 @@ public class PatchDelegatePortal {
 	static final String SOURCE_TYPE_ELEMENT_INFO = "org.eclipse.jdt.internal.core.SourceTypeElementInfo";
 	
 	public static boolean handleDelegateForType(Object classScope) {
-		Boolean v = (Boolean) Permit.invokeSneaky(Reflection.problem, Reflection.handleDelegateForType, null, classScope);
+		Boolean v = (Boolean) Permit.invokeSneaky(Reflection.problemHandleDelegate, Reflection.handleDelegateForType, null, classScope);
 		if (v == null) return false;
 		return v.booleanValue();
 	}
 	
-	public static Object[] getChildren(Object returnValue, Object javaElement) {
-		return (Object[]) Permit.invokeSneaky(Reflection.problem, Reflection.getChildren, null, returnValue, javaElement);
+	public static Object[] addGeneratedDelegateMethods(Object returnValue, Object javaElement) {
+		return (Object[]) Permit.invokeSneaky(Reflection.problemAddGeneratedDelegateMethods, Reflection.addGeneratedDelegateMethods, null, returnValue, javaElement);
 	}
 	
 	private static final class Reflection {
 		public static final Method handleDelegateForType;
-		public static final Method getChildren;
-		public static final Throwable problem;
+		public static final Method addGeneratedDelegateMethods;
+		public static final Throwable problemHandleDelegate;
+		public static final Throwable problemAddGeneratedDelegateMethods;
 		
 		static {
 			Method m = null, n = null;
-			Throwable problem_ = null;
+			Throwable problemHandleDelegate_ = null;
+			Throwable problemAddGeneratedDelegateMethods_ = null;
 			try {
 				m = Permit.getMethod(PatchDelegate.class, "handleDelegateForType", Class.forName(CLASS_SCOPE));
-				n = Permit.getMethod(PatchDelegate.class, "getChildren", Class.forName(I_JAVA_ELEMENT_ARRAY), Class.forName(SOURCE_TYPE_ELEMENT_INFO));
 			} catch (Throwable t) {
 				// That's problematic, but as long as no local classes are used we don't actually need it.
 				// Better fail on local classes than crash altogether.
-				problem_ = t;
+				problemHandleDelegate_ = t;
 			}
 			handleDelegateForType = m;
-			getChildren = n;
-			problem = problem_;
+			problemHandleDelegate = problemHandleDelegate_;
+			
+			try {
+				n = Permit.getMethod(PatchDelegate.class, "addGeneratedDelegateMethods", Object[].class, Object.class);
+			} catch (Throwable t) {
+				// That's problematic, but as long as no local classes are used we don't actually need it.
+				// Better fail on local classes than crash altogether.
+				problemAddGeneratedDelegateMethods_ = t;
+			}
+			addGeneratedDelegateMethods = n;
+			problemAddGeneratedDelegateMethods = problemAddGeneratedDelegateMethods_;
 		}
 	}
 }