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 2012/02/05 18:03:49 UTC
svn commit: r1240768 - in
/myfaces/extensions/cdi/trunk/jse-modules/message-module:
api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.java
impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.java
Author: gpetracek
Date: Sun Feb 5 17:03:49 2012
New Revision: 1240768
URL: http://svn.apache.org/viewvc?rev=1240768&view=rev
Log:
EXTCDI-264 optional jpa support
Modified:
myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.java
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.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/AbstractMessage.java?rev=1240768&r1=1240767&r2=1240768&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.java Sun Feb 5 17:03:49 2012
@@ -45,6 +45,11 @@ public abstract class AbstractMessage im
//currently not used - would be useful for messages which are aware of the original context they were created in
private MessageContextConfig messageContextConfig;
+ //needed in case of jpa proxies
+ protected AbstractMessage()
+ {
+ }
+
public AbstractMessage(Message message)
{
this(message.getDescriptor(), message.getArguments());
@@ -301,6 +306,20 @@ public abstract class AbstractMessage im
}
}
+ protected MessagePayload[] getMessagePayload()
+ {
+ MessagePayload[] result = new MessagePayload[getPayload().size()];
+
+ int i = 0;
+ for(MessagePayload payload : getPayload().values())
+ {
+ result[i] = payload;
+ i++;
+ }
+ //noinspection unchecked
+ return result;
+ }
+
/*
* generated
*/
@@ -326,7 +345,7 @@ public abstract class AbstractMessage im
{
return false;
}
- if (!messageDescriptor.equals(that.messageDescriptor))
+ if (!getDescriptor().equals(that.getDescriptor()))
{
return false;
}
@@ -349,7 +368,7 @@ public abstract class AbstractMessage im
@Override
public int hashCode()
{
- int result = messageDescriptor.hashCode();
+ int result = getDescriptor().hashCode();
result = 31 * result + (namedArguments != null ? namedArguments.hashCode() : 0);
result = 31 * result + (arguments != null ? arguments.hashCode() : 0);
result = 31 * result + (messagePayload != null ? messagePayload.hashCode() : 0);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.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/DefaultMessage.java?rev=1240768&r1=1240767&r2=1240768&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.java Sun Feb 5 17:03:49 2012
@@ -88,18 +88,4 @@ public class DefaultMessage extends Abst
.payload(getMessagePayload())
.toText();
}
-
- private MessagePayload[] getMessagePayload()
- {
- MessagePayload[] result = new MessagePayload[getPayload().size()];
-
- int i = 0;
- for(MessagePayload payload : getPayload().values())
- {
- result[i] = payload;
- i++;
- }
- //noinspection unchecked
- return result;
- }
}