Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #262 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0 

* commit '8460adc91e93e5c2f96551307b8e21ef00e64684':
  CORE-116 继续改国际化规范
master
richie 6 years ago
parent
ea24273066 8460adc91e
commit
f25511a47f
11 changed files with 503 additions and 544 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. 4
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  2. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java
  3. 4
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
  4. 8
      designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
  5. 19
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  6. 13
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  7. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java
  8. 3
      designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
  9. 4
      designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
  10. 38
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  11. 102
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
Unescape View File

@ -535,7 +535,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
if (!access) { if (!access) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
return false; return false;
} }
collectInfo(); collectInfo();
@ -585,7 +585,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
if (!access) { if (!access) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
return false; return false;
} }
editingFILE = fileChooser.getSelectedFILE(); editingFILE = fileChooser.getSelectedFILE();

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

@ -33,7 +33,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerTable
pane.setLayout(new FlowLayout(FlowLayout.LEFT)); pane.setLayout(new FlowLayout(FlowLayout.LEFT));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_Data_Set") + ":", SwingConstants.RIGHT); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select") + ":", SwingConstants.RIGHT);
dataFromBox = new DatabaseTableDataPane(label) { dataFromBox = new DatabaseTableDataPane(label) {
protected void userEvent() { protected void userEvent() {

4
designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
Unescape View File

@ -50,7 +50,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_Data_Set") + ":", SwingConstants.RIGHT); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select") + ":", SwingConstants.RIGHT);
northPane.add(fromTableData = new DatabaseTableDataPane(label) { northPane.add(fromTableData = new DatabaseTableDataPane(label) {
@Override @Override
@ -127,7 +127,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
* 界面弹出标题 * 界面弹出标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("DS-TableData"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata");
} }
private void stopEditing() { private void stopEditing() {

8
designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java
Unescape View File

@ -121,7 +121,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
centerPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0)); centerPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0));
centerPane.add(textPane, BorderLayout.CENTER); centerPane.add(textPane, BorderLayout.CENTER);
UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[] {"BiasD-Input_Slope_Line_text_separated_by_'|'", "Example"}, new String[] {" ", ": Season|Product"}) ); UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Tip", "'|'", "Season|Product"));
textPane.add(formulaLabel, BorderLayout.NORTH); textPane.add(formulaLabel, BorderLayout.NORTH);
formulaLabel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 0)); formulaLabel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 0));
@ -136,8 +136,8 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
JPanel choicePane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); JPanel choicePane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
choice1 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("BiasD-From-upper_left_to_lower_right"))); choice1 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Upper_Left_To_Lower_Right")));
choice2 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("BiasD-From-lower_left_to_upper_right"))); choice2 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Lower_Left_To_Upper_Right")));
choice1.addActionListener(leftUp); choice1.addActionListener(leftUp);
choice2.addActionListener(leftDown); choice2.addActionListener(leftDown);
@ -154,7 +154,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("BiasD-Slope_Line"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line");
} }
public void populate(BiasTextPainter biasTextPainter) { public void populate(BiasTextPainter biasTextPainter) {

19
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
Unescape View File

@ -19,7 +19,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.report.cell.CellElement; import com.fr.report.cell.CellElement;
import com.fr.report.cell.TemplateCellElement; import com.fr.report.cell.TemplateCellElement;
import com.fr.report.cell.cellattr.CellExpandAttr; import com.fr.report.cell.cellattr.CellExpandAttr;
@ -339,12 +338,10 @@ public class DSColumnAdvancedPane extends BasicPane {
+ " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{
serialTextField, new UILabel( serialTextField, new UILabel(
com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__")
"Format", "BindColumn-Result_Serial_Number_Start_From_1", "Inner_Parameter", "Group_Count"},
new String[]{": 1,2-3,5,8 ", ",", "$__count__"})
) )
}, FlowLayout.LEFT); }, FlowLayout.LEFT);
serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")"); serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")");
selectCountCardPane.add(undefinedPane, "UNDEFINE"); selectCountCardPane.add(undefinedPane, "UNDEFINE");
selectCountCardPane.add(topFormulaPane, "TOP"); selectCountCardPane.add(topFormulaPane, "TOP");
selectCountCardPane.add(bottomFormulaPane, "BOTTOM"); selectCountCardPane.add(bottomFormulaPane, "BOTTOM");
@ -410,18 +407,6 @@ public class DSColumnAdvancedPane extends BasicPane {
} }
} }
} }
private JFormattedTextField getTextField(JSpinner spinner) {
JComponent editor = spinner.getEditor();
if (editor instanceof JSpinner.DefaultEditor) {
return ((JSpinner.DefaultEditor) editor).getTextField();
} else {
System.err.println("Unexpected editor type: "
+ spinner.getEditor().getClass()
+ " isn't a descendant of DefaultEditor");
return null;
}
}
} }
private static class JFormulaField extends JPanel { private static class JFormulaField extends JPanel {

13
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
Unescape View File

@ -12,6 +12,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.server.StyleListAction; import com.fr.design.actions.server.StyleListAction;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DecodeDialog; import com.fr.design.mainframe.DecodeDialog;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.file.FILE; import com.fr.file.FILE;
@ -53,7 +54,7 @@ class CptApp extends AbstractWorkBookApp {
WorkBook tpl = new WorkBook(); WorkBook tpl = new WorkBook();
// richer:打开报表通知 // richer:打开报表通知
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"}, new String[]{"\"" + file.getName() + "\"" + ",", "..."})); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Opening_And_Waiting", file.getName()) + "...");
TempNameStyle namestyle = TempNameStyle.getInstance(); TempNameStyle namestyle = TempNameStyle.getInstance();
namestyle.clear(); namestyle.clear();
String checkStr = StringUtils.EMPTY; String checkStr = StringUtils.EMPTY;
@ -61,7 +62,7 @@ class CptApp extends AbstractWorkBookApp {
checkStr = ResourceIOUtils.inputStream2String(file.asInputStream()); checkStr = ResourceIOUtils.inputStream2String(file.asInputStream());
tpl.readStream(file.asInputStream()); tpl.readStream(file.asInputStream());
} catch (Exception exp) { } catch (Exception exp) {
String errorMessage = ComparatorUtils.equals(RemoteDeziConstants.INVALID_USER, checkStr) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") String errorMessage = ComparatorUtils.equals(RemoteDeziConstants.INVALID_USER, checkStr) ? Toolkit.i18nText("Fine-Design_Template_Permission_Denied")
: com.fr.design.i18n.Toolkit.i18nText("NS-exception_readError"); : com.fr.design.i18n.Toolkit.i18nText("NS-exception_readError");
FineLoggerFactory.getLogger().error(errorMessage + file, exp); FineLoggerFactory.getLogger().error(errorMessage + file, exp);
} }
@ -91,13 +92,13 @@ class CptApp extends AbstractWorkBookApp {
jd.setResizable(false); jd.setResizable(false);
jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));
String message = namelist.toString().replaceAll("\\[", "").replaceAll("\\]", ""); String message = namelist.toString().replaceAll("\\[", "").replaceAll("\\]", "");
UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Current_custom_global", "Has_been_gone"}, new String[]{message})); UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Global_Style_Missed", message));
jl.setHorizontalAlignment(SwingConstants.CENTER); jl.setHorizontalAlignment(SwingConstants.CENTER);
jd.add(jl, BorderLayout.CENTER); jd.add(jl, BorderLayout.CENTER);
JPanel jp = new JPanel(); JPanel jp = new JPanel();
// ”是“按钮，点击之后将生成一个全局样式，并写入xml // ”是“按钮，点击之后将生成一个全局样式，并写入xml
UIButton confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Yes")); UIButton confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Yes"));
confirmButton.addActionListener(new ActionListener() { confirmButton.addActionListener(new ActionListener() {
@Override @Override
@ -115,7 +116,7 @@ class CptApp extends AbstractWorkBookApp {
} }
}); });
UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No")); UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No"));
noButton.addActionListener(new ActionListener() { noButton.addActionListener(new ActionListener() {
@Override @Override
@ -127,7 +128,7 @@ class CptApp extends AbstractWorkBookApp {
jp.add(confirmButton); jp.add(confirmButton);
jp.add(noButton); jp.add(noButton);
jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Custom_styles_lost")); jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Custom_Style_Missed"));
jd.add(jp, BorderLayout.SOUTH); jd.add(jp, BorderLayout.SOUTH);
GUICoreUtils.centerWindow(jd); GUICoreUtils.centerWindow(jd);
jd.setVisible(true); jd.setVisible(true);

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java
Unescape View File

@ -26,7 +26,7 @@ class CptxApp extends AbstractWorkBookApp {
@Override @Override
public WorkBook asIOFile(FILE file) { public WorkBook asIOFile(FILE file) {
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"}, new String[]{"\"" + file.getName() + "\"" + ",", "..."})); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Opening_And_Waiting", file.getName()) + "...");
WorkBookX tpl; WorkBookX tpl;
InputStream inputStream; InputStream inputStream;
try { try {

3
designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
Unescape View File

@ -53,8 +53,7 @@ class FormApp extends AbstractAppProvider {
// peter:打开新报表. // peter:打开新报表.
Form tpl = new Form(); Form tpl = new Form();
// richer:打开报表通知 // richer:打开报表通知
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"}, FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("file.getName()", file.getName()) + "...");
new String[]{"\"" + file.getName() + "\"" + ",", "..."}));
try { try {
tpl.readStream(file.asInputStream()); tpl.readStream(file.asInputStream());
} catch (Exception exp) { } catch (Exception exp) {

4
designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
Unescape View File

@ -18,8 +18,8 @@ import java.awt.*;
public class ValueVerifierEditPane extends JPanel { public class ValueVerifierEditPane extends JPanel {
private UITableEditorPane<Object[]> tableEditorPane; private UITableEditorPane<Object[]> tableEditorPane;
private final String[] columnNames = new String[] { private final String[] columnNames = new String[] {
com.fr.design.i18n.Toolkit.i18nTextArray(new String[] {"Verify-Verify_Formula", "Verify-ToolTips"}, new String[] {"(", ")"}), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify"),
com.fr.design.i18n.Toolkit.i18nText("Verify-Error_Information") }; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify_Warn_Text") };
public ValueVerifierEditPane() { public ValueVerifierEditPane() {
// ben:UITableEditorPane； // ben:UITableEditorPane；

38
designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
Unescape View File

@ -4,10 +4,8 @@ import com.fr.base.BaseUtils;
import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.core.WidgetOptionFactory; import com.fr.design.gui.core.WidgetOptionFactory;
import com.fr.form.ui.CustomToolBarButton; import com.fr.form.ui.CustomToolBarButton;
import com.fr.form.ui.Widget;
import com.fr.report.web.button.AppletPrint; import com.fr.report.web.button.AppletPrint;
import com.fr.report.web.button.Edit;
import com.fr.report.web.button.Email; import com.fr.report.web.button.Email;
import com.fr.report.web.button.ExcelO; import com.fr.report.web.button.ExcelO;
import com.fr.report.web.button.ExcelP; import com.fr.report.web.button.ExcelP;
@ -16,13 +14,11 @@ import com.fr.report.web.button.Export;
import com.fr.report.web.button.FlashPrint; import com.fr.report.web.button.FlashPrint;
import com.fr.report.web.button.NewPrint; import com.fr.report.web.button.NewPrint;
import com.fr.report.web.button.PDF; import com.fr.report.web.button.PDF;
import com.fr.report.web.button.PDF2;
import com.fr.report.web.button.PDFPrint; import com.fr.report.web.button.PDFPrint;
import com.fr.report.web.button.PageSetup; import com.fr.report.web.button.PageSetup;
import com.fr.report.web.button.Print; import com.fr.report.web.button.Print;
import com.fr.report.web.button.PrintPreview; import com.fr.report.web.button.PrintPreview;
import com.fr.report.web.button.Scale; import com.fr.report.web.button.Scale;
import com.fr.report.web.button.ServerPrint;
import com.fr.report.web.button.Word; import com.fr.report.web.button.Word;
import com.fr.report.web.button.page.First; import com.fr.report.web.button.page.First;
import com.fr.report.web.button.page.Last; import com.fr.report.web.button.page.Last;
@ -45,8 +41,6 @@ import com.fr.report.web.button.write.Submit;
import com.fr.report.web.button.write.SubmitForcibly; import com.fr.report.web.button.write.SubmitForcibly;
import com.fr.report.web.button.write.Verify; import com.fr.report.web.button.write.Verify;
import com.fr.report.web.button.write.WriteOfflineHTML; import com.fr.report.web.button.write.WriteOfflineHTML;
import com.fr.stable.bridge.BridgeMark;
import com.fr.stable.bridge.StableFactory;
public class ReportWebWidgetConstants { public class ReportWebWidgetConstants {
private ReportWebWidgetConstants() { private ReportWebWidgetConstants() {
@ -61,25 +55,12 @@ public class ReportWebWidgetConstants {
return new WidgetOption[]{PAGESETUP, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, PRINTPREVIEW, CUSTOM_BUTTON}; return new WidgetOption[]{PAGESETUP, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, PRINTPREVIEW, CUSTOM_BUTTON};
} }
public static WidgetOption[] getPreviewToolBarInstance() {
return new WidgetOption[]{FIRST, PREVIOUS, PAGENAVI, NEXT, LAST, SCALE, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT,
SETPRINTEROFFSET, CUSTOM_BUTTON};
}
public static WidgetOption[] getWriteToolBarInstance() { public static WidgetOption[] getWriteToolBarInstance() {
return new WidgetOption[]{SUBMIT, VERIFY, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, IMPORTEXCELDATA, SHOWCELLVALUE, return new WidgetOption[]{SUBMIT, VERIFY, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, IMPORTEXCELDATA, SHOWCELLVALUE,
APPENDCOLUMNROW, DELETECOLUMNROW, SETPRINTEROFFSET, WRITEOFFLINEHTML, CUSTOM_BUTTON, WRITESTASH, WRITESTASHCLEAR, IMPORTEXCELDATA_CUSTOMIZED, APPENDCOLUMNROW, DELETECOLUMNROW, SETPRINTEROFFSET, WRITEOFFLINEHTML, CUSTOM_BUTTON, WRITESTASH, WRITESTASHCLEAR, IMPORTEXCELDATA_CUSTOMIZED,
IMPORTEXCEL, IMPORTEXCEL_COVER, IMPORTEXCEL_CLEAN, IMPORTEXCEL_APPEND}; IMPORTEXCEL, IMPORTEXCEL_COVER, IMPORTEXCEL_CLEAN, IMPORTEXCEL_APPEND};
} }
public static WidgetOption[] getFormToolBarInstance() {
return new WidgetOption[]{EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, CUSTOM_BUTTON};
}
// 查询
public static final WidgetOption SEARCH = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Query", "Form-Button"}),
BaseUtils.readIcon("/com/fr/web/images/form/resources/preview_16.png"), StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class));
// 提交按钮 // 提交按钮
public static final WidgetOption SUBMIT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Submit"), BaseUtils.readIcon("/com/fr/web/images/save.png"), public static final WidgetOption SUBMIT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Submit"), BaseUtils.readIcon("/com/fr/web/images/save.png"),
Submit.class); Submit.class);
@ -96,36 +77,29 @@ public class ReportWebWidgetConstants {
public static final WidgetOption PDF = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-PDF"), BaseUtils.readIcon("/com/fr/web/images/pdf.png"), public static final WidgetOption PDF = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-PDF"), BaseUtils.readIcon("/com/fr/web/images/pdf.png"),
PDF.class); PDF.class);
// PDF导出，解决linux下无中文字体的导出字体混乱
public static final WidgetOption PDF2 = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-PDF", "ReportServerP-PDF2-INFO"}, new String[]{"(", ")"}), BaseUtils.readIcon("/com/fr/web/images/pdf.png"), PDF2.class);
// 客户端PDF打印 // 客户端PDF打印
public static final WidgetOption PDFPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Print[Client]"), public static final WidgetOption PDFPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Print[Client]"),
BaseUtils.readIcon("/com/fr/web/images/pdfPrint.png"), PDFPrint.class); BaseUtils.readIcon("/com/fr/web/images/pdfPrint.png"), PDFPrint.class);
// 服务器端打印
public static final WidgetOption SERVERPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Print[Server]"),
BaseUtils.readIcon("/com/fr/web/images/serverPrint.png"), ServerPrint.class);
// 邮件发送 // 邮件发送
public static final WidgetOption EMAIL = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Email"), BaseUtils.readIcon("/com/fr/web/images/email.png"), Email.class); public static final WidgetOption EMAIL = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Email"), BaseUtils.readIcon("/com/fr/web/images/email.png"), Email.class);
public static final WidgetOption PRINTPREVIEW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PrintP-Print_Preview"), public static final WidgetOption PRINTPREVIEW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PrintP-Print_Preview"),
BaseUtils.readIcon("/com/fr/web/images/preview.png"), PrintPreview.class); BaseUtils.readIcon("/com/fr/web/images/preview.png"), PrintPreview.class);
public static final WidgetOption EDIT = WidgetOptionFactory.createByWidgetClass("Edit", Edit.class);
// 导出成Excel 分页导出 // 导出成Excel 分页导出
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Excel", "FR-Designer_Export_Excel_Page"}, new String[]{"(", ")"}), public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
// 导出成Excel 原样导出 // 导出成Excel 原样导出
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Excel", "FR-Designer_Export_Excel_Simple"}, new String[]{"(", ")"}), public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
// 导出成Excel 分页分Sheet导出 // 导出成Excel 分页分Sheet导出
public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Excel", "FR-Designer_Export_Excel_PageToSheet"}, new String[]{"(", ")"}), public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page_To_Sheet"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class); BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class);
// 导出成Word // 导出成Word
public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class);
// 页面设置 // 页面设置
public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class);
// 导出 // 导出
@ -133,7 +107,7 @@ public class ReportWebWidgetConstants {
.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class); .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class);
// 当前页/总页数 // 当前页/总页数
public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"HJS-Current_Page", "HF-Number_of_Page"}, new String[]{"/", ""}), public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Page_Navi_Text"),
BaseUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class); BaseUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class);
// 首页 // 首页
public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), BaseUtils.readIcon("/com/fr/web/images/first.png"), public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), BaseUtils.readIcon("/com/fr/web/images/first.png"),

