Repository: deltaspike Updated Branches: refs/heads/master 5745b0a64 -> cc5319095
DELTASPIKE-743 part 2: address some objections from commit 5745b0a6431d57647632356edbaafdc583006251 Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/cc531909 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/cc531909 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/cc531909 Branch: refs/heads/master Commit: cc53190957f12a4ac6fc70886a4579c5b14a96ab Parents: 5745b0a Author: mbenson <[email protected]> Authored: Wed Oct 15 13:20:26 2014 -0500 Committer: mbenson <[email protected]> Committed: Wed Oct 15 13:20:26 2014 -0500 ---------------------------------------------------------------------- .../apache/deltaspike/core/api/config/view/ViewRef.java | 11 +++++++++-- .../deltaspike/core/api/provider/BeanProvider.java | 10 +++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc531909/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java index b6abf6c..8c4a786 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java @@ -75,8 +75,15 @@ public @interface ViewRef Named named = sourceClass.getAnnotation(Named.class); - String beanName = named == null ? null : named.value(); - + String beanName; + if (named == null) + { + beanName = null; + } + else + { + beanName = named.value(); + } return new ViewControllerRefLiteral(sourceClass, beanName); } } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc531909/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java index 12a6ca1..af9912c 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java @@ -59,9 +59,13 @@ public final class BeanProvider { private static final Logger LOG = Logger.getLogger(BeanProvider.class.getName()); - private static final boolean LOG_DEPENDENT_WARNINGS = - Arrays.asList(ProjectStage.Development, ProjectStage.UnitTest).contains( - ProjectStageProducer.getInstance().getProjectStage()); + private static final boolean LOG_DEPENDENT_WARNINGS; + static + { + LOG_DEPENDENT_WARNINGS = + Arrays.asList(ProjectStage.Development, ProjectStage.UnitTest).contains( + ProjectStageProducer.getInstance().getProjectStage()); + } private BeanProvider() {
