You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/04/04 21:47:18 UTC
git commit: DELTASPIKE-288 support for folder-only config
Updated Branches:
refs/heads/master 9720bec1b -> 2f2fada8a
DELTASPIKE-288 support for folder-only config
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/2f2fada8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/2f2fada8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/2f2fada8
Branch: refs/heads/master
Commit: 2f2fada8a7b3d30e25b46ad00d247d09a7c9d04f
Parents: 9720bec
Author: gpetracek <gp...@apache.org>
Authored: Thu Apr 4 21:45:21 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Thu Apr 4 21:46:07 2013 +0200
----------------------------------------------------------------------
.../jsf/impl/config/view/ViewConfigExtension.java | 22 +++++++++------
1 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2f2fada8/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
index af24c75..baae73e 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
@@ -31,6 +31,7 @@ import org.apache.deltaspike.core.spi.config.view.ViewConfigRoot;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.ExceptionUtils;
+import org.apache.deltaspike.jsf.api.config.view.Folder;
import org.apache.deltaspike.jsf.impl.util.ViewConfigUtils;
import javax.enterprise.event.Observes;
@@ -73,15 +74,24 @@ public class ViewConfigExtension implements Extension, Deactivatable
return;
}
- if (ViewConfig.class.isAssignableFrom(pat.getAnnotatedType().getJavaClass()))
+ Class beanClass = pat.getAnnotatedType().getJavaClass();
+ if (ViewConfig.class.isAssignableFrom(beanClass))
{
addPageDefinition(pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
pat.veto();
}
else
{
- addIndirectlyInheritedMetaData(
- pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
+ if (beanClass.isAnnotationPresent(Folder.class))
+ {
+ addPageDefinition(pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
+ pat.veto();
+ }
+ else
+ {
+ addIndirectlyInheritedMetaData(
+ pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
+ }
}
}
@@ -161,12 +171,6 @@ public class ViewConfigExtension implements Extension, Deactivatable
}
}
- if (ViewConfigUtils.isFolderConfig(viewConfigClass))
- {
- //TODO log it
- return;
- }
-
List<Class> treePath = ViewConfigUtils.toNodeList(viewConfigClass);
ViewConfigNode previousRootNode = null;