Browse Source

Merge pull request #663 in BA/design from ~LOY/design_fr:release to release

* commit 'cdb7de829520a8bfa2cbb2a1c3c6398b4e553f22':
  pmd的国际化字符串问题
  pmd
  com.dr.data.SubmitJob接口提示更改
master
neil 8 years ago
parent
commit
b3016b0e20
  1. 6
      designer_base/src/com/fr/design/locale/designer.properties
  2. 6
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  3. 6
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  4. 6
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  5. 6
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 6
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  7. 2
      designer_base/src/com/fr/design/write/submit/CustomJobPane.java

6
designer_base/src/com/fr/design/locale/designer.properties

@ -519,3 +519,9 @@ FR-Designer_FormulaPane_Search=Search
FR-Designer_Tab_carousel= FR-Designer_Tab_carousel=
FR-Designer_setCarousel= FR-Designer_setCarousel=
FR-Designer_carouselInterval= FR-Designer_carouselInterval=
FR-Designer_ClassName_panel=ClassName
FR-Designer_Description_panel=Description
FR-Designer_Edit_panel=Edit
FR-Designer_Property_panel=Property
FR-Designer_Select_panel=Select

6
designer_base/src/com/fr/design/locale/designer_en_US.properties

@ -519,3 +519,9 @@ FR-Designer_FormulaPane_Search=Search
FR-Designer_Tab_carousel= FR-Designer_Tab_carousel=
FR-Designer_setCarousel= FR-Designer_setCarousel=
FR-Designer_carouselInterval= FR-Designer_carouselInterval=
FR-Designer_ClassName_panel=Class Name
FR-Designer_Description_panel=Description
FR-Designer_Edit_panel=Edit
FR-Designer_Property_panel=Property
FR-Designer_Select_panel=Sel

6
designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@ -498,3 +498,9 @@ FR-Designer_FormulaPane_Search=\u691C\u7D22
FR-Designer_Tab_carousel= FR-Designer_Tab_carousel=
FR-Designer_setCarousel= FR-Designer_setCarousel=
FR-Designer_carouselInterval= FR-Designer_carouselInterval=
FR-Designer_ClassName_panel=\u985E\u540D
FR-Designer_Description_panel=\u8A18\u8FF0
FR-Designer_Edit_panel=\u7DE8\u96C6
FR-Designer_Property_panel=\u5C5E\u6027
FR-Designer_Select_panel=\u9078\u629E

6
designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@ -493,3 +493,9 @@ FR-Designer_FormulaPane_Search=\uAC80\uC0C9
FR-Designer_Tab_carousel= FR-Designer_Tab_carousel=
FR-Designer_setCarousel= FR-Designer_setCarousel=
FR-Designer_carouselInterval= FR-Designer_carouselInterval=
FR-Designer_ClassName_panel=\uD074\uB798\uC2A4\uB124\uC784
FR-Designer_Description_panel=\uC124\uBA85
FR-Designer_Edit_panel=\uD3B8\uC9D1
FR-Designer_Property_panel=\uC18D\uC131
FR-Designer_Select_panel=\uC120\uD0DD

6
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -523,3 +523,9 @@ FR-Designer_FormulaPane_Search=\u641C\u7D22
FR-Designer_Tab_carousel=tab\u8F6E\u64AD FR-Designer_Tab_carousel=tab\u8F6E\u64AD
FR-Designer_setCarousel=\u5F00\u542F\u8F6E\u64AD FR-Designer_setCarousel=\u5F00\u542F\u8F6E\u64AD
FR-Designer_carouselInterval=\u8F6E\u64AD\u95F4\u9694 FR-Designer_carouselInterval=\u8F6E\u64AD\u95F4\u9694
FR-Designer_ClassName_panel=\u7C7B\u540D
FR-Designer_Description_panel=\u63CF\u8FF0
FR-Designer_Edit_panel=\u7F16\u8F91
FR-Designer_Property_panel=\u5C5E\u6027
FR-Designer_Select_panel=\u9009\u62E9

