[svn r250] fixed annotations , added fff , added more images properties
This commit is contained in:
parent
d88cb26330
commit
1c47fbffa3
12 changed files with 106 additions and 81 deletions
|
|
@ -175,31 +175,32 @@ public class VascAnnotationParser {
|
|||
return beanClass.getName()+"."+property+"."+annotationType.getSimpleName();
|
||||
}
|
||||
|
||||
private Object doAnnotation(Annotation a) {
|
||||
private Object doAnnotation(Annotation b) {
|
||||
|
||||
Class a = b.annotationType();
|
||||
if (a.equals(VascName.class)) {
|
||||
VascName l = (VascName)a;
|
||||
VascName l = (VascName)b;
|
||||
if("".equals(l.key()) | "null".equals(l.key())) {
|
||||
return null;
|
||||
}
|
||||
return l.key();
|
||||
}
|
||||
if (a.equals(VascToolTip.class)) {
|
||||
VascToolTip t = (VascToolTip)a;
|
||||
VascToolTip t = (VascToolTip)b;
|
||||
if("".equals(t.key()) | "null".equals(t.key())) {
|
||||
return null;
|
||||
}
|
||||
return t.key();
|
||||
}
|
||||
if (a.equals(VascHelpId.class)) {
|
||||
VascHelpId h = (VascHelpId)a;
|
||||
VascHelpId h = (VascHelpId)b;
|
||||
if("".equals(h.helpId()) | "null".equals(h.helpId())) {
|
||||
return null;
|
||||
}
|
||||
return h.helpId();
|
||||
}
|
||||
if (a.equals(VascDefaultValue.class)) {
|
||||
VascDefaultValue v = (VascDefaultValue)a;
|
||||
VascDefaultValue v = (VascDefaultValue)b;
|
||||
if (v.defaultValue()==null) {
|
||||
return null; // error ??
|
||||
}
|
||||
|
|
@ -210,7 +211,7 @@ public class VascAnnotationParser {
|
|||
}
|
||||
}
|
||||
if (a.equals(VascColumnWidth.class)) {
|
||||
VascColumnWidth c = (VascColumnWidth)a;
|
||||
VascColumnWidth c = (VascColumnWidth)b;
|
||||
return c.width();
|
||||
}
|
||||
return null;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue