You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2013/09/07 09:13:38 UTC

[1/2] git commit: DELTASPIKE-60 minor JavaDoc tweaks

Updated Branches:
  refs/heads/master 502fecd7a -> 53fbd0069


DELTASPIKE-60 minor JavaDoc tweaks


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/53fbd006
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/53fbd006
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/53fbd006

Branch: refs/heads/master
Commit: 53fbd0069652cfe101a2eba1c0f0849b35ff28c1
Parents: 5638a30
Author: Mark Struberg <st...@localhost.localdomain>
Authored: Fri Sep 6 20:13:51 2013 +0200
Committer: Mark Struberg <st...@localhost.localdomain>
Committed: Sat Sep 7 09:10:40 2013 +0200

----------------------------------------------------------------------
 .../org/apache/deltaspike/data/api/EntityManagerResolver.java | 2 +-
 .../org/apache/deltaspike/data/spi/DelegateQueryHandler.java  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/53fbd006/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerResolver.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerResolver.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerResolver.java
index 80ebdb1..de10da3 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerResolver.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerResolver.java
@@ -22,7 +22,7 @@ import javax.persistence.EntityManager;
 
 /**
  * Resolve the EntityManager used for a specific repository.
- * Only necessary if there are more than one persistence unit.
+ * Only necessary if there is more than one persistence unit.
  */
 public interface EntityManagerResolver
 {

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/53fbd006/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/DelegateQueryHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/DelegateQueryHandler.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/DelegateQueryHandler.java
index 781b3a1..a84237b 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/DelegateQueryHandler.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/DelegateQueryHandler.java
@@ -20,20 +20,21 @@ package org.apache.deltaspike.data.spi;
 
 /**
  * A marker interface. Used for writing custom query methods:
- *
+ * <pre>
  * public interface RepositoryExtension<E> {
  *     E saveAndFlushAndRefresh(E entity);
  * }
  *
  * public class DelegateRepositoryExtension<E> implements RepositoryExtension<E>, DelegateQueryHandler {
- *    @Inject
+ *    &#064;Inject
  *    private QueryInvocationContext context;
  *
- *    @Override
+ *    &#064;Override
  *    public E saveAndFlushAndRefresh(E entity) {
  *        ...
  *    }
  * }
+ * </pre>
  *
  * The extension is now usable with:
  *


[2/2] git commit: DELTASPIKE-405 revert back to

Posted by st...@apache.org.
DELTASPIKE-405 revert back to <M>


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5638a30b
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5638a30b
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5638a30b

Branch: refs/heads/master
Commit: 5638a30b2ba14b9e590fa6f2d411a2810d23c21c
Parents: 502fecd
Author: Mark Struberg <st...@localhost.localdomain>
Authored: Fri Sep 6 20:12:27 2013 +0200
Committer: Mark Struberg <st...@localhost.localdomain>
Committed: Sat Sep 7 09:10:40 2013 +0200

----------------------------------------------------------------------
 .../apache/deltaspike/jsf/impl/message/JsfMessageProducer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5638a30b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
index 63b48f9..b9e3e7e 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java
@@ -37,7 +37,7 @@ public class JsfMessageProducer
 {
     @Produces
     @Dependent
-    public JsfMessage createJsfMessage(InjectionPoint injectionPoint,
+    public <M> JsfMessage<M> createJsfMessage(InjectionPoint injectionPoint,
                                        MessageBundleInvocationHandler invocationHandler)
     {
         if (!(injectionPoint.getType() instanceof ParameterizedType))
@@ -53,7 +53,7 @@ public class JsfMessageProducer
         try
         {
             @SuppressWarnings("unchecked")
-            Class<?> type = (Class<?>) actualTypes[0];
+            Class<M> type = (Class<M>) actualTypes[0];
             return createJsfMessageFor(injectionPoint, type, invocationHandler);
         }
         catch (ClassCastException e)