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 2018/03/29 21:46:41 UTC
[5/7] deltaspike git commit: DELTASPIKE-1331 improved method
signature of ViewConfigNode#getSource
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/add0adf3
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/add0adf3
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/add0adf3
Branch: refs/heads/deltaspike-1.8.x
Commit: add0adf311d260b9e727e172d5248161bdc62d16
Parents: 5892839
Author: gpetracek <gp...@apache.org>
Authored: Fri Mar 23 23:21:38 2018 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Thu Mar 29 23:37:18 2018 +0200
----------------------------------------------------------------------
.../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/add0adf3/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/add0adf3/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/add0adf3/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;
}