You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/01/07 13:46:14 UTC
svn commit: r1896802 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl: common/ config/ inst2xsd/util/ regex/ schema/ store/
Author: fanningpj
Date: Fri Jan 7 13:46:14 2022
New Revision: 1896802
URL: http://svn.apache.org/viewvc?rev=1896802&view=rev
Log:
use more generics internally
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java?rev=1896802&r1=1896801&r2=1896802&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java Fri Jan 7 13:46:14 2022
@@ -195,7 +195,7 @@ public class QNameHelper
return readable(sType, WELL_KNOWN_PREFIXES);
}
- public static String readable(SchemaType sType, Map nsPrefix)
+ public static String readable(SchemaType sType, Map<String, String> nsPrefix)
{
if (sType.getName() != null)
{
@@ -256,11 +256,11 @@ public class QNameHelper
return readable(name, WELL_KNOWN_PREFIXES);
}
- public static String readable(QName name, Map prefixes)
+ public static String readable(QName name, Map<String, String> prefixes)
{
if (name.getNamespaceURI().length() == 0)
return name.getLocalPart();
- String prefix = (String)prefixes.get(name.getNamespaceURI());
+ String prefix = prefixes.get(name.getNamespaceURI());
if (prefix != null)
return prefix + ":" + name.getLocalPart();
return name.getLocalPart() + " in namespace " + name.getNamespaceURI();
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java?rev=1896802&r1=1896801&r2=1896802&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java Fri Jan 7 13:46:14 2022
@@ -28,9 +28,9 @@ import java.util.*;
* An implementation of BindingConfig
*/
public class BindingConfigImpl extends BindingConfig {
- private final Map _packageMap = new LinkedHashMap();
- private final Map _prefixMap = new LinkedHashMap();
- private final Map _suffixMap = new LinkedHashMap();
+ private final Map<Object, String> _packageMap = new LinkedHashMap<>();
+ private final Map<Object, String> _prefixMap = new LinkedHashMap<>();
+ private final Map<Object, String> _suffixMap = new LinkedHashMap<>();
// uri prefix -> package
private final Map<Object, String> _packageMapByUriPrefix = new LinkedHashMap<>();
// uri prefix -> name prefix
@@ -219,11 +219,11 @@ public class BindingConfigImpl extends B
}
- private String lookup(Map map, Map mapByUriPrefix, String uri) {
+ private String lookup(Map<Object, String> map, Map<Object, String> mapByUriPrefix, String uri) {
if (uri == null) {
uri = "";
}
- String result = (String) map.get(uri);
+ String result = map.get(uri);
if (result != null) {
return result;
}
@@ -234,27 +234,29 @@ public class BindingConfigImpl extends B
}
}
- return (String) map.get("##any");
+ return map.get("##any");
}
- private String lookupByUriPrefix(Map mapByUriPrefix, String uri) {
+ private String lookupByUriPrefix(Map<Object, String> mapByUriPrefix, String uri) {
if (uri == null) {
return null;
}
if (!mapByUriPrefix.isEmpty()) {
String uriprefix = null;
for (Object o : mapByUriPrefix.keySet()) {
- String nextprefix = (String) o;
- if (uriprefix != null && nextprefix.length() < uriprefix.length()) {
- continue;
- }
- if (uri.startsWith(nextprefix)) {
- uriprefix = nextprefix;
+ if (o instanceof String) {
+ String nextprefix = (String) o;
+ if (uriprefix != null && nextprefix.length() < uriprefix.length()) {
+ continue;
+ }
+ if (uri.startsWith(nextprefix)) {
+ uriprefix = nextprefix;
+ }
}
}
if (uriprefix != null) {
- return (String) mapByUriPrefix.get(uriprefix);
+ return mapByUriPrefix.get(uriprefix);
}
}
return null;
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java?rev=1896802&r1=1896801&r2=1896802&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java Fri Jan 7 13:46:14 2022
@@ -93,7 +93,7 @@ public class TypeSystemHolder
public SchemaDocument[] getSchemaDocuments()
{
// recompute everything, should cache it and track changes
- Map<String, SchemaDocument> nsToSchemaDocs = new LinkedHashMap();
+ Map<String, SchemaDocument> nsToSchemaDocs = new LinkedHashMap<>();
for (Iterator<QName> iterator = _globalElements.keySet().iterator(); iterator.hasNext();)
{
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java?rev=1896802&r1=1896801&r2=1896802&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java Fri Jan 7 13:46:14 2022
@@ -35,11 +35,11 @@ public class SchemaRegularExpression ext
return new RegularExpression(s, "X");
}
- static final Map knownPatterns = buildKnownPatternMap();
+ static final Map<String, SchemaRegularExpression> knownPatterns = buildKnownPatternMap();
- private static Map buildKnownPatternMap()
+ private static Map<String, SchemaRegularExpression> buildKnownPatternMap()
{
- Map result = new HashMap();
+ Map<String, SchemaRegularExpression> result = new HashMap<>();
result.put("\\c+", new SchemaRegularExpression("\\c+")
{ public boolean matches(String s) { return XMLChar.isValidNmtoken(s); } } );
result.put("\\i\\c*", new SchemaRegularExpression("\\i\\c*")
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java?rev=1896802&r1=1896801&r2=1896802&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java Fri Jan 7 13:46:14 2022
@@ -27,20 +27,20 @@ import java.util.LinkedHashMap;
public class SchemaAttributeModelImpl implements SchemaAttributeModel
{
- private Map attrMap;
+ private Map<QName, SchemaLocalAttribute> attrMap;
private QNameSet wcSet;
private int wcProcess;
public SchemaAttributeModelImpl()
{
- attrMap = new LinkedHashMap();
+ attrMap = new LinkedHashMap<>();
wcSet = null;
wcProcess = NONE;
}
public SchemaAttributeModelImpl(SchemaAttributeModel sam)
{
- attrMap = new LinkedHashMap();
+ attrMap = new LinkedHashMap<>();
if (sam == null)
{
wcSet = null;
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java?rev=1896802&r1=1896801&r2=1896802&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java Fri Jan 7 13:46:14 2022
@@ -921,12 +921,12 @@ public class Jsr173 {
return prefix;
}
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<String> getPrefixes(String namespaceURI) {
checkChanged();
// BUGBUG - get only one for now ...
- HashMap map = new HashMap();
+ HashMap<String, String> map = new HashMap<>();
map.put(namespaceURI, getPrefix(namespaceURI));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org