102
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
Unescape View File

@ -1,21 +1,5 @@
package com.fr.design.write.submit; package com.fr.design.write.submit;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dialog;
import java.awt.event.ActionEvent;
import javax.swing.BorderFactory;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import com.fr.cache.list.IntList; import com.fr.cache.list.IntList;
import com.fr.data.ClassSubmitJob; import com.fr.data.ClassSubmitJob;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
@ -30,13 +14,16 @@ import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.*; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JWorkBook;
import com.fr.design.selection.SelectionEvent; import com.fr.design.selection.SelectionEvent;
import com.fr.design.selection.SelectionListener; import com.fr.design.selection.SelectionListener;
import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.FloatSelection;
import com.fr.grid.selection.Selection; import com.fr.grid.selection.Selection;
@ -45,6 +32,12 @@ import com.fr.stable.ColumnRowGroup;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.write.DMLConfigJob; import com.fr.write.DMLConfigJob;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import java.awt.*;
import java.awt.event.ActionEvent;
public class SmartInsertDBManipulationPane extends DBManipulationPane { public class SmartInsertDBManipulationPane extends DBManipulationPane {
private static final Selection NO_SELECTION = new CellSelection(-1, -1, -1, -1); private static final Selection NO_SELECTION = new CellSelection(-1, -1, -1, -1);
private ElementCasePane ePane; private ElementCasePane ePane;
@ -88,7 +81,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
@Override @Override
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
return new NameableCreator[] { return new NameableCreator[]{
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Submit", "Event"}), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Submit", "Event"}),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
DMLConfigJob.class, DMLConfigJob.class,
@ -96,13 +89,13 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Event"}), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Event"}),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
ClassSubmitJob.class, ClassSubmitJob.class,
CustomSubmitJobPane.class) }; CustomSubmitJobPane.class)};
} }
} }
@Override @Override
protected UpdateAction[] getActions() { protected UpdateAction[] getActions() {
return new UpdateAction[] { return new UpdateAction[]{
new SmartAddFieldsAction(), new SmartAddFieldsAction(),
new AddFieldAction(), new AddFieldAction(),
new SmartAddCellAction(), new SmartAddCellAction(),
@ -119,6 +112,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
/** /**
* 执行事件 * 执行事件
*
* @param evt 事件对象 * @param evt 事件对象
*/ */
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
@ -132,15 +126,15 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
bPane.setBorder(BorderFactory.createEmptyBorder(TOP_PADDING, 0, 0, 0)); bPane.setBorder(BorderFactory.createEmptyBorder(TOP_PADDING, 0, 0, 0));
final UIBasicSpinner columnSpinner = new UIBasicSpinner(); final UIBasicSpinner columnSpinner = new UIBasicSpinner();
final UIBasicSpinner rowSpinner = new UIBasicSpinner(); final UIBasicSpinner rowSpinner = new UIBasicSpinner();
Component[][] coms = new Component[][] { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("RWA-Row_Offset")), rowSpinner },{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("RWA-Column_Offset")), columnSpinner } }; Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("RWA-Row_Offset")), rowSpinner}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("RWA-Column_Offset")), columnSpinner}};
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
bPane.add(TableLayoutHelper.createTableLayoutPane(coms, new double[]{p, p}, new double[]{p, f}), BorderLayout.NORTH); bPane.add(TableLayoutHelper.createTableLayoutPane(coms, new double[]{p, p}, new double[]{p, f}), BorderLayout.NORTH);
BasicDialog dlg = bPane.showSmallWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this), new DialogActionAdapter() { BasicDialog dlg = bPane.showSmallWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this), new DialogActionAdapter() {
public void doOk() { public void doOk() {
int row_offset = ((Number)rowSpinner.getValue()).intValue(); int row_offset = ((Number) rowSpinner.getValue()).intValue();
int column_offset = ((Number)columnSpinner.getValue()).intValue(); int column_offset = ((Number) columnSpinner.getValue()).intValue();
KeyColumnTableModel model = (KeyColumnTableModel)keyColumnValuesTable.getModel(); KeyColumnTableModel model = (KeyColumnTableModel) keyColumnValuesTable.getModel();
int[] selectedRows = keyColumnValuesTable.getSelectedRows(); int[] selectedRows = keyColumnValuesTable.getSelectedRows();
// 如果一行都没选中,取所有的行 // 如果一行都没选中,取所有的行
if (selectedRows.length == 0) { if (selectedRows.length == 0) {
@ -150,7 +144,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
int row = selectedRows[i]; int row = selectedRows[i];
KeyColumnNameValue kcnv = model.getKeyColumnNameValue(row); KeyColumnNameValue kcnv = model.getKeyColumnNameValue(row);
if (kcnv.cv.obj instanceof ColumnRow) { if (kcnv.cv.obj instanceof ColumnRow) {
ColumnRow or = (ColumnRow)kcnv.cv.obj; ColumnRow or = (ColumnRow) kcnv.cv.obj;
int n_column = or.getColumn() + column_offset; int n_column = or.getColumn() + column_offset;
if (n_column < 0) { if (n_column < 0) {
n_column = 0; n_column = 0;
@ -180,6 +174,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
/** /**
* 执行事件 * 执行事件
*
* @param evt 事件s * @param evt 事件s
*/ */
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
@ -194,6 +189,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
/** /**
* 智能添加单元格组 * 智能添加单元格组
*
* @param e 事件s * @param e 事件s
*/ */
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -203,10 +199,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
/** /**
* 切换到单元格窗口，设置属性面板不可编辑 * 切换到单元格窗口，设置属性面板不可编辑
*
* @param isCellGroup 判断是否单元格组 * @param isCellGroup 判断是否单元格组
*/ */
private void showCellWindow(boolean isCellGroup){ private void showCellWindow(boolean isCellGroup) {
if (ePane == null) { if (ePane == null) {
return; return;
} }
@ -232,7 +229,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private void showDialogAfterAddCellAction() { private void showDialogAfterAddCellAction() {
Container dialog = this; Container dialog = this;
if (parentPane != null && parentPane.getContentDBManiPane() instanceof SmartInsertDBManipulationPane && parentPane.getContentDBManiPane() != this) { if (parentPane != null && parentPane.getContentDBManiPane() instanceof SmartInsertDBManipulationPane && parentPane.getContentDBManiPane() != this) {
((SmartInsertDBManipulationPane)parentPane.getContentDBManiPane()).showDialogAfterAddCellAction(); ((SmartInsertDBManipulationPane) parentPane.getContentDBManiPane()).showDialogAfterAddCellAction();
} }
while (dialog.getParent() != null) { while (dialog.getParent() != null) {
dialog = dialog.getParent(); dialog = dialog.getParent();
@ -254,7 +251,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private void hideDialog4AddCellAction() { private void hideDialog4AddCellAction() {
Container dialog = this; Container dialog = this;
if (parentPane != null && parentPane.getContentDBManiPane() instanceof SmartInsertDBManipulationPane && parentPane.getContentDBManiPane() != this) { if (parentPane != null && parentPane.getContentDBManiPane() instanceof SmartInsertDBManipulationPane && parentPane.getContentDBManiPane() != this) {
((SmartInsertDBManipulationPane)parentPane.getContentDBManiPane()).hideDialog4AddCellAction(); ((SmartInsertDBManipulationPane) parentPane.getContentDBManiPane()).hideDialog4AddCellAction();
} }
while (dialog.getParent() != null) { while (dialog.getParent() != null) {
dialog = dialog.getParent(); dialog = dialog.getParent();
@ -268,13 +265,14 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
/** /**
* 检测是否合法 * 检测是否合法
*
* @throws Exception * @throws Exception
*/ */
public void checkValid() throws Exception { public void checkValid() throws Exception {
KeyColumnTableModel model = (KeyColumnTableModel)keyColumnValuesTable.getModel(); KeyColumnTableModel model = (KeyColumnTableModel) keyColumnValuesTable.getModel();
int cnt = model.getRowCount(); int cnt = model.getRowCount();
int groupLength = -1; int groupLength = -1;
for (int i=0; i<cnt; i++) { for (int i = 0; i < cnt; i++) {
KeyColumnNameValue kcv = model.getKeyColumnNameValue(i); KeyColumnNameValue kcv = model.getKeyColumnNameValue(i);
Object val = kcv.cv.obj; Object val = kcv.cv.obj;
if (val instanceof ColumnRowGroup) { if (val instanceof ColumnRowGroup) {
@ -346,6 +344,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
/** /**
* 检查是否合法 * 检查是否合法
*
* @throws Exception * @throws Exception
*/ */
public void checkValid() throws Exception { public void checkValid() throws Exception {
@ -356,17 +355,17 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
@Override @Override
public void selectionChanged(SelectionEvent e) { public void selectionChanged(SelectionEvent e) {
KeyColumnTableModel model = (KeyColumnTableModel)table.getModel(); KeyColumnTableModel model = (KeyColumnTableModel) table.getModel();
if (editingRowIndex < 0 || editingRowIndex >= model.getRowCount()) { if (editingRowIndex < 0 || editingRowIndex >= model.getRowCount()) {
return; return;
} }
KeyColumnNameValue kcv = model.getKeyColumnNameValue(editingRowIndex); KeyColumnNameValue kcv = model.getKeyColumnNameValue(editingRowIndex);
ElementCasePane currentReportPane = (ElementCasePane)e.getSource(); ElementCasePane currentReportPane = (ElementCasePane) e.getSource();
Selection selection = currentReportPane.getSelection(); Selection selection = currentReportPane.getSelection();
if (selection == NO_SELECTION || selection instanceof FloatSelection) { if (selection == NO_SELECTION || selection instanceof FloatSelection) {
return; return;
} }
CellSelection cellselection = (CellSelection)selection; CellSelection cellselection = (CellSelection) selection;
kcv.cv.obj = ColumnRow.valueOf(cellselection.getColumn(), cellselection.getRow()); kcv.cv.obj = ColumnRow.valueOf(cellselection.getColumn(), cellselection.getRow());
if (editingRowIndex >= model.getRowCount() - 1) { if (editingRowIndex >= model.getRowCount() - 1) {
@ -387,17 +386,17 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private SelectionListener groupListener = new SelectionListener() { private SelectionListener groupListener = new SelectionListener() {
@Override @Override
public void selectionChanged(SelectionEvent e) { public void selectionChanged(SelectionEvent e) {
KeyColumnTableModel model = (KeyColumnTableModel)table.getModel(); KeyColumnTableModel model = (KeyColumnTableModel) table.getModel();
if (editingRowIndex < 0 || editingRowIndex >= model.getRowCount()) { if (editingRowIndex < 0 || editingRowIndex >= model.getRowCount()) {
return; return;
} }
KeyColumnNameValue kcv = model.getKeyColumnNameValue(editingRowIndex); KeyColumnNameValue kcv = model.getKeyColumnNameValue(editingRowIndex);
ElementCasePane currentReportPane = (ElementCasePane)e.getSource(); ElementCasePane currentReportPane = (ElementCasePane) e.getSource();
Selection selection = currentReportPane.getSelection(); Selection selection = currentReportPane.getSelection();
if (selection == NO_SELECTION || selection instanceof FloatSelection) { if (selection == NO_SELECTION || selection instanceof FloatSelection) {
return; return;
} }
CellSelection cellselection = (CellSelection)selection; CellSelection cellselection = (CellSelection) selection;
Object oriValue = kcv.cv.obj; Object oriValue = kcv.cv.obj;
ColumnRowGroup newValue = getColumnRowGroupValue(oriValue); ColumnRowGroup newValue = getColumnRowGroupValue(oriValue);
@ -415,7 +414,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (add.getSize() > 0) { if (add.getSize() > 0) {
newValue.addAll(add); newValue.addAll(add);
} else if (removeCount > 0) { } else if (removeCount > 0) {
newValue.splice(newValue.getSize()-removeCount, removeCount); newValue.splice(newValue.getSize() - removeCount, removeCount);
} }
kcv.cv.obj = newValue; kcv.cv.obj = newValue;
@ -428,7 +427,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private ColumnRowGroup getColumnRowGroupValue(Object oriValue) { private ColumnRowGroup getColumnRowGroupValue(Object oriValue) {
ColumnRowGroup newValue = new ColumnRowGroup(); ColumnRowGroup newValue = new ColumnRowGroup();
if (oriValue instanceof ColumnRowGroup) { if (oriValue instanceof ColumnRowGroup) {
newValue.addAll((ColumnRowGroup)oriValue); newValue.addAll((ColumnRowGroup) oriValue);
} else if (oriValue instanceof ColumnRow) { } else if (oriValue instanceof ColumnRow) {
newValue.addColumnRow((ColumnRow) oriValue); newValue.addColumnRow((ColumnRow) oriValue);
} }
@ -442,14 +441,14 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private int dealDragSelection(ColumnRowGroup add, CellSelection cellselection) { private int dealDragSelection(ColumnRowGroup add, CellSelection cellselection) {
int removeCount = 0; int removeCount = 0;
if (cellselection.getRowSpan() == oriCellSelection.getRowSpan() + 1) { if (cellselection.getRowSpan() == oriCellSelection.getRowSpan() + 1) {
for (int i=0; i<cellselection.getColumnSpan(); i++) { for (int i = 0; i < cellselection.getColumnSpan(); i++) {
add.addColumnRow(ColumnRow.valueOf( add.addColumnRow(ColumnRow.valueOf(
cellselection.getColumn() + i, cellselection.getRow() + cellselection.getRowSpan() -1)); cellselection.getColumn() + i, cellselection.getRow() + cellselection.getRowSpan() - 1));
} }
} else if (cellselection.getRowSpan() == oriCellSelection.getRowSpan() - 1) { } else if (cellselection.getRowSpan() == oriCellSelection.getRowSpan() - 1) {
removeCount = cellselection.getColumnSpan(); removeCount = cellselection.getColumnSpan();
} else if (cellselection.getColumnSpan() == oriCellSelection.getColumnSpan() + 1) { } else if (cellselection.getColumnSpan() == oriCellSelection.getColumnSpan() + 1) {
for (int i=0; i<cellselection.getRowSpan(); i++) { for (int i = 0; i < cellselection.getRowSpan(); i++) {
add.addColumnRow(ColumnRow.valueOf( add.addColumnRow(ColumnRow.valueOf(
cellselection.getColumn() + cellselection.getColumnSpan() - 1, cellselection.getRow() + i)); cellselection.getColumn() + cellselection.getColumnSpan() - 1, cellselection.getRow() + i));
} }
@ -462,9 +461,9 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
private void dealSelectColRow(ColumnRowGroup add, CellSelection se) { private void dealSelectColRow(ColumnRowGroup add, CellSelection se) {
int c = se.getColumn(), cs = se.getColumnSpan(), int c = se.getColumn(), cs = se.getColumnSpan(),
r = se.getRow(), rs = se.getRowSpan(); r = se.getRow(), rs = se.getRowSpan();
for (int i=0; i<cs; i++) { for (int i = 0; i < cs; i++) {
for (int j=0; j<rs; j++) { for (int j = 0; j < rs; j++) {
add.addColumnRow(ColumnRow.valueOf(c+i, r+j)); add.addColumnRow(ColumnRow.valueOf(c + i, r + j));
} }
} }
} }
@ -486,7 +485,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
} }
} }
updateUpdateCheckBoxEnable(); updateUpdateCheckBoxEnable();
((SmartInsertDBManipulationPane)dialog).showDialogAfterAddCellAction(); ((SmartInsertDBManipulationPane) dialog).showDialogAfterAddCellAction();
} }
}; };
@ -499,8 +498,8 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if (value instanceof ColumnValue) { if (value instanceof ColumnValue) {
if (((ColumnValue)value).obj != null) { if (((ColumnValue) value).obj != null) {
this.setText(((ColumnValue)value).obj.toString()); this.setText(((ColumnValue) value).obj.toString());
} else { } else {
this.setText(StringUtils.EMPTY); this.setText(StringUtils.EMPTY);
} }
@ -525,9 +524,10 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
if (value instanceof ColumnValue) { if (value instanceof ColumnValue) {
Object cv = ((ColumnValue) value).obj; Object cv = ((ColumnValue) value).obj;
if (cv instanceof ColumnRowGroup && ((ColumnRowGroup)cv).getSize() >= CELL_GROUP_LIMIT) { if (cv instanceof ColumnRowGroup && ((ColumnRowGroup) cv).getSize() >= CELL_GROUP_LIMIT) {
this.setText("[" + com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Has_Selected", "Classifier-Ge", "Cell"}, this.setText("[" +
new String[]{((ColumnRowGroup)cv).getSize()+StringUtils.EMPTY, StringUtils.EMPTY}) + "]"); Toolkit.i18nText("Fine-Design_Write_Select_Cell_Count", ((ColumnRowGroup) cv).getSize())
+ "]");
tip = cv.toString() + " " + tip; tip = cv.toString() + " " + tip;
} else if (cv != null) { } else if (cv != null) {
this.setText(cv.toString()); this.setText(cv.toString());

Write Preview
Loading…
Cancel
Save