From c2fa176e0a57bff1b7768fd09a8787d74b0197ec Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 9 Mar 2020 14:43:20 +0800 Subject: [PATCH 1/9] =?UTF-8?q?CHART-9435=20=E4=BF=AE=E6=94=B9=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E7=9B=98=E9=BB=98=E8=AE=A4=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/ibutton/UIColorButtonWithAuto.java | 9 +++++++++ .../chart/gui/style/ChartTextAttrPaneWithAuto.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java index c883148ca..814d2aa29 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java @@ -6,10 +6,19 @@ import com.fr.design.style.color.ColorControlWindow; import com.fr.design.style.color.ColorControlWindowWithAuto; import com.fr.general.ComparatorUtils; +import javax.swing.Icon; import java.awt.Color; public class UIColorButtonWithAuto extends UIColorButton { + public UIColorButtonWithAuto() { + super(); + } + + public UIColorButtonWithAuto(Icon autoFontIcon) { + super(autoFontIcon); + } + protected void checkColorChange(Color oldColor, Color newColor) { if (ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && !ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) { setIcon(UIConstants.FONT_ICON); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java index 70fdf903e..66e19d970 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.chart.gui.style; import com.fr.chart.base.ChartConstants; +import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIColorButtonWithAuto; import com.fr.design.i18n.Toolkit; @@ -35,7 +36,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { } protected void initFontColorState() { - setFontColor(isColorAuto ? new UIColorButtonWithAuto() : new UIColorButton()); + setFontColor(isColorAuto ? new UIColorButtonWithAuto(UIConstants.AUTO_FONT_ICON) : new UIColorButton(UIConstants.FONT_ICON)); } protected Object[] getFontSizeComboBoxModel() { From f23feb842df1a93d265ac980be99805b537b3d3d Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 9 Mar 2020 15:16:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/ibutton/UIColorButtonWithAuto.java | 11 +---------- .../chart/gui/style/ChartTextAttrPaneWithAuto.java | 5 ++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java index 814d2aa29..a7dcad008 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java @@ -6,19 +6,10 @@ import com.fr.design.style.color.ColorControlWindow; import com.fr.design.style.color.ColorControlWindowWithAuto; import com.fr.general.ComparatorUtils; -import javax.swing.Icon; import java.awt.Color; public class UIColorButtonWithAuto extends UIColorButton { - public UIColorButtonWithAuto() { - super(); - } - - public UIColorButtonWithAuto(Icon autoFontIcon) { - super(autoFontIcon); - } - protected void checkColorChange(Color oldColor, Color newColor) { if (ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && !ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) { setIcon(UIConstants.FONT_ICON); @@ -44,4 +35,4 @@ public class UIColorButtonWithAuto extends UIColorButton { return getPopupWin(); } -} +} \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java index 66e19d970..26f011af4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java @@ -1,7 +1,6 @@ package com.fr.design.mainframe.chart.gui.style; import com.fr.chart.base.ChartConstants; -import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIColorButtonWithAuto; import com.fr.design.i18n.Toolkit; @@ -36,7 +35,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { } protected void initFontColorState() { - setFontColor(isColorAuto ? new UIColorButtonWithAuto(UIConstants.AUTO_FONT_ICON) : new UIColorButton(UIConstants.FONT_ICON)); + setFontColor(isColorAuto ? new UIColorButtonWithAuto() : new UIColorButton()); } protected Object[] getFontSizeComboBoxModel() { @@ -64,4 +63,4 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { getFontSizeComboBox().setSelectedItem(frFont.getSize()); } } -} +} \ No newline at end of file From 048c406c48fadef32ea9b02a72252bbac47d9832 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 9 Mar 2020 17:01:06 +0800 Subject: [PATCH 3/9] =?UTF-8?q?CHART-9435=20=E5=A4=9A=E6=8C=87=E9=92=88?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=9D=90=E6=A0=87=E8=BD=B4=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E5=A4=A7=E5=B0=8F=E8=87=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java index 55622a85b..3ec313aab 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java @@ -101,7 +101,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { protected ChartTextAttrPane getChartTextAttrPane() { if (isMulti(gaugeStyle)) { - return new ChartTextAttrPaneWithAuto(false, true); + return new ChartTextAttrPaneWithAuto(true, true); } else { return new ChartTextAttrPane(); } From b5575698bc8a42daf42fe5f139af8741eec0fb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 9 Mar 2020 17:30:48 +0800 Subject: [PATCH 4/9] =?UTF-8?q?CHART-12933=20=E5=8C=B9=E9=85=8D=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=8C=BA=E5=88=86=E7=82=B9=E5=9C=B0=E5=9B=BE=E5=92=8C?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java | 2 +- .../data/contentpane/table/VanMapTableDataContentPane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java index e445a07ef..1b6c6f9be 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java @@ -63,7 +63,7 @@ public abstract class MapDataSetFieldsPane Date: Mon, 9 Mar 2020 18:22:46 +0800 Subject: [PATCH 5/9] =?UTF-8?q?CHART-9435=20=E4=BD=BF=E7=94=A8=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB=E5=9E=8B=E6=9D=A5=E5=88=A4=E6=96=AD=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E8=87=AA=E5=8A=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/style/ChartTextAttrPaneWithAuto.java | 32 ++++++++++++++----- .../gauge/VanChartGaugeDetailAxisPane.java | 3 +- .../label/VanChartGaugeLabelDetailPane.java | 17 +++++++++- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java index 26f011af4..4cb9f7373 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java @@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants; import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIColorButtonWithAuto; import com.fr.design.i18n.Toolkit; +import com.fr.plugin.chart.type.FontAutoType; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; import com.fr.general.GeneralUtils; @@ -22,18 +23,33 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { } } - public ChartTextAttrPaneWithAuto() { - super(); - } - - public ChartTextAttrPaneWithAuto(boolean isFontSizeAuto, boolean isColorAuto) { - this.isFontSizeAuto = isFontSizeAuto; - this.isColorAuto = isColorAuto; - + public ChartTextAttrPaneWithAuto(FontAutoType type) { + initAutoType(type); initState(); initComponents(); } + private void initAutoType(FontAutoType type) { + switch (type) { + case NONE: + this.isFontSizeAuto = false; + this.isColorAuto = false; + break; + case SIZE: + this.isFontSizeAuto = true; + this.isColorAuto = false; + break; + case COLOR: + this.isFontSizeAuto = false; + this.isColorAuto = true; + break; + case SIZE_AND_COLOR: + this.isFontSizeAuto = true; + this.isColorAuto = true; + break; + } + } + protected void initFontColorState() { setFontColor(isColorAuto ? new UIColorButtonWithAuto() : new UIColorButton()); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java index 3ec313aab..cdb6b04b4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java @@ -13,6 +13,7 @@ import com.fr.design.style.color.ColorSelectBox; import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartGaugeAxis; import com.fr.plugin.chart.gauge.VanChartGaugePlot; +import com.fr.plugin.chart.type.FontAutoType; import com.fr.plugin.chart.type.GaugeStyle; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -101,7 +102,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { protected ChartTextAttrPane getChartTextAttrPane() { if (isMulti(gaugeStyle)) { - return new ChartTextAttrPaneWithAuto(true, true); + return new ChartTextAttrPaneWithAuto(FontAutoType.SIZE_AND_COLOR); } else { return new ChartTextAttrPane(); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java index 0303a5a20..af7cb3b93 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java @@ -13,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto; import com.fr.general.ComparatorUtils; import com.fr.plugin.chart.base.AttrLabelDetail; import com.fr.plugin.chart.gauge.VanChartGaugePlot; +import com.fr.plugin.chart.type.FontAutoType; import com.fr.plugin.chart.type.GaugeStyle; import com.fr.stable.Constants; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -69,9 +70,23 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { return false; } + private FontAutoType getFontAutoType(boolean isFontSizeAuto, boolean isFontColorAuto) { + if (isFontSizeAuto && isFontColorAuto) { + return FontAutoType.SIZE_AND_COLOR; + } + if (isFontSizeAuto) { + return FontAutoType.SIZE; + } + if (isFontColorAuto) { + return FontAutoType.COLOR; + } + return FontAutoType.NONE; + } + protected ChartTextAttrPane initTextFontPane() { + FontAutoType type = getFontAutoType(isFontSizeAuto(), isFontColorAuto()); - return new ChartTextAttrPaneWithAuto(isFontSizeAuto(), isFontColorAuto()) { + return new ChartTextAttrPaneWithAuto(type) { protected double[] getRowSize() { double p = TableLayout.PREFERRED; return new double[]{p, p}; From c12aa0e57b3046bafa5688d9a0783e4538c039a9 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 9 Mar 2020 20:19:03 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/style/ChartTextAttrPaneWithAuto.java | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java index 4cb9f7373..292d83c9e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java @@ -12,9 +12,9 @@ import com.fr.general.GeneralUtils; public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { private static final String AUTO = Toolkit.i18nText("Fine-Design_Basic_ChartF_Auto"); - private boolean isFontSizeAuto = false; - private boolean isColorAuto = false; + private FontAutoType type; public static String[] FONT_SIZES_WITH_AUTO = new String[FONT_END - FONT_START + 2]; + static { FONT_SIZES_WITH_AUTO[0] = AUTO; @@ -24,42 +24,29 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { } public ChartTextAttrPaneWithAuto(FontAutoType type) { - initAutoType(type); + this.type = type; initState(); initComponents(); } - private void initAutoType(FontAutoType type) { - switch (type) { - case NONE: - this.isFontSizeAuto = false; - this.isColorAuto = false; - break; - case SIZE: - this.isFontSizeAuto = true; - this.isColorAuto = false; - break; - case COLOR: - this.isFontSizeAuto = false; - this.isColorAuto = true; - break; - case SIZE_AND_COLOR: - this.isFontSizeAuto = true; - this.isColorAuto = true; - break; - } + private boolean isFontSizeAuto() { + return type == FontAutoType.SIZE || type == FontAutoType.SIZE_AND_COLOR; + } + + private boolean isFontColorAuto() { + return type == FontAutoType.COLOR || type == FontAutoType.SIZE_AND_COLOR; } protected void initFontColorState() { - setFontColor(isColorAuto ? new UIColorButtonWithAuto() : new UIColorButton()); + setFontColor(isFontColorAuto() ? new UIColorButtonWithAuto() : new UIColorButton()); } protected Object[] getFontSizeComboBoxModel() { - return isFontSizeAuto ? FONT_SIZES_WITH_AUTO : FONT_SIZES; + return isFontSizeAuto() ? FONT_SIZES_WITH_AUTO : FONT_SIZES; } protected float updateFontSize() { - if (isFontSizeAuto && ComparatorUtils.equals(getFontSizeComboBox().getSelectedItem(), AUTO)) { + if (isFontSizeAuto() && ComparatorUtils.equals(getFontSizeComboBox().getSelectedItem(), AUTO)) { return ChartConstants.AUTO_FONT_SIZE; } @@ -67,7 +54,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { } protected void populateFontSize(FRFont frFont) { - if (getFontSizeComboBox() != null && isFontSizeAuto) { + if (getFontSizeComboBox() != null && isFontSizeAuto()) { if (frFont.getSize() == ChartConstants.AUTO_FONT_SIZE) { getFontSizeComboBox().setSelectedItem(AUTO); } else { @@ -75,7 +62,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { } } - if (getFontSizeComboBox() != null && !isFontSizeAuto) { + if (getFontSizeComboBox() != null && !isFontSizeAuto()) { getFontSizeComboBox().setSelectedItem(frFont.getSize()); } } From f24b41b4409a523f9b59646092fe4033044b5cb8 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Tue, 10 Mar 2020 09:43:28 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../style/label/VanChartGaugeLabelDetailPane.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java index af7cb3b93..ff510c708 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java @@ -70,23 +70,21 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { return false; } - private FontAutoType getFontAutoType(boolean isFontSizeAuto, boolean isFontColorAuto) { - if (isFontSizeAuto && isFontColorAuto) { + private FontAutoType getFontAutoType() { + if (isFontSizeAuto() && isFontColorAuto()) { return FontAutoType.SIZE_AND_COLOR; } - if (isFontSizeAuto) { + if (isFontSizeAuto()) { return FontAutoType.SIZE; } - if (isFontColorAuto) { + if (isFontColorAuto()) { return FontAutoType.COLOR; } return FontAutoType.NONE; } protected ChartTextAttrPane initTextFontPane() { - FontAutoType type = getFontAutoType(isFontSizeAuto(), isFontColorAuto()); - - return new ChartTextAttrPaneWithAuto(type) { + return new ChartTextAttrPaneWithAuto(getFontAutoType()) { protected double[] getRowSize() { double p = TableLayout.PREFERRED; return new double[]{p, p}; From 282ba7dc2e4957a349ff7abf20fa5d979ea1157e Mon Sep 17 00:00:00 2001 From: Maksim Date: Tue, 10 Mar 2020 13:47:34 +0800 Subject: [PATCH 8/9] =?UTF-8?q?isWarDeploy=E8=B0=83=E7=94=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/env/RemoteWorkspace.java | 16 +++++++--------- .../design/write/submit/CheckServiceDialog.java | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java index 735c1a5bd..7a4453a83 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java @@ -2,10 +2,9 @@ package com.fr.design.env; import com.fr.cluster.engine.base.FineClusterConfig; import com.fr.design.i18n.Toolkit; -import com.fr.invoke.ReflectException; -import com.fr.log.FineLoggerFactory; import com.fr.base.operator.common.CommonOperator; import com.fr.rpc.ExceptionHandler; +import com.fr.rpc.RPCInvokerExceptionInfo; import com.fr.stable.AssistUtils; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; @@ -51,13 +50,12 @@ public class RemoteWorkspace implements Workspace { @Override public boolean isWarDeploy() { - - try { - return WorkContext.getCurrent().get(CommonOperator.class).isWarDeploy(); - } catch (ReflectException e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); - return false; - } + return WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler() { + @Override + public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) { + return false; + } + }).isWarDeploy(); } @Override diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java index a5f5d752b..dfad82eda 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java @@ -54,7 +54,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener { font = font.applySize(15).applyStyle(1); JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Inconsistency")); label.setFont(font); - label.setPreferredSize(new Dimension(600,30)); + label.setPreferredSize(new Dimension(650,30)); JLabel label2 = new JLabel(""+Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Local_Designer") + localBranch + "/" + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remote_Server") + remoteBranch+""); label2.setPreferredSize(new Dimension(600,30)); @@ -98,7 +98,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener { this.add(topPanel,BorderLayout.NORTH); this.add(centerPanel, BorderLayout.CENTER); this.add(buttonPanel,BorderLayout.SOUTH); - this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 700:600, 500)); + this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 750:600, 500)); GUICoreUtils.centerWindow(this); } From 57e7f684a9d54f536fbf9d62c6f1ce5b548b45ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Tue, 10 Mar 2020 15:07:17 +0800 Subject: [PATCH 9/9] =?UTF-8?q?CHART-12771=20=E8=B6=85=E9=93=BE=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=9B=BE=E8=A1=A8=E7=BB=98=E5=88=B6=E5=B8=A6=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/chart/gui/ChartComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java b/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java index 3fae88fe4..ca1f4f140 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java @@ -257,7 +257,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene if (resolution == 0){ resolution = ScreenResolution.getScreenResolution(); } - painter.paint(g2d, chartWidth, chartHeight, resolution, null); + painter.paint(g2d, chartWidth, chartHeight, resolution, null, this); } }