ff-attic/imxmi
2
Fork 0
Code Activity

[svn r297] some hack work to enable some features and removed all compiler warnings

Browse source
This commit is contained in:
willemc 2007-11-26 00:01:25 +01:00
parent 1e74f3c039
commit 6a2813f43d
20 changed files with 829 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/com/idcanet/vasc/annotations/VascAnnotationParser.java
View file

@ -62,11 +62,11 @@ public class VascAnnotationParser {
* @param property The property for the ToolTip
* @return The i18n key for an ToolTip
*/
public String getVascToolTipKey(Class beanClass,String property) {
public String getVascToolTipKey(Class<?> beanClass,String property) {
return (String)getValue(beanClass,VascToolTip.class,property);
}
public String getVascToolTipKey(Class beanClass) {
public String getVascToolTipKey(Class<?> beanClass) {
return (String)getValue(beanClass,VascToolTip.class,null);
}
@ -76,44 +76,44 @@ public class VascAnnotationParser {
* @param property The property for the Labe
* @return The i18n key for an Label
*/
public String getVascNameKey(Class beanClass,String property) {
public String getVascNameKey(Class<?> beanClass,String property) {
return (String)getValue(beanClass,VascName.class,property);
}
public String getVascNameKey(Class beanClass) {
public String getVascNameKey(Class<?> beanClass) {
return (String)getValue(beanClass,VascName.class,null);
}
public Object getVascColumnWidth(Class beanClass,String property) {
public Object getVascColumnWidth(Class<?> beanClass,String property) {
return getValue(beanClass,VascColumnWidth.class,property);
}
public Object getVascColumnWidth(Class beanClass) {
public Object getVascColumnWidth(Class<?> beanClass) {
return getValue(beanClass,VascColumnWidth.class,null);
}
public String getVascHelpId(Class beanClass,String property) {
public String getVascHelpId(Class<?> beanClass,String property) {
return (String)getValue(beanClass,VascHelpId.class,property);
}
public String getVascHelpId(Class beanClass) {
public String getVascHelpId(Class<?> beanClass) {
return (String)getValue(beanClass,VascHelpId.class,null);
}
public Object getVascDefaultValue(Class beanClass,String property) {
public Object getVascDefaultValue(Class<?> beanClass,String property) {
return getValue(beanClass,VascDefaultValue.class,property);
}
public Object getVascDefaultValue(Class beanClass) {
public Object getVascDefaultValue(Class<?> beanClass) {
return getValue(beanClass,VascDefaultValue.class,null);
}
public String getVascImage(Class beanClass,String property) {
public String getVascImage(Class<?> beanClass,String property) {
return (String)getValue(beanClass,VascImage.class,property);
}
public String getVascImage(Class beanClass) {
public String getVascImage(Class<?> beanClass) {
return (String)getValue(beanClass,VascImage.class,null);
}
@ -127,7 +127,8 @@ public class VascAnnotationParser {
* @param annotationType
* @return
*/
private Object getValue(Class beanClass,Class annotationType,String property) {
@SuppressWarnings("unchecked")
private Object getValue(Class<?> beanClass,Class annotationType,String property) {
if(beanClass==null) { throw new NullPointerException("beanClass may not be null"); }
if(annotationType==null){ throw new NullPointerException("annotationType may not be null"); }
@ -202,7 +203,7 @@ public class VascAnnotationParser {
return null;
}
Class a = b.annotationType();
Class<?> a = b.annotationType();
if (a.equals(VascName.class)) {
VascName l = (VascName)b;
if("".equals(l.key()) | "null".equals(l.key())) {

2
src/com/idcanet/vasc/annotations/VascDefaultValue.java
View file

@ -45,7 +45,7 @@ public @interface VascDefaultValue {
/**
* The defaultValue of the method
*/
Class defaultValueClass() default Object.class;
Class<?> defaultValueClass() default Object.class;
String defaultValue() default "null";
}

2
src/com/idcanet/vasc/annotations/VascModelReference.java
View file

@ -42,5 +42,5 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
public @interface VascModelReference {
Class type() default Object.class;
Class<?> type() default Object.class;
}