Browse Source

无JIRA任务,代码规范

master
plough 7 years ago
parent
commit
0ae57bbbec
  1. 30
      designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

30
designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

@ -245,7 +245,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
*/ */
private Component getExtraBodyTable(AbstractPropertyTable abstractPropertyTable) { private Component getExtraBodyTable(AbstractPropertyTable abstractPropertyTable) {
Widget selection = designer.getSelectionModel().getSelection().getSelectedCreator().toData(); Widget selection = designer.getSelectionModel().getSelection().getSelectedCreator().toData();
if (selection.getWidgetName().equals("body")) { if ("body".equals(selection.getWidgetName())) {
JPanel jPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel jPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
jPanel.add(abstractPropertyTable); jPanel.add(abstractPropertyTable);
MobileWidgetTable mobileWidgetTable = new MobileWidgetTable(designer); MobileWidgetTable mobileWidgetTable = new MobileWidgetTable(designer);
@ -294,7 +294,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
XLayoutContainer container = XCreatorUtils.getHotspotContainer(xCreator); XLayoutContainer container = XCreatorUtils.getHotspotContainer(xCreator);
boolean xCreatorAccept = xCreator.acceptType(XWParameterLayout.class); boolean xCreatorAccept = xCreator.acceptType(XWParameterLayout.class);
boolean containerAccept = container!=null && container.acceptType(XWParameterLayout.class); boolean containerAccept = container != null && container.acceptType(XWParameterLayout.class);
return xCreatorAccept || containerAccept; return xCreatorAccept || containerAccept;
} }
@ -332,7 +332,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED || evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED) { || evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED) {
formWidgetCardPane.populate(); formWidgetCardPane.populate();
}else if(evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED){ } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED){
// 防止多次触发 // 防止多次触发
if (lastAffectedCreator != null && lastAffectedCreator == evt.getAffectedCreator()) { if (lastAffectedCreator != null && lastAffectedCreator == evt.getAffectedCreator()) {
return; return;
@ -393,10 +393,18 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
* @param evt 事件 * @param evt 事件
*/ */
public void fireCreatorModified(DesignerEvent evt) { public void fireCreatorModified(DesignerEvent evt) {
if (evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED int[] validEventIds = {DesignerEvent.CREATOR_RESIZED, DesignerEvent.CREATOR_EDITED,
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_EDITED DesignerEvent.CREATOR_SELECTED, DesignerEvent.CREATOR_ADDED};
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED boolean isValid = false;
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_ADDED) { for (int validEventId : validEventIds) {
if (evt.getCreatorEventID() == validEventId) {
isValid = true;
break;
}
}
if (!isValid) {
return;
}
//fanglei:下面的注释不要删,只是暂时屏蔽 //fanglei:下面的注释不要删,只是暂时屏蔽
// int value = downPanel.getVerticalScrollBar().getValue(); // int value = downPanel.getVerticalScrollBar().getValue();
// if (hasSelectParaPane(getEditingFormDesigner())) { // if (hasSelectParaPane(getEditingFormDesigner())) {
@ -411,12 +419,12 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
// //控件列表选中某组件,触发表单中选中控件,选中事件又触发列表刷新,滚动条回到0 // //控件列表选中某组件,触发表单中选中控件,选中事件又触发列表刷新,滚动条回到0
// //此处设置滚动条值为刷新前 // //此处设置滚动条值为刷新前
// downPanel.getVerticalScrollBar().setValue(value); // downPanel.getVerticalScrollBar().setValue(value);
if (mobileExtraPropertyPanes != null) { if (mobileExtraPropertyPanes != null) {
for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) { for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {
extraPane.populate(designer); extraPane.populate(designer);
}
} }
} }
} }
@Override @Override

Loading…
Cancel
Save