From 1514662e534b27ce4a1267cb622ff66793ea5a13 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 7 Nov 2017 12:36:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-5425=209.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=90=AF=E5=8A=A8=E7=94=BB=E9=9D=A2=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E9=87=8C=E6=98=BE=E7=A4=BA=E4=BA=86?= =?UTF-8?q?=E2=80=9C=E8=A1=A8=E5=8D=95=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=B8=AD=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/locale/designer_ja_JP.properties | 2 +- .../src/com/fr/design/locale/designer_zh_CN.properties | 2 +- .../src/com/fr/design/locale/designer_zh_TW.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index d1ea8fbd0a..fb48123578 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -408,7 +408,7 @@ FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30F FR-Designer_Data=\u30C7\u30FC\u30BF FR-Designer_Error=\u30A8\u30E9\u30FC FR-Designer-Website_Url=http\://www.finereport.com/jp -FR-Designer_formDesignerModule=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C7\u30B6\u30A4\u30CA\u30FC +FR-Designer_formDesignerModule=\u610F\u601D\u6C7A\u5B9A\u30EC\u30DD\u30FC\u30C8 FR-Designer-BBSLogin_Login-Title=BBS\u30ED\u30B0\u30A4\u30F3 FR-Designer_Get-CubeGetting=cube\u53D6\u5F97 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 984a94a542..16298f5e5c 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -420,7 +420,7 @@ FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u663E\u793A\u63A7\u4EF6 FR-Designer_Current_Preview_Rows=\u5F53\u524D\u9884\u89C8\u884C\u6570 FR-Designer_Data=\u6570\u636E FR-Designer_Error=\u9519\u8BEF -FR-Designer_formDesignerModule=\u8868\u5355\u8BBE\u8BA1\u5668\u6A21\u5757 +FR-Designer_formDesignerModule=\u51B3\u7B56\u62A5\u8868\u6A21\u5757 FR-Designer-Website_Url=http\://www.finereport.com/ FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 997342c7f7..898c1fb3cb 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -417,7 +417,7 @@ FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u986F\u793A\u5C0F\u5DE5\u5177 FR-Designer_Current_Preview_Rows=\u7576\u524D\u9810\u89BD\u5217\u6578 FR-Designer_Data=\u8CC7\u6599 FR-Designer_Error=\u932F\u8AA4 -FR-Designer_formDesignerModule=\u8868\u55AE\u8A2D\u8A08\u5668\u6A21\u584A +FR-Designer_formDesignerModule=\u6289\u7B56\u5831\u8868\u6A21\u584A FR-Designer-Website_Url=http\://www.finereport.com/tw FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u9304\u5F8C\u624D\u80FD\u4E0B\u8F09 FR-Designer-App_ReLayout=\u624B\u6A5F\u91CD\u4F48\u5C40 From 51967e5448f29a4f65ea383d363c2f92bb57c894 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 7 Nov 2017 14:38:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-5427=209.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=AE=BE=E7=BD=AE=E6=94=B6=E8=B5=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=A4=84=E8=8A=B1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/icontainer/UIEastResizableContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java index f5d7f23f55..81b291f41d 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -255,7 +255,7 @@ public class UIEastResizableContainer extends JPanel { setCursor(Cursor.getDefaultCursor()); model = UIConstants.MODEL_NORMAL; } - repaint(); + refreshContainer(); } @Override @@ -267,7 +267,7 @@ public class UIEastResizableContainer extends JPanel { public void mouseExited(MouseEvent e) { setCursor(Cursor.getDefaultCursor()); model = UIConstants.MODEL_NORMAL; - repaint(); + refreshContainer(); } @Override From 772880c9afc67ab3748f44cc8d7f10d2618ec72f Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 7 Nov 2017 16:29:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?REPORT-5484=20=E8=A1=A8=E5=8D=95=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E7=BB=84=E4=BB=B6=E6=94=B9=E6=88=90?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E5=A4=B1=E5=8E=BB=E8=A7=A6=E5=8F=91=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/ispinner/UISpinner.java | 10 +++- .../widget/ui/FormWidgetCardPane.java | 1 + .../ui/designer/component/UIBoundSpinner.java | 48 +++++++++++++++++++ .../component/WidgetAbsoluteBoundPane.java | 17 ++++--- .../designer/component/WidgetBoundPane.java | 12 +++-- 5 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 designer_form/src/com/fr/design/widget/ui/designer/component/UIBoundSpinner.java diff --git a/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java b/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java index 0ec3768aa5..361619ae29 100644 --- a/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java +++ b/designer_base/src/com/fr/design/gui/ispinner/UISpinner.java @@ -101,11 +101,15 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver return; } this.value = value; + setTextField(value); + fireStateChanged(); + } + + protected void setTextField(double value){ textField.getDocument().removeDocumentListener(docListener); textField.setValue(value); textField.getDocument().addDocumentListener(docListener); - fireStateChanged(); } public void setTextFieldValue(double value) { @@ -257,6 +261,10 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver } } }); + initTextFiledListeners(); + } + + protected void initTextFiledListeners(){ textField.getDocument().removeDocumentListener(docListener); textField.getDocument().addDocumentListener(docListener); textField.addFocusListener(new FocusAdapter() { 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 1ac55c2eda..07a1fe033b 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 @@ -215,6 +215,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { public void updateWidgetBound (){ if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) { widgetBoundPane.update(); + designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED); } designer.refreshDesignerUI(); } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/UIBoundSpinner.java b/designer_form/src/com/fr/design/widget/ui/designer/component/UIBoundSpinner.java new file mode 100644 index 0000000000..426d27f1ae --- /dev/null +++ b/designer_form/src/com/fr/design/widget/ui/designer/component/UIBoundSpinner.java @@ -0,0 +1,48 @@ +package com.fr.design.widget.ui.designer.component; + +import com.fr.design.gui.ispinner.UISpinner; + +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; + +/** + * Created by kerry on 2017/11/7. + */ +public class UIBoundSpinner extends UISpinner{ + + public UIBoundSpinner(double minValue, double maxValue, double dierta) { + super(minValue, maxValue, dierta); + } + + public UIBoundSpinner(double minValue, double maxValue, double dierta, double defaultValue) { + super(minValue, maxValue, dierta, defaultValue); + } + + @Override + protected void initTextFiledListeners(){ + this.getTextField().addFocusListener(new FocusAdapter() { + @Override + public void focusLost(FocusEvent e) { + setTextFieldValue(getTextField().getValue()); + setTextField(value); + } + }); + + this.getTextField().addKeyListener(new KeyAdapter() { + @Override + public void keyPressed(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ENTER) { + setTextFieldValue(getTextField().getValue()); + setTextField(value); + } + } + }); + } + + @Override + protected void setTextField(double value){ + this.getTextField().setValue(value); + } +} diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java index c0d71c08af..262e52588a 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java @@ -20,11 +20,12 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane { super(source); } + @Override public void initBoundPane() { - x = new UISpinner(0, Integer.MAX_VALUE, 1); - y = new UISpinner(0, Integer.MAX_VALUE, 1); - width = new UISpinner(0, Integer.MAX_VALUE, 1); - height = new UISpinner(0, Integer.MAX_VALUE, 1); + x = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); + y = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); + width = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); + height = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); x.setGlobalName(Inter.getLocText("FR-Designer_Coords_And_Size")); y.setGlobalName(Inter.getLocText("FR-Designer_Coords_And_Size")); width.setGlobalName(Inter.getLocText("FR-Designer_Coords_And_Size")); @@ -32,7 +33,7 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane { this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height)); } - + @Override public void update() { super.update(); Rectangle bounds = new Rectangle(creator.getBounds()); @@ -46,20 +47,22 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane { creator.setBounds(bounds); } - + @Override public void limitWidth(WLayout wabs, int w, Rectangle bounds, Rectangle rec){ bounds.width = w; } + @Override public void limitHeight(WLayout wabs, int h, Rectangle bounds, Rectangle rec){ bounds.height = h; } - + @Override protected String title4PopupWindow() { return "absoluteBound"; } + @Override public void populate() { super.populate(); Rectangle bounds = new Rectangle(creator.getBounds()); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java index 2a033227e8..25fcece419 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java @@ -2,7 +2,11 @@ package com.fr.design.widget.ui.designer.component; import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter; -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.XWFitLayout; +import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ispinner.UISpinner; @@ -48,8 +52,8 @@ public class WidgetBoundPane extends BasicPane { } public void initBoundPane() { - width = new UISpinner(0, Integer.MAX_VALUE, 1); - height = new UISpinner(0, Integer.MAX_VALUE, 1); + width = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); + height = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); width.setGlobalName(Inter.getLocText("FR-Designer_Coords_And_Size")); height.setGlobalName(Inter.getLocText("FR-Designer_Coords_And_Size")); if (creator.acceptType(XWCardLayout.class)) { @@ -64,6 +68,7 @@ public class WidgetBoundPane extends BasicPane { fix(); } + @Override protected String title4PopupWindow() { return "widgetBound"; } @@ -86,7 +91,6 @@ public class WidgetBoundPane extends BasicPane { if (bounds.height != h) { limitHeight(wabs, h, bounds, rec); } - creator.setBounds(bounds); } From c833f9c208d1e1346c7a265e7766c6f2e8299ee9 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 7 Nov 2017 17:04:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/images/control/edit.png | Bin 352 -> 388 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/designer_base/src/com/fr/design/images/control/edit.png b/designer_base/src/com/fr/design/images/control/edit.png index 14ff765e43e622ca8e13d6d9b3db141625ea1942..3ce387e789209df8d1ab42927fc7636ee317f318 100644 GIT binary patch literal 388 zcmV-~0ek+5P)2`S4KugEs$Qk z2Ea4}oova#@L%xHpMSd%hWuX!G61I+P&I>;!T{rY1_l=UvuBTA28po1gpq07nt?Vl zGTdNiXLo%;f4& i4a^7d@I#j)i4OpC>6H8~0~T`t0000Px$8c9S!R5%f1V4xCUB*z?MW3y03#{bR#|NrM?U|>!?d-mimCQ=P@aB$#YWc-&3 zG(;V!SB`< Date: Wed, 8 Nov 2017 14:05:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/ReportFloatPane.java | 10 +++++-- .../com/fr/design/present/BarCodePane.java | 24 ++++++++------- designer/src/com/fr/poly/PolyDesignUI.java | 1 - designer/src/com/fr/poly/PolyDesigner.java | 3 +- .../fr/design/gui/style/AlignmentPane.java | 30 +++++++++++++++---- .../fr/design/gui/style/BackgroundPane.java | 2 +- 6 files changed, 46 insertions(+), 24 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java index c7cb6871f2..087cda8320 100644 --- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java +++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java @@ -79,9 +79,13 @@ public class ReportFloatPane extends JPanel { insertFloatMenu.setTooltip(Inter.getLocText("FR-Designer_T_Insert_Float")); insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png"); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); - ElementCasePaneDelegate elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane(); - if (elementCasePaneDelegate != null) { - refreshInsertFloatMenu(elementCasePaneDelegate); + JComponent currentElementCasePane = editingTemplate.getCurrentElementCasePane(); + if (currentElementCasePane != null) { + insertFloatMenu.clearShortCuts(); + UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, currentElementCasePane); + for (int i = 0; i < actions.length; i++) { + insertFloatMenu.addShortCut(actions[i]); + } } } diff --git a/designer/src/com/fr/design/present/BarCodePane.java b/designer/src/com/fr/design/present/BarCodePane.java index 74f5306b6a..04a9667860 100644 --- a/designer/src/com/fr/design/present/BarCodePane.java +++ b/designer/src/com/fr/design/present/BarCodePane.java @@ -9,6 +9,8 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; +import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -45,9 +47,9 @@ public class BarCodePane extends FurtherBasicBeanPane { private final int NUM16 = 16; private BarCodePreviewPane barCodePreviewPane; private UIComboBox typeComboBox; - private UIBasicSpinner barWidthSpinner; - private UIBasicSpinner barHeightSpinner; - private UIBasicSpinner RCodesizespinner; + private UISpinner barWidthSpinner; + private UISpinner barHeightSpinner; + private UISpinner RCodesizespinner; private UICheckBox drawingTextCheckBox; private UIComboBox RCodeVersionComboBox; private UIComboBox RCodeErrorCorrectComboBox; @@ -62,8 +64,8 @@ public class BarCodePane extends FurtherBasicBeanPane { private void initComponents() { barCodePreviewPane = new BarCodePreviewPane(); - this.barWidthSpinner = new UIBasicSpinner(new SpinnerNumberModel(10.0, 1, 100, 1.0)); - this.barHeightSpinner = new UIBasicSpinner(new SpinnerNumberModel(30, 1, 100, 1)); + this.barWidthSpinner = new UISpinner(1,100.0,1.0,10.0); + this.barHeightSpinner = new UISpinner(1,100.0,1.0,30); this.barWidthSpinner.setPreferredSize(new Dimension(60, 20)); this.barHeightSpinner.setPreferredSize(new Dimension(60, 20)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -72,7 +74,7 @@ public class BarCodePane extends FurtherBasicBeanPane { borderPane.add(barCodePreviewPane, BorderLayout.CENTER); setTypeComboBox(); setSome(); - RCodesizespinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 6, 1)); + RCodesizespinner = new UISpinner(1,6,1,2); RCodeVersionComboBox = new UIComboBox(); RCodeErrorCorrectComboBox = new UIComboBox(); typeSetLabel = new UILabel(Inter.getLocText("FR-Designer_Type_Set"), UILabel.LEFT); @@ -126,10 +128,10 @@ public class BarCodePane extends FurtherBasicBeanPane { } private void setSome() { - JFormattedTextField heightTextField = ((JSpinner.DefaultEditor) barHeightSpinner.getEditor()).getTextField(); + UINumberField heightTextField = barHeightSpinner.getTextField(); heightTextField.setColumns(2); - JFormattedTextField widthTextField = ((JSpinner.DefaultEditor) barWidthSpinner.getEditor()).getTextField(); + UINumberField widthTextField = barWidthSpinner.getTextField(); widthTextField.setColumns(2); } @@ -268,7 +270,7 @@ public class BarCodePane extends FurtherBasicBeanPane { } this.setTestText(BarCodeUtils.getTestTextByBarCode(barcodeAttr.getType())); this.typeComboBox.setSelectedIndex(barcodeAttr.getType()); - this.barWidthSpinner.setValue(new Double(barcodeAttr.getBarWidth())); + this.barWidthSpinner.setValue(new Double(barcodeAttr.getBarWidth()) * 10); this.barHeightSpinner.setValue(new Integer(barcodeAttr.getBarHeight())); this.drawingTextCheckBox.setSelected(barcodeAttr.isDrawingText()); this.RCodesizespinner.setValue(new Integer(barcodeAttr.getRcodeDrawPix())); @@ -281,11 +283,11 @@ public class BarCodePane extends FurtherBasicBeanPane { if ((typeComboBox.getSelectedIndex() == NUM16)) { barcodeAttr.setRCodeVersion(this.RCodeVersionComboBox.getSelectedIndex()); barcodeAttr.setRCodeErrorCorrect(this.RCodeErrorCorrectComboBox.getSelectedIndex()); - barcodeAttr.setRcodeDrawPix(((Integer) this.RCodesizespinner.getValue()).intValue()); + barcodeAttr.setRcodeDrawPix((int) this.RCodesizespinner.getValue()); } barcodeAttr.setType(this.typeComboBox.getSelectedIndex()); barcodeAttr.setBarWidth(((Double) this.barWidthSpinner.getValue()).doubleValue() / 10); - barcodeAttr.setBarHeight(((Integer) this.barHeightSpinner.getValue()).intValue()); + barcodeAttr.setBarHeight((int) this.barHeightSpinner.getValue()); barcodeAttr.setDrawingText(this.drawingTextCheckBox.isSelected()); return new BarcodePresent(barcodeAttr); } diff --git a/designer/src/com/fr/poly/PolyDesignUI.java b/designer/src/com/fr/poly/PolyDesignUI.java index 855f68a1ec..f63252fd48 100644 --- a/designer/src/com/fr/poly/PolyDesignUI.java +++ b/designer/src/com/fr/poly/PolyDesignUI.java @@ -97,7 +97,6 @@ public class PolyDesignUI extends ComponentUI { paintAddingData(g2d, addData); } paintPaginateLine(g2d); - designer.repaint(); } private void paintAddedData(Graphics g) { diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index c8cc3362fc..eefff3e1ec 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -189,8 +189,7 @@ public class PolyDesigner extends ReportComponent Date: Wed, 8 Nov 2017 19:42:22 +0800 Subject: [PATCH 6/6] =?UTF-8?q?CHART-1697=20=20=E7=B1=BB=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=B8=8E8.0=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/map/designer/type/VanChartMapSourceChoosePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java index a6b8cb5e18..a98c8d7f7c 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -23,10 +23,10 @@ import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.plugin.chart.base.GisLayer; import com.fr.plugin.chart.base.ViewCenter; -import com.fr.plugin.chart.base.WMSLayer; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.drillmap.designer.data.comp.MapDataTree; import com.fr.plugin.chart.map.VanChartMapPlot; +import com.fr.plugin.chart.map.layer.WMSLayer; import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper; import com.fr.plugin.chart.map.server.GEOJSONHelper; import com.fr.plugin.chart.map.server.MapLayerConfigManager;