Bug 460639 - source formating
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
index 383153e..38a325c 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
@@ -598,7 +598,7 @@
public void init(ServletConfig config) throws ServletException {
throw new ServletException("Init error.");
}
-
+
};
ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService();
try {
@@ -618,7 +618,7 @@
public void init(ServletConfig config) throws ServletException {
throw new IllegalStateException("Init error.");
}
-
+
};
ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService();
try {
@@ -632,18 +632,18 @@
public void test_Registration16() throws Exception {
Filter initError = new Filter() {
-
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
throw new IllegalStateException("Init error.");
}
-
+
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
ServletException {
// nothing
}
-
+
@Override
public void destroy() {
// nothing
@@ -661,18 +661,18 @@
public void test_Registration17() throws Exception {
Filter initError = new Filter() {
-
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
throw new ServletException("Init error.");
}
-
+
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
ServletException {
// nothing
}
-
+
@Override
public void destroy() {
// nothing
@@ -692,19 +692,19 @@
final Set<String> filterTCCL = Collections.synchronizedSet(new HashSet<String>());
final Set<String> servletTCCL = Collections.synchronizedSet(new HashSet<String>());
Filter tcclFilter = new Filter() {
-
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
filterTCCL.add(Thread.currentThread().getContextClassLoader().getClass().getName());
}
-
+
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
ServletException {
filterTCCL.add(Thread.currentThread().getContextClassLoader().getClass().getName());
chain.doFilter(request, response);
}
-
+
@Override
public void destroy() {
filterTCCL.add(Thread.currentThread().getContextClassLoader().getClass().getName());
@@ -763,12 +763,12 @@
final AtomicBoolean valueBound = new AtomicBoolean(false);
final AtomicBoolean valueUnbound = new AtomicBoolean(false);
final HttpSessionBindingListener bindingListener = new HttpSessionBindingListener() {
-
+
@Override
public void valueUnbound(HttpSessionBindingEvent event) {
valueUnbound.set(true);
}
-
+
@Override
public void valueBound(HttpSessionBindingEvent event) {
valueBound.set(true);
@@ -777,12 +777,12 @@
final AtomicBoolean sessionCreated = new AtomicBoolean(false);
final AtomicBoolean sessionDestroyed = new AtomicBoolean(false);
HttpSessionListener sessionListener = new HttpSessionListener() {
-
+
@Override
public void sessionDestroyed(HttpSessionEvent se) {
sessionDestroyed.set(true);
}
-
+
@Override
public void sessionCreated(HttpSessionEvent se) {
sessionCreated.set(true);
@@ -1271,12 +1271,12 @@
ServletContextHelper servletContextHelper = new ServletContextHelper(bundle){};
Servlet s1 = new BaseServlet(expected1);
-
+
Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>();
try {
// register a hook that hides the helper from the registering bundle
registrations.add(bundleContext.registerService(FindHook.class, new FindHook() {
-
+
@Override
public void find(BundleContext context, String name, String filter, boolean allServices,
Collection<ServiceReference<?>> references) {
@@ -1841,7 +1841,7 @@
}
}
-
+
private String doRequest(String action, Map<String, String> params) throws IOException {
StringBuilder requestInfo = new StringBuilder(PROTOTYPE);
@@ -1968,14 +1968,14 @@
ServletContextHelper service) {
// nothing
}
-
+
}
static class TestContextPathAdaptor extends ContextPathCustomizer {
private final String defaultFilter;
private final String contextPrefix;
private final String testName;
-
+
/**
* @param defaultFilter
* @param contextPrefix
@@ -2002,6 +2002,6 @@
}
return null;
}
-
+
}
}
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
index c2121d6..9ecf1da 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
@@ -511,7 +511,7 @@
filterName = initparams.get(Const.FILTER_NAME);
}
HttpContextHelperFactory factory = getOrRegisterHttpContextHelperFactory(bundle, httpContext);
-
+
HttpServiceObjectRegistration objectRegistration = null;
ServiceRegistration<Filter> registration = null;
try {
@@ -605,8 +605,8 @@
pattern = pattern.substring(1);
}
else if (!pattern.contains("*.") && //$NON-NLS-1$
- !pattern.endsWith(Const.SLASH_STAR) &&
- !pattern.endsWith(Const.SLASH)) {
+ !pattern.endsWith(Const.SLASH_STAR) &&
+ !pattern.endsWith(Const.SLASH)) {
pattern += Const.SLASH_STAR;
}
@@ -764,7 +764,7 @@
}
decrementFactoryUseCount(objectRegistration.factory);
legacyMappings.remove(aliasCustomization);
-
+
}
}
@@ -1052,7 +1052,7 @@
// is registered multiple times. This is unfortunate but is an error case on the client anyway.
class LegacyFilter implements Filter {
/**
- * @throws ServletException
+ * @throws ServletException
*/
@Override
public void init(FilterConfig filterConfig) throws ServletException {
@@ -1064,14 +1064,14 @@
HttpServiceImpl.unchecked(e);
}
}
-
+
@Override
public void doFilter(
ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
filter.doFilter(request, response, chain);
}
-
+
@Override
public void destroy() {
filter.destroy();
@@ -1081,13 +1081,13 @@
static class LegacyServlet extends LegacyServiceObject implements Servlet {
final Servlet servlet;
-
+
public LegacyServlet(Servlet servlet) {
this.servlet = servlet;
}
/**
- * @throws ServletException
+ * @throws ServletException
*/
@Override
public void init(ServletConfig config)
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java
index ee23b1f..5b2b585 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ContextController.java
@@ -140,7 +140,6 @@
this.trackingContext = trackingContextParam;
this.consumingContext = consumingContext;
-
listenerServiceTracker = new ServiceTracker<EventListener, AtomicReference<ListenerRegistration>>(
trackingContext, httpServiceRuntime.getListenerFilter(),
@@ -298,7 +297,7 @@
}
public ListenerRegistration addListenerRegistration(ServiceReference<EventListener> listenerRef) throws ServletException {
-
+
checkShutdown();
ServiceHolder<EventListener> listenerHolder = new ServiceHolder<EventListener>(consumingContext.getServiceObjects(listenerRef));
@@ -433,7 +432,7 @@
}
public ServletRegistration addServletRegistration(ServiceReference<Servlet> servletRef) throws ServletException {
-
+
checkShutdown();
ServiceHolder<Servlet> servletHolder = new ServiceHolder<Servlet>(consumingContext.getServiceObjects(servletRef));