Browse Source

Merging in latest from upstream (BA/design:refs/heads/dev)

* commit 'e3b3cabc60dd6f8c16c46a2eecb232a4253a598f':
  REPORT-1287 属性返回数组代码问题
master
daniel 8 years ago
parent
commit
6d663e290e
  1. 5
      designer_form/src/com/fr/design/designer/creator/XElementCase.java

5
designer_form/src/com/fr/design/designer/creator/XElementCase.java

@ -100,7 +100,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
.setI18NName(Inter.getLocText("Form-EC_toolbar"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
};
resolveCompatible(propertyTableEditor);
propertyTableEditor = resolveCompatible(propertyTableEditor);
FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING);
if (processor == null) {
return propertyTableEditor;
@ -122,7 +122,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
}
private void resolveCompatible (CRPropertyDescriptor[] propertyTableEditor) {
private CRPropertyDescriptor[] resolveCompatible (CRPropertyDescriptor[] propertyTableEditor) {
//这边有个插件兼容问题,之后还是要改回process才行
Set<FormElementCaseEditorProvider> set = ExtraDesignClassManager.getInstance().getArray(AbstractFormElementCaseEditorProvider.MARK_STRING);
for (FormElementCaseEditorProvider provider : set) {
@ -135,6 +135,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider);
propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
}
return propertyTableEditor;
}
@Override

Loading…
Cancel
Save