|
|
@ -6,8 +6,6 @@ package com.fr.design.designer.creator; |
|
|
|
import java.awt.Color; |
|
|
|
import java.awt.Color; |
|
|
|
import java.awt.Dimension; |
|
|
|
import java.awt.Dimension; |
|
|
|
import java.beans.IntrospectionException; |
|
|
|
import java.beans.IntrospectionException; |
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.swing.BorderFactory; |
|
|
|
import javax.swing.BorderFactory; |
|
|
|
import javax.swing.border.Border; |
|
|
|
import javax.swing.border.Border; |
|
|
@ -33,7 +31,7 @@ public abstract class XFieldEditor extends XWidgetCreator { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { |
|
|
|
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { |
|
|
|
return (CRPropertyDescriptor[]) ArrayUtils.addAll( |
|
|
|
return (CRPropertyDescriptor[]) ArrayUtils.addAll( |
|
|
|
super.supportedDescriptor(),getCRPropertyDescriptor() |
|
|
|
super.supportedDescriptor(), getCRPropertyDescriptor() |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -48,7 +46,7 @@ public abstract class XFieldEditor extends XWidgetCreator { |
|
|
|
.setI18NName(Inter.getLocText(new String[]{"FRFont", "FRFont-Size"})) |
|
|
|
.setI18NName(Inter.getLocText(new String[]{"FRFont", "FRFont-Size"})) |
|
|
|
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); |
|
|
|
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); |
|
|
|
return !((FieldEditor) toData()).isAllowBlank() ? |
|
|
|
return !((FieldEditor) toData()).isAllowBlank() ? |
|
|
|
new CRPropertyDescriptor[] {allowBlank, blankErrorMsg, fontSize} |
|
|
|
new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize} |
|
|
|
: new CRPropertyDescriptor[] {allowBlank, fontSize}; |
|
|
|
: new CRPropertyDescriptor[]{allowBlank, fontSize}; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |