diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index 3a64aa075..09459f5b8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -32,11 +32,11 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.design.utils.gui.UIComponentUtils; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; import com.fr.general.ComparatorUtils; - import com.fr.general.data.DataSource; import com.fr.stable.ArrayUtils; import com.fr.stable.EncodeConstants; @@ -45,13 +45,24 @@ import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLableReader; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -99,7 +110,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private UIRadioButton commaDismenberRadioButton;// 逗号 private UIRadioButton otherDismenberRadioButton;// 其他 private UITextField otherDismenberTextField;// 其他分隔符编辑 - private UICheckBox igoreOneMoreDelimiterCheckBox;// 连续分隔符是否作为单一 + private UICheckBox ignoreOneMoreDelimiterCheckBox;// 连续分隔符是否作为单一 private UIComboBox charsetComboBox; private UILabel encodeLabel; private UILabel dismenberLabel; @@ -374,7 +385,8 @@ public class FileTableDataPane extends AbstractTableDataPane { bg2.add(spaceDismenberRadioButton); bg2.add(commaDismenberRadioButton); bg2.add(otherDismenberRadioButton); - igoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Series_Dismenber_As_Single"), true); + ignoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Series_Dismenber_As_Single"), true); + UIComponentUtils.setLineWrap(ignoreOneMoreDelimiterCheckBox); encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":"); charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); Component[][] comps = { @@ -384,7 +396,7 @@ public class FileTableDataPane extends AbstractTableDataPane { {null,spaceDismenberRadioButton,null}, {null,commaDismenberRadioButton,null}, {null,otherDismenberRadioButton,otherDismenberTextField}, - {igoreOneMoreDelimiterCheckBox,null,null} + {ignoreOneMoreDelimiterCheckBox,null,null} }; northPane.add(TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize),BorderLayout.EAST); } @@ -586,7 +598,7 @@ public class FileTableDataPane extends AbstractTableDataPane { } editorPane.populate(ttd.getParams()); needColumnNameCheckBox.setSelected(ttd.needColumnName()); - igoreOneMoreDelimiterCheckBox.setSelected(ttd.isIgnoreOneMoreDelimiter()); + ignoreOneMoreDelimiterCheckBox.setSelected(ttd.isIgnoreOneMoreDelimiter()); charsetComboBox.setSelectedItem(ttd.getCharset()); } @@ -624,7 +636,7 @@ public class FileTableDataPane extends AbstractTableDataPane { ttd.setFilePath(filePath); ttd.setParams(this.params); ttd.setDelimiter(this.showDelimiter()); - ttd.setIgnoreOneMoreDelimiter(igoreOneMoreDelimiterCheckBox.isSelected()); + ttd.setIgnoreOneMoreDelimiter(ignoreOneMoreDelimiterCheckBox.isSelected()); ttd.setNeedColumnName(needColumnNameCheckBox.isSelected()); ttd.setCharset((String)charsetComboBox.getSelectedItem()); fileTableData = ttd;