You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/02/22 20:09:44 UTC
svn commit: r1073455 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/
examples/jsf-playground/clientside_windowhandler_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/config/view/
jee-mod...
Author: gpetracek
Date: Tue Feb 22 19:09:43 2011
New Revision: 1073455
URL: http://svn.apache.org/viewvc?rev=1073455&view=rev
Log:
cleanup
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/ClassDeactivator.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/CodiInformation.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/clientside_windowhandler_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/config/view/Pages.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageResolver.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessageSeverity.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/NumberFormatterConfigKeys.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/ClassDeactivator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/ClassDeactivator.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/ClassDeactivator.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/ClassDeactivator.java Tue Feb 22 19:09:43 2011
@@ -33,5 +33,5 @@ public interface ClassDeactivator extend
*
* @return classes which should be deactivated
*/
- public Set<Class> getDeactivatedClasses();
+ Set<Class> getDeactivatedClasses();
}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/CodiInformation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/CodiInformation.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/CodiInformation.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/CodiInformation.java Tue Feb 22 19:09:43 2011
@@ -27,7 +27,7 @@ import org.apache.myfaces.extensions.cdi
*/
public interface CodiInformation
{
- static final String VERSION = ClassUtils.getJarVersion(CodiInformation.class);
+ String VERSION = ClassUtils.getJarVersion(CodiInformation.class);
- static final String REVISION = ClassUtils.getRevision(CodiInformation.class);
+ String REVISION = ClassUtils.getRevision(CodiInformation.class);
}
Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/clientside_windowhandler_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/config/view/Pages.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/clientside_windowhandler_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/config/view/Pages.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/clientside_windowhandler_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/config/view/Pages.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/clientside_windowhandler_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/config/view/Pages.java Tue Feb 22 19:09:43 2011
@@ -28,12 +28,12 @@ import org.apache.myfaces.extensions.cdi
public interface Pages extends ViewConfig
{
@Page
- public final class Page1 implements Pages
+ final class Page1 implements Pages
{
}
@Page
- public final class Page2 implements Pages
+ final class Page2 implements Pages
{
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java Tue Feb 22 19:09:43 2011
@@ -35,7 +35,7 @@ public interface ClientConfig extends Se
/**
* The location of the default windowhandler resource
*/
- public static final String DEFAULT_WINDOW_HANDLER_HTML_FILE = "static/windowhandler.html";
+ String DEFAULT_WINDOW_HANDLER_HTML_FILE = "static/windowhandler.html";
/**
* Defaults to <code>true</code>.
@@ -66,6 +66,5 @@ public interface ClientConfig extends Se
* @return a String containing the whole windowhandler.html file.
* @throws IOException
*/
- String getWindowHandlerHtml()
- throws IOException;
+ String getWindowHandlerHtml() throws IOException;
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java Tue Feb 22 19:09:43 2011
@@ -40,17 +40,17 @@ import javax.inject.Inject;
public class JsfModuleStartupObserver extends AbstractStartupObserver
{
@Inject
- protected JsfModuleConfig jsfModuleConfig;
+ private JsfModuleConfig jsfModuleConfig;
@Inject
- protected WindowContextConfig windowContextConfig;
+ private WindowContextConfig windowContextConfig;
@Inject
- protected ConversationConfig conversationConfig;
+ private ConversationConfig conversationConfig;
@Inject
@Jsf
- protected MessageContext messageContext;
+ private MessageContext messageContext;
protected JsfModuleStartupObserver()
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java Tue Feb 22 19:09:43 2011
@@ -46,10 +46,11 @@ class ExtractedViewConfigDefinitionEntry
List<Class<? extends Annotation>> foundAndBlockedMetaDataTypes = new ArrayList<Class<? extends Annotation>>();
//security
- List<Class<? extends AccessDecisionVoter>> foundVoters = new ArrayList<Class<? extends AccessDecisionVoter>>();
- Class<? extends ViewConfig> errorView = null;
+ private List<Class<? extends AccessDecisionVoter>> foundVoters =
+ new ArrayList<Class<? extends AccessDecisionVoter>>();
+ private Class<? extends ViewConfig> errorView = null;
- List<Annotation> viewMetaDataList = new ArrayList<Annotation>();
+ private List<Annotation> viewMetaDataList = new ArrayList<Annotation>();
protected Class<? extends ViewConfig> viewDefinitionClass;
protected String basePath = ROOT_PATH;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java Tue Feb 22 19:09:43 2011
@@ -38,6 +38,7 @@ import org.apache.myfaces.extensions.cdi
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.Typed;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
@@ -57,6 +58,7 @@ import java.util.concurrent.CopyOnWriteA
* internal! utils
* @author Gerhard Petracek
*/
+@Typed()
public class ConversationUtils
{
public static final String EXISTING_WINDOW_ID_SET_KEY =
@@ -69,7 +71,11 @@ public class ConversationUtils
new ConcurrentHashMap<Class, Class<? extends Annotation>>();
private static final String REDIRECT_PERFORMED_KEY = WindowHandler.class.getName() + "redirect:KEY";
-
+
+ private ConversationUtils()
+ {
+ }
+
public static Class getConversationGroup(Bean<?> bean)
{
Class<? extends Annotation> scopeType = bean.getScope();
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageResolver.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageResolver.java Tue Feb 22 19:09:43 2011
@@ -28,7 +28,7 @@ import java.io.Serializable;
*/
public interface MessageResolver extends Serializable
{
- static final String MISSING_RESOURCE_MARKER = "???";
+ String MISSING_RESOURCE_MARKER = "???";
/**
* @param messageContext the current {@link org.apache.myfaces.extensions.cdi.message.api.MessageContext}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessageSeverity.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessageSeverity.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessageSeverity.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessageSeverity.java Tue Feb 22 19:09:43 2011
@@ -23,13 +23,13 @@ package org.apache.myfaces.extensions.cd
*/
public interface MessageSeverity
{
- public static final Info INFO = new Info();
- public static final Warn WARN = new Warn();
- public static final Error ERROR = new Error();
- public static final Fatal FATAL = new Fatal();
+ Info INFO = new Info();
+ Warn WARN = new Warn();
+ Error ERROR = new Error();
+ Fatal FATAL = new Fatal();
@MessagePayloadKey(MessageSeverity.class)
- public final class Info extends AbstractMessagePayload
+ final class Info extends AbstractMessagePayload
{
private static final long serialVersionUID = -8366105004121496310L;
@@ -39,7 +39,7 @@ public interface MessageSeverity
}
@MessagePayloadKey(MessageSeverity.class)
- public final class Warn extends AbstractMessagePayload
+ final class Warn extends AbstractMessagePayload
{
private static final long serialVersionUID = -8656172186651851576L;
@@ -49,7 +49,7 @@ public interface MessageSeverity
}
@MessagePayloadKey(MessageSeverity.class)
- public final class Error extends AbstractMessagePayload
+ final class Error extends AbstractMessagePayload
{
private static final long serialVersionUID = -1825994085836261242L;
@@ -59,7 +59,7 @@ public interface MessageSeverity
}
@MessagePayloadKey(MessageSeverity.class)
- public final class Fatal extends AbstractMessagePayload
+ final class Fatal extends AbstractMessagePayload
{
private static final long serialVersionUID = 1323372922553756526L;
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/NumberFormatterConfigKeys.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/NumberFormatterConfigKeys.java?rev=1073455&r1=1073454&r2=1073455&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/NumberFormatterConfigKeys.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/NumberFormatterConfigKeys.java Tue Feb 22 19:09:43 2011
@@ -23,17 +23,17 @@ package org.apache.myfaces.extensions.cd
*/
public interface NumberFormatterConfigKeys
{
- static final String GROUPING_SEPARATOR_KEY = "grouping_separator";
+ String GROUPING_SEPARATOR_KEY = "grouping_separator";
- static final String DECIMAL_SEPARATOR_KEY = "decimal_separator";
+ String DECIMAL_SEPARATOR_KEY = "decimal_separator";
- static final String MINIMUM_FRACTION_DIGITS_KEY = "minimum_fraction_digits";
+ String MINIMUM_FRACTION_DIGITS_KEY = "minimum_fraction_digits";
- static final String MINIMUM_INTEGER_DIGITS_KEY = "minimum_integer_digits";
+ String MINIMUM_INTEGER_DIGITS_KEY = "minimum_integer_digits";
- static final String MAXIMUM_FRACTION_DIGITS = "maximum_fraction_digits";
+ String MAXIMUM_FRACTION_DIGITS = "maximum_fraction_digits";
- static final String MAXIMUM_INTEGER_DIGITS = "maximum_integer_digits";
+ String MAXIMUM_INTEGER_DIGITS = "maximum_integer_digits";
- static final String EXPONENT_SEPARATOR = "exponent_separator";
+ String EXPONENT_SEPARATOR = "exponent_separator";
}
\ No newline at end of file