Repository: deltaspike Updated Branches: refs/heads/master 138a061c3 -> 82596c574
DELTASPIKE-1331 improved method signature of ViewConfigNode#getSource Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/fe0106d4 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/fe0106d4 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/fe0106d4 Branch: refs/heads/master Commit: fe0106d4a0ceaded2f6f38bdc83292de28888b4f Parents: 138a061 Author: gpetracek <gpetra...@apache.org> Authored: Fri Mar 23 23:21:38 2018 +0100 Committer: gpetracek <gpetra...@apache.org> Committed: Fri Mar 23 23:21:38 2018 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/core/spi/config/view/ViewConfigNode.java | 2 +- .../jsf/impl/config/view/DefaultConfigNodeConverter.java | 2 +- .../deltaspike/jsf/impl/config/view/FolderConfigNode.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/fe0106d4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java index 3aa7e72..64b70f3 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/view/ViewConfigNode.java @@ -34,7 +34,7 @@ public interface ViewConfigNode List<ViewConfigNode> getChildren(); - Class getSource(); + Class<?> getSource(); Set<Annotation> getMetaData(); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/fe0106d4/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java index c25d742..44682cb 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java @@ -67,7 +67,7 @@ public class DefaultConfigNodeConverter implements ConfigNodeConverter { View viewAnnotation = findMetaDataByType(mergedMetaData, View.class); String viewId = viewAnnotation.basePath() + viewAnnotation.name() + "." + viewAnnotation.extension(); - return new DefaultViewPathConfigDescriptor(viewId, node.getSource(), + return new DefaultViewPathConfigDescriptor(viewId, (Class<? extends ViewConfig>) node.getSource(), filterInheritedFolderMetaData(mergedMetaData), node.getCallbackDescriptors()); } else http://git-wip-us.apache.org/repos/asf/deltaspike/blob/fe0106d4/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java index 3a357c7..85ccf9e 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/FolderConfigNode.java @@ -29,9 +29,9 @@ import java.util.Set; public class FolderConfigNode extends AbstractConfigNode { //not all interfaces have to implement the ViewConfig interface - private final Class nodeId; + private final Class<?> nodeId; - public FolderConfigNode(Class nodeId, ViewConfigNode parent, Set<Annotation> nodeMetaData) + public FolderConfigNode(Class<?> nodeId, ViewConfigNode parent, Set<Annotation> nodeMetaData) { super(parent, nodeMetaData); this.nodeId = nodeId; @@ -55,7 +55,7 @@ public class FolderConfigNode extends AbstractConfigNode } @Override - public Class getSource() + public Class<?> getSource() { return this.nodeId; }