natField.cc (getBoolean): Use getType().
* java/lang/reflect/natField.cc (getBoolean): Use getType(). (getByte): Likewise. (getShort): Likewise. (getInt): Likewise. (getLong): Likewise. (getFloat): Likewise. (getDouble): Likewise. (get): Likewise. (setChar): Likewise. (setByte): Likewise. (setShort): Likewise. (setInt): Likewise. (setLong): Likewise. (setFloat): Likewise. (setDouble): Likewise. From-SVN: r58899
This commit is contained in:
parent
74c1330854
commit
396a80436c
|
@ -1,3 +1,21 @@
|
||||||
|
2002-11-07 Mark Wielaard <mark@klomp.org>
|
||||||
|
|
||||||
|
* java/lang/reflect/natField.cc (getBoolean): Use getType().
|
||||||
|
(getByte): Likewise.
|
||||||
|
(getShort): Likewise.
|
||||||
|
(getInt): Likewise.
|
||||||
|
(getLong): Likewise.
|
||||||
|
(getFloat): Likewise.
|
||||||
|
(getDouble): Likewise.
|
||||||
|
(get): Likewise.
|
||||||
|
(setChar): Likewise.
|
||||||
|
(setByte): Likewise.
|
||||||
|
(setShort): Likewise.
|
||||||
|
(setInt): Likewise.
|
||||||
|
(setLong): Likewise.
|
||||||
|
(setFloat): Likewise.
|
||||||
|
(setDouble): Likewise.
|
||||||
|
|
||||||
2002-11-07 Michael Koch <konqueror@gmx.de>
|
2002-11-07 Michael Koch <konqueror@gmx.de>
|
||||||
|
|
||||||
* java/awt/Choice.java,
|
* java/awt/Choice.java,
|
||||||
|
|
|
@ -168,81 +168,73 @@ getDouble (jclass cls, void* addr)
|
||||||
jboolean
|
jboolean
|
||||||
java::lang::reflect::Field::getBoolean (jclass caller, jobject obj)
|
java::lang::reflect::Field::getBoolean (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getBoolean (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getBoolean (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jchar
|
jchar
|
||||||
java::lang::reflect::Field::getChar (jclass caller, jobject obj)
|
java::lang::reflect::Field::getChar (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getChar (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getChar (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jbyte
|
jbyte
|
||||||
java::lang::reflect::Field::getByte (jclass caller, jobject obj)
|
java::lang::reflect::Field::getByte (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getByte (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getByte (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jshort
|
jshort
|
||||||
java::lang::reflect::Field::getShort (jclass caller, jobject obj)
|
java::lang::reflect::Field::getShort (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getShort (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getShort (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jint
|
jint
|
||||||
java::lang::reflect::Field::getInt (jclass caller, jobject obj)
|
java::lang::reflect::Field::getInt (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getInt (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getInt (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jlong
|
jlong
|
||||||
java::lang::reflect::Field::getLong (jclass caller, jobject obj)
|
java::lang::reflect::Field::getLong (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getLong (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getLong (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jfloat
|
jfloat
|
||||||
java::lang::reflect::Field::getFloat (jclass caller, jobject obj)
|
java::lang::reflect::Field::getFloat (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getFloat (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getFloat (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jdouble
|
jdouble
|
||||||
java::lang::reflect::Field::getDouble (jclass caller, jobject obj)
|
java::lang::reflect::Field::getDouble (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
return ::getDouble (this->getType(), getAddr (this, caller, obj));
|
||||||
return ::getDouble (fld->type, getAddr (this, caller, obj));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
jobject
|
jobject
|
||||||
java::lang::reflect::Field::get (jclass caller, jobject obj)
|
java::lang::reflect::Field::get (jclass caller, jobject obj)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
jclass type = this->getType();
|
||||||
void* addr = getAddr (this, caller, obj);
|
void* addr = getAddr (this, caller, obj);
|
||||||
if (! fld->type->isPrimitive ())
|
if (! type->isPrimitive ())
|
||||||
return * (jobject*) addr;
|
return * (jobject*) addr;
|
||||||
if (fld->type == JvPrimClass (double))
|
if (type == JvPrimClass (double))
|
||||||
return new java::lang::Double (* (jdouble*) addr);
|
return new java::lang::Double (* (jdouble*) addr);
|
||||||
if (fld->type == JvPrimClass (float))
|
if (type == JvPrimClass (float))
|
||||||
return new java::lang::Float (* (jfloat*) addr);
|
return new java::lang::Float (* (jfloat*) addr);
|
||||||
if (fld->type == JvPrimClass (long))
|
if (type == JvPrimClass (long))
|
||||||
return new java::lang::Long (* (jlong*) addr);
|
return new java::lang::Long (* (jlong*) addr);
|
||||||
if (fld->type == JvPrimClass (int))
|
if (type == JvPrimClass (int))
|
||||||
return new java::lang::Integer (* (jint*) addr);
|
return new java::lang::Integer (* (jint*) addr);
|
||||||
if (fld->type == JvPrimClass (short))
|
if (type == JvPrimClass (short))
|
||||||
return new java::lang::Short (* (jshort*) addr);
|
return new java::lang::Short (* (jshort*) addr);
|
||||||
if (fld->type == JvPrimClass (byte))
|
if (type == JvPrimClass (byte))
|
||||||
return new java::lang::Byte (* (jbyte*) addr);
|
return new java::lang::Byte (* (jbyte*) addr);
|
||||||
if (fld->type == JvPrimClass (char))
|
if (type == JvPrimClass (char))
|
||||||
return new java::lang::Character (* (jchar*) addr);
|
return new java::lang::Character (* (jchar*) addr);
|
||||||
if (fld->type == JvPrimClass (boolean))
|
if (type == JvPrimClass (boolean))
|
||||||
{
|
{
|
||||||
_Jv_InitClass (&java::lang::Boolean::class$);
|
_Jv_InitClass (&java::lang::Boolean::class$);
|
||||||
if (* (jboolean*) addr)
|
if (* (jboolean*) addr)
|
||||||
|
@ -376,56 +368,48 @@ setDouble (jclass type, void *addr, jdouble value)
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setBoolean (jclass caller, jobject obj, jboolean b)
|
java::lang::reflect::Field::setBoolean (jclass caller, jobject obj, jboolean b)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setBoolean (this->getType(), setAddr (this, caller, obj), b);
|
||||||
::setBoolean (fld->type, setAddr (this, caller, obj), b);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setChar (jclass caller, jobject obj, jchar c)
|
java::lang::reflect::Field::setChar (jclass caller, jobject obj, jchar c)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setChar (this->getType(), setAddr (this, caller, obj), c);
|
||||||
::setChar (fld->type, setAddr (this, caller, obj), c);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setByte (jclass caller, jobject obj, jbyte b)
|
java::lang::reflect::Field::setByte (jclass caller, jobject obj, jbyte b)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setByte (this->getType(), setAddr (this, caller, obj), b);
|
||||||
::setByte (fld->type, setAddr (this, caller, obj), b);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setShort (jclass caller, jobject obj, jshort s)
|
java::lang::reflect::Field::setShort (jclass caller, jobject obj, jshort s)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setShort (this->getType(), setAddr (this, caller, obj), s);
|
||||||
::setShort (fld->type, setAddr (this, caller, obj), s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setInt (jclass caller, jobject obj, jint i)
|
java::lang::reflect::Field::setInt (jclass caller, jobject obj, jint i)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setInt (this->getType(), setAddr (this, caller, obj), i);
|
||||||
::setInt (fld->type, setAddr (this, caller, obj), i);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setLong (jclass caller, jobject obj, jlong l)
|
java::lang::reflect::Field::setLong (jclass caller, jobject obj, jlong l)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setLong (this->getType(), setAddr (this, caller, obj), l);
|
||||||
::setLong (fld->type, setAddr (this, caller, obj), l);
|
|
||||||
}
|
}
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setFloat (jclass caller, jobject obj, jfloat f)
|
java::lang::reflect::Field::setFloat (jclass caller, jobject obj, jfloat f)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setFloat (this->getType(), setAddr (this, caller, obj), f);
|
||||||
::setFloat (fld->type, setAddr (this, caller, obj), f);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
java::lang::reflect::Field::setDouble (jclass caller, jobject obj, jdouble d)
|
java::lang::reflect::Field::setDouble (jclass caller, jobject obj, jdouble d)
|
||||||
{
|
{
|
||||||
jfieldID fld = _Jv_FromReflectedField (this);
|
::setDouble (this->getType(), setAddr (this, caller, obj), d);
|
||||||
::setDouble (fld->type, setAddr (this, caller, obj), d);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue