Skip to content

Commit 440cacc

Browse files
committed
fix compilation error on CompositeComponentELResolver
1 parent 5b4b115 commit 440cacc

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

impl/src/main/java/com/sun/faces/config/InitFacesContext.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@
2727
import java.util.logging.Level;
2828
import java.util.logging.Logger;
2929

30-
import com.sun.faces.RIConstants;
31-
import com.sun.faces.config.initfacescontext.NoOpELContext;
32-
import com.sun.faces.config.initfacescontext.NoOpFacesContext;
33-
import com.sun.faces.config.initfacescontext.ServletContextAdapter;
34-
import com.sun.faces.context.ApplicationMap;
35-
import com.sun.faces.context.ExceptionHandlerImpl;
36-
import com.sun.faces.util.FacesLogger;
37-
import com.sun.faces.util.Util;
38-
3930
import jakarta.el.ELContext;
4031
import jakarta.faces.FactoryFinder;
4132
import jakarta.faces.application.Application;
@@ -47,11 +38,20 @@
4738
import jakarta.faces.context.FacesContext;
4839
import jakarta.servlet.ServletContext;
4940

41+
import com.sun.faces.RIConstants;
42+
import com.sun.faces.config.initfacescontext.NoOpELContext;
43+
import com.sun.faces.config.initfacescontext.NoOpFacesContext;
44+
import com.sun.faces.config.initfacescontext.ServletContextAdapter;
45+
import com.sun.faces.context.ApplicationMap;
46+
import com.sun.faces.context.ExceptionHandlerImpl;
47+
import com.sun.faces.util.FacesLogger;
48+
import com.sun.faces.util.Util;
49+
5050
/**
5151
* A special, minimal implementation of FacesContext used at application initialization time. The ExternalContext
5252
* returned by this FacesContext only exposes the ApplicationMap.
5353
*/
54-
public class InitFacesContext extends NoOpFacesContext {
54+
public class InitFacesContext extends NoOpFacesContext {
5555

5656
private static final Logger LOGGER = FacesLogger.CONFIG.getLogger();
5757
private static final String INIT_FACES_CONTEXT_ATTR_NAME = RIConstants.FACES_PREFIX + "InitFacesContext";

impl/src/main/java/com/sun/faces/el/CompositeComponentELResolver.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package com.sun.faces.el;
1818

19-
import java.beans.FeatureDescriptor;
20-
import java.util.Iterator;
21-
2219
import jakarta.el.ELContext;
2320
import jakarta.el.ELException;
2421
import jakarta.el.ELResolver;
@@ -90,9 +87,4 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
9087

9188
return null;
9289
}
93-
94-
@Override
95-
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
96-
return null;
97-
}
9890
}

0 commit comments

Comments
 (0)