You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/30 23:40:27 UTC
svn commit: r1727761 -
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Author: veithen
Date: Sat Jan 30 22:40:27 2016
New Revision: 1727761
URL: http://svn.apache.org/viewvc?rev=1727761&view=rev
Log:
Use generics internally.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1727761&r1=1727760&r2=1727761&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java Sat Jan 30 22:40:27 2016
@@ -846,9 +846,9 @@ final class Navigator extends PullSerial
* ####################################################################
*/
- private Map getAllNamespaces(OMSerializable contextNode) {
+ private Map<String,String> getAllNamespaces(OMSerializable contextNode) {
if (contextNode == null) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
}
OMContainer context;
if (contextNode instanceof OMContainer) {
@@ -856,7 +856,7 @@ final class Navigator extends PullSerial
} else {
context = ((OMNode)contextNode).getParent();
}
- Map nsMap = new LinkedHashMap();
+ Map<String,String> nsMap = new LinkedHashMap<String,String>();
while (context != null && !(context instanceof OMDocument)) {
OMElement element = (OMElement) context;
for (Iterator it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
@@ -876,7 +876,7 @@ final class Navigator extends PullSerial
return nsMap;
}
- private void addNamespaceToMap(OMNamespace ns, Map map) {
+ private void addNamespaceToMap(OMNamespace ns, Map<String,String> map) {
if (map.get(ns.getPrefix()) == null) {
map.put(ns.getPrefix(), ns.getNamespaceURI());
}