From 16251de0cbaf54d190c91d4cdd97ebf0ca7db391 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Thu, 9 Nov 2017 13:41:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-5473=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8=E9=80=89=E4=B8=AD=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=B2=98=E8=B4=B4=E5=88=B0=E5=8F=A6?= =?UTF-8?q?=E5=A4=96=E4=B8=80=E5=BC=A0=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E5=88=87=E6=8D=A2=E5=9B=9E=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/ui/FormWidgetCardPane.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) 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 07a1fe033..963caf8a3 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 @@ -2,7 +2,14 @@ package com.fr.design.mainframe.widget.ui; import com.fr.design.data.DataCreatorUI; import com.fr.design.designer.beans.events.DesignerEvent; -import com.fr.design.designer.creator.*; +import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XCreatorUtils; +import com.fr.design.designer.creator.XLayoutContainer; +import com.fr.design.designer.creator.XWAbsoluteLayout; +import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.creator.XWParameterLayout; +import com.fr.design.designer.creator.XWScaleLayout; +import com.fr.design.designer.creator.XWTitleLayout; import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.BasicScrollPane; import com.fr.design.foldablepane.UIExpandablePane; @@ -11,8 +18,8 @@ import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.FormDesigner; import com.fr.design.widget.DataModify; -import com.fr.design.widget.Operator; import com.fr.design.widget.FormWidgetDefinePaneFactoryBase; +import com.fr.design.widget.Operator; import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane; import com.fr.design.widget.ui.designer.component.WidgetBoundPane; import com.fr.form.ui.Widget; @@ -79,14 +86,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } public XCreator findXcreator(FormDesigner designer) { - int size = designer.getSelectionModel().getSelection().size(); - if (size == 0 || size == 1) { - XCreator creator = size == 0 ? designer.getRootComponent() : designer.getSelectionModel().getSelection() - .getSelectedCreator(); - return creator; - } else { - return null; - } + XCreator creator = designer.getSelectionModel().getSelection().getSelectedCreator(); + return creator != null ? creator : designer.getRootComponent(); } /** @@ -128,7 +129,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { this.listener = new AttributeChangeListener() { @Override public void attributeChange() { - if(!isExtraWidget){ + if (!isExtraWidget) { updateCreator(); } updateWidgetBound(); @@ -136,7 +137,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } }; - if(isExtraWidget){ + if (isExtraWidget) { return; } @@ -191,7 +192,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { innerWidget = crBoundsWidget.getWidget(); } currentEditorDefinePane.populateBean(innerWidget); - if(widgetPropertyPane != null){ + if (widgetPropertyPane != null) { widgetPropertyPane.populate(innerWidget); } reinitAllListeners(); @@ -212,7 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { fireValueChanged(); } - public void updateWidgetBound (){ + public void updateWidgetBound() { if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) { widgetBoundPane.update(); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED); From d911f0be0405330c89c1a4deec3a6e1923d4c163 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 9 Nov 2017 16:57:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?RES-32=20=E5=85=AC=E6=9C=89=E4=BA=91?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E6=94=AF=E6=8C=81=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=82=B9=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E5=B1=82=E7=9B=B4=E6=8E=A5=E7=94=A8=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E7=9B=91=E5=90=AC=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/errorinfo/ErrorInfoUploader.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java index 40e870047..1ab7e44de 100644 --- a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java +++ b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java @@ -35,7 +35,6 @@ public class ErrorInfoUploader { public static final String FOLDER_NAME = "errorInfo"; private static ErrorInfoUploader collector; - private static boolean licSupport = true; // 在一台不能上网的电脑里发现了10w个errorinfo... private static final int MAX_ERROR_SIZE = 2000; @@ -51,17 +50,7 @@ public class ErrorInfoUploader { }); } }); - - // 这个控制没啥意义, 主要在于宣传功能. - licSupport = VT4FR.AlphaFine.support(); - FRCoreContext.listenerLicense(new LicenseListener() { - - @Override - public void onChange() { - - licSupport = VT4FR.AlphaFine.support(); - } - }); + } private ErrorInfoUploader() { @@ -83,7 +72,8 @@ public class ErrorInfoUploader { // 从云中心更新最新的解决方案文件 private void checkUpdateSolution(){ - if (!licSupport) { + + if (!VT4FR.AlphaFine.support()) { return; }