You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2007/04/19 22:49:38 UTC
svn commit: r530540 - in /xmlbeans/trunk/src:
common/org/apache/xmlbeans/impl/common/NameUtil.java
xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Author: cezar
Date: Thu Apr 19 13:49:37 2007
New Revision: 530540
URL: http://svn.apache.org/viewvc?view=rev&rev=530540
Log:
Fix for:
https://issues.apache.org/jira/browse/XMLBEANS-191 XmlBeans does not respect reserved keyword 'strictfp' contributed by Jacob Danner.
https://issues.apache.org/jira/browse/XMLBEANS-205 using configuration file with extention interfaces restricted names of methods in interfaces with contribution from Denis Anisimov.
checkintest pass
Modified:
xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java
xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Modified: xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java?view=diff&rev=530540&r1=530539&r2=530540
==============================================================================
--- xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java (original)
+++ xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java Thu Apr 19 13:49:37 2007
@@ -76,6 +76,7 @@
"return",
"short",
"static",
+ "strictfp",
"super",
"switch",
"synchronized",
Modified: xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java?view=diff&rev=530540&r1=530539&r2=530540
==============================================================================
--- xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java (original)
+++ xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java Thu Apr 19 13:49:37 2007
@@ -276,7 +276,7 @@
// this is used only for detecting method colisions of extending interfaces
static class MethodSignatureImpl implements InterfaceExtension.MethodSignature
{
- private String _intfName; // Stored only for error output, does not influence the equals or hashCode
+ private String _intfName;
private final int NOTINITIALIZED = -1;
private int _hashCode = NOTINITIALIZED;
private String _signature;
@@ -336,10 +336,10 @@
public boolean equals(Object o)
{
- if ( !(o instanceof MethodSignature))
+ if ( !(o instanceof MethodSignatureImpl))
return false;
- MethodSignature ms = (MethodSignature)o;
+ MethodSignatureImpl ms = (MethodSignatureImpl)o;
if (!ms.getName().equals(getName()) )
return false;
@@ -356,6 +356,9 @@
return false;
}
+ if (!_intfName.equals(ms._intfName))
+ return false;
+
return true;
}
@@ -373,6 +376,8 @@
hash *= 19;
hash += params[i].hashCode();
}
+
+ hash += 21 * _intfName.hashCode();
_hashCode = hash;
return _hashCode;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org