mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

suppress warnings about inexact argument type

Browse Source
This commit is contained in:
Ivan Timofeev
2011-11-04 13:08:38 +04:00
parent 249df7bf9a
commit 504b384dd1
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wizards/com/sun/star/wizards/ui/event/DataAware.java
View File

@@ -291,15 +291,12 @@ public abstract class DataAware {
* @param obj the object which contains the property. * @param obj the object which contains the property.
* @return the get method reflection object. * @return the get method reflection object.
*/ */
private static Class[] EMPTY_ARRAY = new Class[0];
protected Method createGetMethod(String propName, Object obj) protected Method createGetMethod(String propName, Object obj)
{ {
Method m = null; Method m = null;
try try
{ //try to get a "get" method. { //try to get a "get" method.
m = obj.getClass().getMethod("get" + propName, (Class[]) null);
m = obj.getClass().getMethod("get" + propName, EMPTY_ARRAY);
} }
catch (NoSuchMethodException ex1) catch (NoSuchMethodException ex1)
{ {
@@ -307,13 +304,13 @@ public abstract class DataAware {
} }
return m; return m;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see com.sun.star.wizards.ui.event.DataAware.Value#get(java.lang.Object) * @see com.sun.star.wizards.ui.event.DataAware.Value#get(java.lang.Object)
*/ */
public Object get(Object target) { public Object get(Object target) {
try { try {
return getMethod.invoke(target, EMPTY_ARRAY); return getMethod.invoke(target, (Object[]) null);
} catch (IllegalAccessException ex1) { } catch (IllegalAccessException ex1) {
ex1.printStackTrace(); ex1.printStackTrace();
} catch (InvocationTargetException ex2) { } catch (InvocationTargetException ex2) {
@@ -329,7 +326,7 @@ public abstract class DataAware {
return new short[0]; return new short[0];
} }
return null; return null;
} }
protected Method createSetMethod(String propName, Object obj, Class paramClass) { protected Method createSetMethod(String propName, Object obj, Class paramClass) {

11
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
View File

@@ -42,10 +42,6 @@ import java.lang.reflect.Method;
*/ */
public class MethodInvocation public class MethodInvocation
{ {
static final Class[] EMPTY_ARRAY =
{
};
//the method to invoke. //the method to invoke.
Method mMethod; Method mMethod;
//the object to invoke the method on. //the object to invoke the method on.
@@ -66,7 +62,7 @@ public class MethodInvocation
public MethodInvocation(String methodName, Object obj, Class paramClass) throws NoSuchMethodException public MethodInvocation(String methodName, Object obj, Class paramClass) throws NoSuchMethodException
{ {
this(paramClass == null ? obj.getClass().getMethod(methodName, null) : obj.getClass().getMethod(methodName, new Class[] this(paramClass == null ? obj.getClass().getMethod(methodName, (Class[]) null) : obj.getClass().getMethod(methodName, new Class[]
{ {
paramClass paramClass
}), obj, paramClass); }), obj, paramClass);
@@ -86,12 +82,11 @@ public class MethodInvocation
{ {
if (mWithParam) if (mWithParam)
{ {
return mMethod.invoke(mObject, (Object) param return mMethod.invoke(mObject, (Object) param);
);
} }
else else
{ {
return mMethod.invoke(mObject, EMPTY_ARRAY); return mMethod.invoke(mObject, (Object[]) null);
} }
} }