Browse Source

无任务,pmd

master
yaoh.wu 8 years ago
parent
commit
8ce956556f
  1. 19
      designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  2. 10
      designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  3. 6
      designer_base/src/com/fr/design/locale/designer.properties
  4. 6
      designer_base/src/com/fr/design/locale/designer_en_US.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

19
designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java

@ -39,7 +39,8 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout());
this.setBorder(null);
UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Permissions",
"FR-Designer_Edit"})) {
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
@ -86,12 +87,12 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
private UILabel name = null;
private JPanel checkPane = null;
private List<ToolBarButton> buttonlists;
private UICheckBox buttonVisible = new UICheckBox(Inter.getLocText("Widget-Visible"));
private UICheckBox buttonVisible = new UICheckBox(Inter.getLocText("FR-Designer_Visible"));
private ItemListener itemListener = new ItemListener() {
public void itemStateChanged(ItemEvent e) {
String selectedRole = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
initSelectedPathArray();
if (ComparatorUtils.equals(selectedRole, Inter.getLocText("Role")) || selectedRole ==
if (ComparatorUtils.equals(selectedRole, Inter.getLocText("FR-Designer_Role")) || selectedRole ==
null || selectedPathArray == null) {
return;
}
@ -155,9 +156,10 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
private JPanel layoutText() {
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Type") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("WF-Name") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("DashBoard-Potence") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Type") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_WF_Name") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Permissions") + ":", SwingConstants
.RIGHT)},
};
double[] rowSize = {p, p, p};
double[] columnSize = {p};
@ -210,7 +212,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
if (name.getText() == "") {
type.setText("");
} else {
type.setText(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "Form-Button"}));
type.setText(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"}));
}
}
@ -235,7 +237,8 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Form-Button"), SwingConstants.LEFT), buttonVisible},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Form_Button"), SwingConstants.LEFT),
buttonVisible},
};
double[] rowSize = {p, p};
double[] columnSize = {p, p, f};

10
designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java

@ -249,13 +249,8 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
private boolean setAuthorityStyle(int type) {
initSelectedPathArray();
String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role"))) {
return false;
}
if (selectedRoles == null) {
return false;
}
if (selectedPathArray == null) {
if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Designer_Role")) ||
selectedRoles == null || selectedPathArray == null) {
return false;
}
final TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
@ -307,7 +302,6 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
if (selectionPaths.length == 1) {
if (((ExpandMutableTreeNode) (selectionPaths[0].getLastPathComponent())).getChildCount() > 0) {
ExpandMutableTreeNode node = (ExpandMutableTreeNode) ((ExpandMutableTreeNode) (selectionPaths[0].getLastPathComponent())).getLastChild();
System.out.printf(node.getUserObject().toString());
selectedPathArray = new String[node.getChildCount()];
for (int i = 0; i < node.getChildCount(); i++) {
ExpandMutableTreeNode n = (ExpandMutableTreeNode) node.getChildAt(i);

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

@ -1986,4 +1986,8 @@ FR-Designer_Edit_String_To_Formula=
FR-Base_UnSignIn=
Every=
CellWrite-Preview_Cell_Content=Preview Content of Cell
FormulaD-Data_Fields=Data Fields
FormulaD-Data_Fields=Data Fields
FR-Designer_Role=Role
FR-Designer_Permissions=Permissions
FR-Designer_Form_Button=Button
FR-Designer_WF_Name=Name

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

@ -1987,4 +1987,8 @@ FR-Designer_Edit_String_To_Formula=Edit String To Formula
FR-Base_UnSignIn=\ Not Logged In
Every=Every
CellWrite-Preview_Cell_Content=Content of Cell
FormulaD-Data_Fields=Data Items
FormulaD-Data_Fields=Data Items
FR-Designer_Role=Role
FR-Designer_Permissions=Permissions
FR-Designer_Form_Button=Button
FR-Designer_WF_Name=Name

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

@ -1982,4 +1982,8 @@ FR-Designer_Edit_String_To_Formula=\u662F\u5426\u5C06\u5B57\u7B26\u4E32\u7F16\u8
FR-Base_UnSignIn=\ \u672A\u767B\u5F55
Every=\u6BCF
CellWrite-Preview_Cell_Content=\u9884\u89C8\u5355\u5143\u683C\u5185\u5BB9
FormulaD-Data_Fields=\u6570\u636E\u9879
FormulaD-Data_Fields=\u6570\u636E\u9879
FR-Designer_Role=\u89D2\u8272
FR-Designer_Permissions=\u6743\u9650
FR-Designer_Form_Button=\u6309\u94AE
FR-Designer_WF_Name=\u540D\u79F0

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

@ -1982,4 +1982,8 @@ FR-Designer_Edit_String_To_Formula=\u662F\u5426\u5C07\u5B57\u5143\u4E32\u7DE8\u8
FR-Base_UnSignIn=\u672A\u767B\u9304
Every=\u6BCF
CellWrite-Preview_Cell_Content=\u9810\u89BD\u5132\u5B58\u683C\u5167\u5BB9
FormulaD-Data_Fields=\u8CC7\u6599\u9805
FormulaD-Data_Fields=\u8CC7\u6599\u9805
FR-Designer_Role=\u89D2\u8272
FR-Designer_Permissions=\u6B0A\u9650
FR-Designer_Form_Button=\u6309\u9215
FR-Designer_WF_Name=\u540D\u7A31
Loading…
Cancel
Save