You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/01/18 22:37:08 UTC
svn commit: r1851652 - in /xmlbeans/trunk/src:
common/org/apache/xmlbeans/impl/common/ResolverUtil.java
xmlpublic/org/apache/xmlbeans/XmlBeans.java
Author: kiwiwings
Date: Fri Jan 18 22:37:08 2019
New Revision: 1851652
URL: http://svn.apache.org/viewvc?rev=1851652&view=rev
Log:
A few cleanups
Modified:
xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
Modified: xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java?rev=1851652&r1=1851651&r2=1851652&view=diff
==============================================================================
--- xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java (original)
+++ xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java Fri Jan 18 22:37:08 2019
@@ -58,14 +58,14 @@ public class ResolverUtil
try
{
Class cmClass = Class.forName("org.apache.xml.resolver.CatalogManager");
- Constructor cstrCm = cmClass.getConstructor(new Class[] {});
- Object cmObj = cstrCm.newInstance(new Object[] {});
- Method cmMethod = cmClass.getMethod("setCatalogFiles", new Class[] {String.class});
- cmMethod.invoke(cmObj, new String[] {catalogFile});
+ Constructor cstrCm = cmClass.getConstructor();
+ Object cmObj = cstrCm.newInstance();
+ Method cmMethod = cmClass.getMethod("setCatalogFiles", String.class);
+ cmMethod.invoke(cmObj, catalogFile);
Class crClass = Class.forName("org.apache.xml.resolver.tools.CatalogResolver");
- Constructor cstrCr = crClass.getConstructor(new Class[] {cmClass});
- Object crObj = cstrCr.newInstance(new Object[] {cmObj});
+ Constructor cstrCr = crClass.getConstructor(cmClass);
+ Object crObj = cstrCr.newInstance(cmObj);
return (EntityResolver)crObj;
}
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java?rev=1851652&r1=1851651&r2=1851652&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java Fri Jan 18 22:37:08 2019
@@ -41,8 +41,7 @@ public final class XmlBeans
static
{
Package pkg = XmlBeans.class.getPackage();
- if (pkg != null)
- {
+ if (pkg != null && pkg.getImplementationVersion() != null) {
XMLBEANS_TITLE = pkg.getImplementationTitle();
XMLBEANS_VERSION = pkg.getImplementationVersion();
XMLBEANS_VENDOR = pkg.getImplementationVendor();
@@ -324,7 +323,7 @@ public final class XmlBeans
{
try
{
- return (SchemaTypeLoader)_getContextTypeLoaderMethod.invoke(null, null);
+ return (SchemaTypeLoader)_getContextTypeLoaderMethod.invoke(null);
}
catch (IllegalAccessException e)
{
@@ -347,7 +346,7 @@ public final class XmlBeans
{
try
{
- return (SchemaTypeSystem)_getBuiltinSchemaTypeSystemMethod.invoke(null, null);
+ return (SchemaTypeSystem)_getBuiltinSchemaTypeSystemMethod.invoke(null);
}
catch (IllegalAccessException e)
{
@@ -854,7 +853,7 @@ public final class XmlBeans
{
try
{
- return (SchemaType)_getNoTypeMethod.invoke(null, null);
+ return (SchemaType)_getNoTypeMethod.invoke(null);
}
catch (IllegalAccessException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org