Browse Source

Merge pull request #1222 in BA/design from ~NEIL/design:release/9.0 to release/9.0

* commit '34e6be8319537f9b73f9afdb7f5fc443d037bb37':
  1
  无JIRA任务, build failed
master
superman 7 years ago
parent
commit
4e889e24cd
  1. 2
      designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
  2. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

2
designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@ -159,7 +159,7 @@ public class ErrorInfoUploader {
try { try {
success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success"); success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
} catch (Exception ex) { } catch (Exception ex) {
success = false; success = true;
} }
return success; return success;
} }

2
designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@ -114,7 +114,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
} }
private JPanel createTitleStylePane() { private JPanel createTitleStylePane() {
UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); final UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT);
styleAttrPane = new ChartTextAttrPane() { styleAttrPane = new ChartTextAttrPane() {
protected JPanel getContentPane(JPanel buttonPane) { protected JPanel getContentPane(JPanel buttonPane) {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;

Loading…
Cancel
Save