From b610efc4a3d4c0555a10fa8624160a7474264908 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 6 Sep 2017 14:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PMD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/creator/XCreator.java | 10 +- .../design/designer/creator/XDateEditor.java | 233 +++++++++--------- .../widget/ui/FormWidgetCardPane.java | 18 +- .../parameter/RootDesignDefinePane.java | 2 +- .../widget/ui/designer/LabelDefinePane.java | 2 +- 5 files changed, 125 insertions(+), 140 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XCreator.java b/designer_form/src/com/fr/design/designer/creator/XCreator.java index c4e11180a4..87f3e532e2 100644 --- a/designer_form/src/com/fr/design/designer/creator/XCreator.java +++ b/designer_form/src/com/fr/design/designer/creator/XCreator.java @@ -227,7 +227,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo } protected String getIconName() { - return ""; + return StringUtils.EMPTY; } public String getIconPath() { @@ -472,11 +472,9 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo selectionModel.selectACreatorAtMouseEvent(e); } - if (editingMouseListener.stopEditing()) { - if (this != designer.getRootComponent()) { - ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this); - editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter); - } + if (editingMouseListener.stopEditing() && this != designer.getRootComponent()) { + ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this); + editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter); } } diff --git a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java index a39fdb9344..42e8e031d6 100644 --- a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java +++ b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java @@ -31,94 +31,95 @@ import com.fr.stable.core.PropertyChangeAdapter; * @since 6.5.3 */ public class XDateEditor extends XDirectWriteEditor { - - private UITextField textField; - private LimpidButton btn; + + private UITextField textField; + private LimpidButton btn; public XDateEditor(DateEditor widget, Dimension initSize) { super(widget, initSize); } - + /** * 控件的属性列表 + * * @return 此控件所用的属性列表 * @throws IntrospectionException 异常 */ @Override - public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - CRPropertyDescriptor [] tempt=(CRPropertyDescriptor[]) ArrayUtils.addAll( - new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced").setPropertyChangeListener(new PropertyChangeAdapter() { - - @Override - public void propertyChange() { - initFieldText(); - } - })},super.supportedDescriptor()); - return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt, - new CRPropertyDescriptor[] { - new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass( - DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced").setEditorClass(DateRangeEditor.class), - new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced").setEditorClass(DateRangeEditor.class), - new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced"), - new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced") - }); - } - + public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { + CRPropertyDescriptor[] tempt = (CRPropertyDescriptor[]) ArrayUtils.addAll( + new CRPropertyDescriptor[]{ + new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( + Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass( + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Advanced").setPropertyChangeListener(new PropertyChangeAdapter() { + + @Override + public void propertyChange() { + initFieldText(); + } + })}, super.supportedDescriptor()); + return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt, + new CRPropertyDescriptor[]{ + new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName( + Inter.getLocText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass( + DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName( + Inter.getLocText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Advanced").setEditorClass(DateRangeEditor.class), + new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName( + Inter.getLocText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Advanced").setEditorClass(DateRangeEditor.class), + new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( + Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Advanced"), + new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName( + Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Advanced") + }); + } + protected Class formatClass() { - return DateFormatEditor.class; + return DateFormatEditor.class; + } + + private void initFieldText() { + DateEditor dateEditor = (DateEditor) data; + if (dateEditor.getWidgetValue() != null) { + WidgetValue widgetValue = dateEditor.getWidgetValue(); + //控件值.toString + String valueStr = widgetValue.toString(); + //控件值 + Object value = widgetValue.getValue(); + //格式 + String format = dateEditor.getFormatText(); + + if (value instanceof Date) { + valueStr = DateUtils.getDate2Str(format, (Date) value); + } + + //日期控件默认值 + if (StringUtils.isEmpty(valueStr)) { + valueStr = DateUtils.getDate2Str(format, new Date()); + dateEditor.setWidgetValue(new WidgetValue(new Date())); + } + + textField.setText(valueStr); + } + } + + @Override + protected void initXCreatorProperties() { + super.initXCreatorProperties(); + initFieldText(); } - - private void initFieldText() { - DateEditor dateEditor = (DateEditor) data; - if (dateEditor.getWidgetValue() != null) { - WidgetValue widgetValue = dateEditor.getWidgetValue(); - //控件值.toString - String valueStr = widgetValue.toString(); - //控件值 - Object value = widgetValue.getValue(); - //格式 - String format = dateEditor.getFormatText(); - - if(value instanceof Date){ - valueStr = DateUtils.getDate2Str(format, (Date) value); - } - - //日期控件默认值 - if(StringUtils.isEmpty(valueStr)){ - valueStr = DateUtils.getDate2Str(format, new Date()); - dateEditor.setWidgetValue(new WidgetValue(new Date())); - } - - textField.setText(valueStr); - } - } - - @Override - protected void initXCreatorProperties() { - super.initXCreatorProperties(); - initFieldText(); - } @Override protected JComponent initEditor() { if (editor == null) { editor = FRGUIPaneFactory.createBorderLayout_S_Pane(); editor.add(textField = new UITextField(5), BorderLayout.CENTER); - btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY); + btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY); btn.setPreferredSize(new Dimension(21, 21)); editor.add(btn, BorderLayout.EAST); textField.setOpaque(false); @@ -132,54 +133,46 @@ public class XDateEditor extends XDirectWriteEditor { return "date_16.png"; } - protected void makeVisible(boolean visible) { - btn.makeVisible(visible); - } - - /** - * 获取当前XCreator的一个封装父容器 - * - * @param widgetName 当前组件名 - * - * @return 封装的父容器 - * - * - * @date 2014-11-25-下午4:47:23 - * - */ - protected XLayoutContainer getCreatorWrapper(String widgetName){ - return new XWScaleLayout(); - } - - /** - * 将当前对象添加到父容器中 - * - * @param parentPanel 父容器组件 - * - * - * @date 2014-11-25-下午4:57:55 - * - */ - protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight){ - this.setSize(width, minHeight); - parentPanel.add(this); - } - - /** - * 此控件在自适应布局要保持原样高度 - * - * @return 是则返回true - */ - @Override - public boolean shouldScaleCreator() { - return true; - } - - /** - * data属性改变触发其他操作 - * - */ - public void firePropertyChange(){ - initFieldText(); - } + protected void makeVisible(boolean visible) { + btn.makeVisible(visible); + } + + /** + * 获取当前XCreator的一个封装父容器 + * + * @param widgetName 当前组件名 + * @return 封装的父容器 + * @date 2014-11-25-下午4:47:23 + */ + protected XLayoutContainer getCreatorWrapper(String widgetName) { + return new XWScaleLayout(); + } + + /** + * 将当前对象添加到父容器中 + * + * @param parentPanel 父容器组件 + * @date 2014-11-25-下午4:57:55 + */ + protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) { + this.setSize(width, minHeight); + parentPanel.add(this); + } + + /** + * 此控件在自适应布局要保持原样高度 + * + * @return 是则返回true + */ + @Override + public boolean shouldScaleCreator() { + return true; + } + + /** + * data属性改变触发其他操作 + */ + public void firePropertyChange() { + initFieldText(); + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 95e09ec25c..408165e3b2 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -20,6 +20,7 @@ import com.fr.form.ui.container.WScaleLayout; import com.fr.form.ui.container.WTitleLayout; import com.fr.form.ui.widget.CRBoundsWidget; import com.fr.general.Inter; +import com.fr.stable.StringUtils; import javax.swing.*; import java.awt.*; @@ -149,19 +150,12 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { private void initDefinePane() { currentEditorDefinePane = null; - XCreator creator = xCreator; - if (xCreator.acceptType(XWScaleLayout.class)) { - if (xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator()) { - creator = (XCreator) xCreator.getComponent(0); - } - } - if(xCreator.acceptType(XWTitleLayout.class)){ - creator = (XCreator) xCreator.getComponent(0); - } + boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class); + XCreator creator = dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator; FormWidgetDefinePaneFactoryBase.RN rn = FormWidgetDefinePaneFactoryBase.createWidgetDefinePane(creator, creator.toData(), new Operator() { @Override public void did(DataCreatorUI ui, String cardName) { - + //todo } }); DataModify definePane = rn.getDefinePane(); @@ -189,7 +183,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { if (cellWidget.acceptType(WScaleLayout.class)) { Widget crBoundsWidget = ((WScaleLayout) cellWidget).getBoundsWidget(); innerWidget = ((CRBoundsWidget) crBoundsWidget).getWidget(); - } else if(cellWidget.acceptType(WTitleLayout.class)){ + } else if (cellWidget.acceptType(WTitleLayout.class)) { CRBoundsWidget crBoundsWidget = ((WTitleLayout) cellWidget).getBodyBoundsWidget(); innerWidget = crBoundsWidget.getWidget(); } @@ -227,7 +221,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } public String getIconPath() { - return ""; + return StringUtils.EMPTY; } diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java index 250a7e5c56..71012c8797 100644 --- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java @@ -51,7 +51,7 @@ public class RootDesignDefinePane extends AbstractDataModify { UIExpandablePane advanceExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, advancePane); this.add(advanceExpandablePane, BorderLayout.NORTH); JPanel layoutPane = createBoundsPane(); - UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("Size"), 280, 20, layoutPane); + UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Size"), 280, 20, layoutPane); this.add(layoutExpandablePane, BorderLayout.CENTER); } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java index 56393bcb42..cb988f24f9 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -95,7 +95,7 @@ public class LabelDefinePane extends AbstractDataModify