[svn r269] removed some small bugs, for empty annotations collumns
This commit is contained in:
parent
8439348458
commit
b1f6e870a3
5 changed files with 41 additions and 9 deletions
|
|
@ -139,15 +139,19 @@ public class VascAnnotationParser {
|
|||
if(property==null) {
|
||||
Annotation anno = beanClass.getAnnotation(annotationType);
|
||||
if (anno==null) {
|
||||
return null; // no annotion avaible
|
||||
// no annotion avaible
|
||||
if (noAnnotationNullReturn) {
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
result = doAnnotation(anno);
|
||||
if(result!=null) {
|
||||
return result;
|
||||
}
|
||||
if (noAnnotationNullReturn) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
result = doAnnotation(anno);
|
||||
if(result!=null) {
|
||||
return result;
|
||||
}
|
||||
if (noAnnotationNullReturn) {
|
||||
return null;
|
||||
}
|
||||
return beanClass.getName()+"."+annotationType.getSimpleName();
|
||||
}
|
||||
|
||||
|
|
@ -188,6 +192,9 @@ public class VascAnnotationParser {
|
|||
}
|
||||
|
||||
private Object doAnnotation(Annotation b) {
|
||||
if (b==null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Class a = b.annotationType();
|
||||
if (a.equals(VascName.class)) {
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ public class DefaultVascTableController implements VascTableController {
|
|||
if (obj instanceof Integer) {
|
||||
c.setWidth((Integer)obj);
|
||||
}
|
||||
c.setWidth(100);
|
||||
// get KEY
|
||||
}
|
||||
if (c.getHelpId()==null) {
|
||||
|
|
|
|||
|
|
@ -121,8 +121,13 @@ public class SwingVascViewRenderer implements VascViewRenderer {
|
|||
public ImageIcon getImageIcon(String imageResource) {
|
||||
/// TODO hack beter
|
||||
String key = table.getVascTextValue().getTextValue(imageResource);
|
||||
//logger.info("KEY======================="+key);
|
||||
|
||||
return SwingImageHelper.getImageIcon(key);
|
||||
if (key.indexOf("META-INF")>0 | key.indexOf("resource")>0) {
|
||||
return SwingImageHelper.getImageIcon(key);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
class TextListener implements DocumentListener {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue