fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

found and correct the bug

research/10.0
Wim.Zhai 6 years ago
parent
7c27474e26
commit
f6dd924d16
12 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
  3. 2
      designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
  4. 2
      designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
  5. 2
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  6. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
  7. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
  8. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
  9. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  10. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  11. 6
      designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
  12. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java

6
designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
Unescape View File

@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
this.add(selectTreeDataPanel, BorderLayout.NORTH); this.add(selectTreeDataPanel, BorderLayout.NORTH);
valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
formulaEditor.setEnabled(true); formulaEditor.setEnabled(true);
textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
Component[][] coms = { Component[][] coms = {
@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
String[] columnNames = new String[namelist.size()]; String[] columnNames = new String[namelist.size()];
namelist.toArray(columnNames); namelist.toArray(columnNames);
valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]); valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
formulaEditor.setEnabled(true); formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]);
} catch (Exception e) { } catch (Exception e) {
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
formulaEditor.setEnabled(true); formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
} }

2
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
Unescape View File

@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
case DataControl.TYPE_NUMBER: case DataControl.TYPE_NUMBER:
return new DoubleEditor(); return new DoubleEditor();
case DataControl.TYPE_FORMULA: case DataControl.TYPE_FORMULA:
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
case DataControl.TYPE_DATABINDING: case DataControl.TYPE_DATABINDING:
return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
case DataControl.TYPE_STRING: case DataControl.TYPE_STRING:

2
designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
Unescape View File

@ -23,7 +23,7 @@ public class DateValuePane extends JPanel {
private Editor[] editor; private Editor[] editor;
private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"); private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None");
private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date");
private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"); private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula");
public DateValuePane() { public DateValuePane() {

2
designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
Unescape View File

@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog {
this.setModal(true); this.setModal(true);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
final ChartTypePane chartTypePane = new ChartTypePane(); final ChartTypePane chartTypePane = new ChartTypePane();
setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type")); setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"));
this.applyClosingAction(); this.applyClosingAction();
this.applyEscapeAction(); this.applyEscapeAction();

2
designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
Unescape View File

@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane);
spane.setDividerLocation(120); spane.setDividerLocation(120);
spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type"))); spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")));
this.add(spane); this.add(spane);
iconViewList.setSelectedIndex(0); iconViewList.setSelectedIndex(0);

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
Unescape View File

@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit
TextEditor textEidtor = new TextEditor(); TextEditor textEidtor = new TextEditor();
initListeners(textEidtor); initListeners(textEidtor);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
initListeners(formulaEditor); initListeners(formulaEditor);
Editor[] editors = new Editor[]{textEidtor, formulaEditor}; Editor[] editors = new Editor[]{textEidtor, formulaEditor};

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
Unescape View File

@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer {
private ValueEditorPane cellEditor; private ValueEditorPane cellEditor;
public MapReportRenderer() { public MapReportRenderer() {
Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"))}; Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"))};
cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors); cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors);
} }

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
Unescape View File

@ -32,7 +32,7 @@ public class BubbleDataLabelPane extends DataLabelPane {
outSideButton.setSelected(true); outSideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("+ \":\"") + ":")); buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(outSideButton); buttonPane.add(outSideButton);
buttonPane.add(insideButton); buttonPane.add(insideButton);

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
Unescape View File

@ -64,7 +64,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR); Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
Font font = null; Font font = null;
TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-M_Insert_Float_Related"), 4, 2, font, new Color(1, 159, 222)); TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related"), 4, 2, font, new Color(1, 159, 222));
// 圆角不行 // 圆角不行
centerPane.setBorder(border); centerPane.setBorder(border);
@ -144,7 +144,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-M_Insert_Float_Related"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related");
} }
public static class ChartNoRename extends ChartHyperRelateFloatLinkPane { public static class ChartNoRename extends ChartHyperRelateFloatLinkPane {

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
Unescape View File

@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value"));
Date tmp = null; Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor}; Editor[] editor = new Editor[]{dateEditor, formulaEditor};
minValueField = new ValueEditorPane(editor); minValueField = new ValueEditorPane(editor);
minValueField.setEnabled(false); minValueField.setEnabled(false);
@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value"));
Date tmp = null; Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor}; Editor[] editor = new Editor[]{dateEditor, formulaEditor};
maxValueField = new ValueEditorPane(editor); maxValueField = new ValueEditorPane(editor);
maxValueField.setEnabled(false); maxValueField.setEnabled(false);

6
designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
Unescape View File

@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
this.add(selectTreeDataPanel, BorderLayout.NORTH); this.add(selectTreeDataPanel, BorderLayout.NORTH);
valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
formulaEditor.setEnabled(true); formulaEditor.setEnabled(true);
textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor});
Component[][] coms = { Component[][] coms = {
@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
String[] columnNames = new String[namelist.size()]; String[] columnNames = new String[namelist.size()];
namelist.toArray(columnNames); namelist.toArray(columnNames);
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
formulaEditor.setEnabled(true); formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
} catch (Exception e) { } catch (Exception e) {
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
formulaEditor.setEnabled(true); formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
} }

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
Unescape View File

@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel {
case DataControl.TYPE_NUMBER: case DataControl.TYPE_NUMBER:
return new DoubleEditor(); return new DoubleEditor();
case DataControl.TYPE_FORMULA: case DataControl.TYPE_FORMULA:
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"));
case DataControl.TYPE_DATABINDING: case DataControl.TYPE_DATABINDING:
return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
case DataControl.TYPE_STRING: case DataControl.TYPE_STRING:

Write Preview
Loading…
Cancel
Save