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 2010/05/01 21:26:33 UTC
svn commit: r940094 - in
/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src:
main/java/org/apache/myfaces/extensions/cdi/message/impl/
test/java/org/apache/myfaces/extensions/cdi/message/test/
Author: gpetracek
Date: Sat May 1 19:26:33 2010
New Revision: 940094
URL: http://svn.apache.org/viewvc?rev=940094&view=rev
Log:
[EXTCDI-21] minor changes and added test-cases
Modified:
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.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/DefaultMessageBuilder.java?rev=940094&r1=940093&r2=940094&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java Sat May 1 19:26:33 2010
@@ -410,4 +410,9 @@ class DefaultMessageBuilder implements M
{
return this.messageContext;
}
+
+ protected void setMessageFactory(MessageFactory messageFactory)
+ {
+ this.messageFactory = messageFactory;
+ }
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.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/SimpleMessageBuilder.java?rev=940094&r1=940093&r2=940094&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.java Sat May 1 19:26:33 2010
@@ -20,6 +20,8 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
import org.apache.myfaces.extensions.cdi.message.api.MessageBuilder;
+import org.apache.myfaces.extensions.cdi.message.api.MessageFactory;
+import org.apache.myfaces.extensions.cdi.message.api.Message;
/**
* just for manual usages (see the test-case)
@@ -51,13 +53,31 @@ public class SimpleMessageBuilder extend
return new SimpleMessageBuilder(messageContext);
}
+ public static MessageBuilder message(MessageFactory messageFactory)
+ {
+ SimpleMessageBuilder messageBuilder = new SimpleMessageBuilder();
+ messageBuilder.setMessageFactory(messageFactory);
+ return messageBuilder;
+ }
+
+ @Override
+ public Message add()
+ {
+ if (getMessageContext() == null)
+ {
+ throw new IllegalStateException(getClass().getName() + ".toText called outside a message context " +
+ "please use SimpleMessageBuilder.message(messageContext).text(...).add();");
+ }
+ return super.add();
+ }
+
@Override
public String toText()
{
if (getMessageContext() == null)
{
throw new IllegalStateException(getClass().getName() + ".toText called outside a message context " +
- "please use SimpleMessageBuilder.message(messageContext).text(...).toText()");
+ "please use SimpleMessageBuilder.message(messageContext).text(...).toText();");
}
return super.toText();
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java?rev=940094&r1=940093&r2=940094&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java Sat May 1 19:26:33 2010
@@ -22,6 +22,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
import org.apache.myfaces.extensions.cdi.message.api.Message;
import org.apache.myfaces.extensions.cdi.message.impl.DefaultMessageContext;
+import org.apache.myfaces.extensions.cdi.message.impl.SimpleMessageBuilder;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class ExtensibilityTest extends A
}
@Test
- public void newMessageFactoryTest()
+ public void newMessageFactoryTestViaMessageContext()
{
Message message = new DefaultMessageContext(new TestMessageFactory()).message().text("{hello}").create();
@@ -53,6 +54,14 @@ public class ExtensibilityTest extends A
}
@Test
+ public void newMessageFactoryTestViaMessageBuilder()
+ {
+ Message message = SimpleMessageBuilder.message(new TestMessageFactory()).text("{hello}").create();
+
+ assertEquals(TestMessage.class, message.getClass());
+ }
+
+ @Test
public void newContextTest()
{
MessageContext newMessageContext = this.messageContext.cloneContext();