6
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@ -511,3 +511,9 @@ FR-Designer_FormulaPane_Search=\u641C\u7D22
FR-Designer_Tab_carousel= FR-Designer_Tab_carousel=
FR-Designer_setCarousel= FR-Designer_setCarousel=
FR-Designer_carouselInterval= FR-Designer_carouselInterval=
FR-Designer_ClassName_panel=\u985E\u540D
FR-Designer_Description_panel=\u63CF\u8FF0
FR-Designer_Edit_panel=\u7DE8\u8F2F
FR-Designer_Property_panel=\u5C6C\u6027
FR-Designer_Select_panel=\u9078\u64C7

2
designer_base/src/com/fr/design/write/submit/CustomJobPane.java

@ -1 +1 @@
package com.fr.design.write.submit; import com.fr.data.AbstractClassJob; import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane; import com.fr.design.beans.BasicBeanPane; import com.fr.design.formula.JavaEditorPane; import com.fr.design.gui.frpane.ObjectProperiesPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.general.Inter; import com.fr.stable.StringUtils; import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; /** * Author : Shockway * Date: 13-7-29 * Time: 下午6:48 */ public abstract class CustomJobPane extends BasicBeanPane { protected UITextField classNameTextField; protected ObjectProperiesPane objectProperiesPane; public static final int DEFAULT_LENGTH = 30; public CustomJobPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); classNameTextField = new UITextField(getLengthOfTextField()); reportletNamePane.add(classNameTextField); UIButton browserButton = new UIButton(Inter.getLocText("Select")); browserButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); UIButton editButton = new UIButton(Inter.getLocText("Edit")); editButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); Select")); Select")); Select")); Select")); browserButton.setPreferredSize(new Dimension( public void actionPerformed(ActionEvent evt) { Select")); classNameTextField.getPreferredSize().height)); bPane.setClassPath(classNameTextField.getText()); Select")); UIButton editButton = new UIButton(Inter.getLocText("Edit")); SwingUtilities.getWindowAncestor(getWindowAncestor()), new DialogActionAdapter() { Select")); classNameTextField.getPreferredSize().height)); classNameTextField.setText(bPane.getClassPath()); checkAddButtonEnable(); } }).setVisible(true); } }); editButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_SUBMIT_JOB); final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(CustomJobPane.this), new DialogActionAdapter() { public void doOk() { classNameTextField.setText(javaEditorPane.getClassText()); browserButton.setPreferredSize(new Dimension( Select")); } }); javaEditorPane.addSaveActionListener(new ActionListener() { @Override browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, dlg.doOK(); } }); dlg.setVisible(true); } }); reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("ClassName"), null)); this.add(reportletNamePane, BorderLayout.NORTH); objectProperiesPane = new ObjectProperiesPane(); objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Property"), null)); this.add(objectProperiesPane, BorderLayout.CENTER); UITextArea area = new UITextArea(2, 1); Select")); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); browserButton.getPreferredSize().width, dsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Description"), null)); this.add(dsPane, BorderLayout.SOUTH); checkAddButtonEnable(); } browserButton.getPreferredSize().width, return DEFAULT_LENGTH; } protected String title4PopupWindow() { UIButton editButton = new UIButton(Inter.getLocText("Edit")); Select")); } protected Component getWindowAncestor() { return this; } UIButton editButton = new UIButton(Inter.getLocText("Edit")); classNameTextField.getPreferredSize().height)); public void populateBean(Object ob) { if (ob instanceof AbstractClassJob) { AbstractClassJob cj = (AbstractClassJob) ob; UIButton editButton = new UIButton(Inter.getLocText("Edit")); browserButton.getPreferredSize().width, UIButton editButton = new UIButton(Inter.getLocText("Edit")); classNameTextField.getPreferredSize().height)); editButton.setPreferredSize(new Dimension( editButton.setPreferredSize(new Dimension( Select")); editButton.setPreferredSize(new Dimension( editButton.setPreferredSize(new Dimension( browserButton.setPreferredSize(new Dimension( * 添加按钮可用 */ public void checkAddButtonEnable() { objectProperiesPane.enableAddButton(!StringUtils.isEmpty(classNameTextField.getText())); } /** * 重置 */ public void reset() { this.classNameTextField.setText(null); this.checkAddButtonEnable(); } } package com.fr.design.write.submit; import com.fr.data.AbstractClassJob; import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane; import com.fr.design.beans.BasicBeanPane; import com.fr.design.formula.JavaEditorPane; import com.fr.design.gui.frpane.ObjectProperiesPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.general.Inter; import com.fr.stable.StringUtils; import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; /** * Author : Shockway * Date: 13-7-29 * Time: 下午6:48 */ public abstract class CustomJobPane extends BasicBeanPane { protected UITextField classNameTextField; protected ObjectProperiesPane objectProperiesPane; public static final int DEFAULT_LENGTH = 30; public CustomJobPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); classNameTextField = new UITextField(getLengthOfTextField()); reportletNamePane.add(classNameTextField); UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select_panel")); browserButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); browserButton.getPreferredSize().width, Select")); browserButton.getPreferredSize().width, browserButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, UIButton editButton = new UIButton(Inter.getLocText("Edit")); browserButton.getPreferredSize().width, editButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); final ClassNameSelectPane bPane = new ClassNameSelectPane(); bPane.setClassPath(classNameTextField.getText()); bPane.showWindow( SwingUtilities.getWindowAncestor(getWindowAncestor()), new DialogActionAdapter() { classNameTextField.getPreferredSize().height)); classNameTextField.setText(bPane.getClassPath()); checkAddButtonEnable(); } }).setVisible(true); Select")); Select")); Select")); editButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { reportletNamePane.add(browserButton); Select")); UIButton editButton = new UIButton(Inter.getLocText("Edit")); new DialogActionAdapter() { public void doOk() { classNameTextField.setText(javaEditorPane.getClassText()); checkAddButtonEnable(); } }); reportletNamePane.add(editButton); browserButton.setPreferredSize(new Dimension( Select")); public void actionPerformed(ActionEvent evt) { Select")); Select")); classNameTextField.getPreferredSize().height)); Select")); bPane.setClassPath(classNameTextField.getText()); Select")); Select")); UIButton editButton = new UIButton(Inter.getLocText("Edit")); Select")); SwingUtilities.getWindowAncestor(getWindowAncestor()), Select")); new DialogActionAdapter() { Select")); Select")); classNameTextField.getPreferredSize().height)); Select")); classNameTextField.setText(bPane.getClassPath()); Select")); checkAddButtonEnable(); Select")); } Select")); }).setVisible(true); Select")); } Select")); }); Select")); editButton.addActionListener(new ActionListener() { Select")); @Override Select")); public void actionPerformed(ActionEvent e) { Select")); final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_SUBMIT_JOB); Select")); final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(CustomJobPane.this), Select")); new DialogActionAdapter() { Select")); public void doOk() { Select")); classNameTextField.setText(javaEditorPane.getClassText()); browserButton.getPreferredSize().width, Select")); Select")); } Select")); }); } Select")); javaEditorPane.addSaveActionListener(new ActionListener() { Select")); @Override public void actionPerformed(ActionEvent evt) { browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, Select")); protected Component getWindowAncestor() { Select")); dlg.doOK(); } Select")); } Select")); }); Select")); dlg.setVisible(true); Select")); } Select")); }); Select")); reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("ClassName"), null)); Select")); this.add(reportletNamePane, BorderLayout.NORTH); Select")); objectProperiesPane = new ObjectProperiesPane(); Select")); browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, browserButton.getPreferredSize().width, Select")); Select")); classNameTextField.getPreferredSize().height)); browserButton.getPreferredSize().width, final ClassNameSelectPane bPane = new ClassNameSelectPane(); classNameTextField.getPreferredSize().height)); bPane.setClassPath(classNameTextField.getText()); Select")); Select")); Select")); browserButton.setPreferredSize(new Dimension( Empty(classNameTextField.getText())); } /** * 重置 */ public void reset() { this.classNameTextField.setText(null); this.checkAddButtonEnable(); } }
Loading…
Cancel
Save