REPORT-6700 部分规范

designer-base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -227,8 +227,7 @@ public abstract class ToolBarMenuDock {
         menuList.addAll(Arrays.asList(menuDefs));
 
         // 添加服务器菜单
-        // todo 远程设计isRoot 总是返回false,先处理一下
+        if (FRContext.getCurrentEnv() != null && FRContext.getCurrentEnv().isRoot()) {
-        if (FRContext.getCurrentEnv() != null && !FRContext.getCurrentEnv().isRoot()) {
             menuList.add(createServerMenuDef(plus));
         }
 
@@ -445,8 +444,7 @@ public abstract class ToolBarMenuDock {
     }
 
     private boolean shouldShowRemotePermission() {
-        // todo 远程设计 isRoot 总是返回 false 先处理一下
+        return FRContext.getCurrentEnv() != null && !FRContext.getCurrentEnv().isLocalEnv() && FRContext.getCurrentEnv().isRoot();
-        return FRContext.getCurrentEnv() != null && !FRContext.getCurrentEnv().isLocalEnv() && !FRContext.getCurrentEnv().isRoot();
     }
 
     protected boolean shouldShowPlugin() {

designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -21,7 +21,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
 
 
     public RemoteDesignAuthorityManagerAction() {
-        this.setName(Inter.getLocText("FR-Designer_Remote_Design_Authority_Manager"));
+        this.setName(Inter.getLocText("Fine-Designer_Remote_Design_Authority_Manager"));
         this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png"));
     }
 

designer-base/src/com/fr/design/remote/ui/AuthorityEditorPane.java

@@ -46,7 +46,7 @@ public class AuthorityEditorPane extends BasicBeanPane<DesignAuthority> {
 
     @Override
     protected String title4PopupWindow() {
-        return Inter.getLocText("FR-Designer_Remote_Design_Configure_Authority");
+        return Inter.getLocText("Fine-Designer_Remote_Design_Configure_Authority");
     }
 
     @Override

designer-base/src/com/fr/design/remote/ui/AuthorityListControlPane.java

@@ -70,7 +70,7 @@ public class AuthorityListControlPane extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.authorityCreators = new RemoteDesignAuthorityCreator[]{
                 new RemoteDesignAuthorityCreator(
-                        Inter.getLocText("FR-Designer_Remote_Design_User"),
+                        Inter.getLocText("Fine-Designer_Remote_Design_User"),
                         BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"),
                         DesignAuthority.class,
                         AuthorityEditorPane.class)

designer-base/src/com/fr/design/remote/ui/AuthorityManagerPane.java

@@ -6,7 +6,6 @@ import com.fr.report.DesignAuthority;
 
 import javax.swing.BorderFactory;
 import java.awt.BorderLayout;
-import java.util.Arrays;
 
 public class AuthorityManagerPane extends BasicPane {
 
@@ -24,7 +23,7 @@ public class AuthorityManagerPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return Inter.getLocText("FR-Designer_Remote_Design_Authority_Manager");
+        return Inter.getLocText("Fine-Designer_Remote_Design_Authority_Manager");
     }
 
     public void populate(DesignAuthority[] authorities) {

designer-base/src/com/fr/design/remote/ui/UserManagerPane.java

@@ -115,7 +115,7 @@ public class UserManagerPane extends BasicPane {
             sync2AddedMembersFormAdded();
             // 不需要重复更新右侧列表显示 但是更新一下计数显示
             countLabel.setText(
-                    Inter.getLocText("FR-Designer_Remote_Design_Selected_Member_Count",
+                    Inter.getLocText("Fine-Designer_Remote_Design_Selected_Member_Count",
                             String.valueOf(addedMembers.size())
                     )
             );
@@ -145,7 +145,7 @@ public class UserManagerPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return Inter.getLocText("FR-Designer_Remote_Design_Add_Member");
+        return Inter.getLocText("Fine-Designer_Remote_Design_Add_Member");
     }
 
     private JPanel createLeftPanel() {
@@ -155,7 +155,7 @@ public class UserManagerPane extends BasicPane {
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
                         UITitledBorder.createBorderWithTitle(
-                                Inter.getLocText("FR-Designer_Remote_Design_Decision_Member")
+                                Inter.getLocText("Fine-Designer_Remote_Design_Decision_Member")
                         )
                 )
         );
@@ -166,7 +166,7 @@ public class UserManagerPane extends BasicPane {
         keyField.setPreferredSize(new Dimension(250, 20));
         keyField.requestFocus();
         keyField.addKeyListener(keyFieldKeyListener);
-        keyButton.setText(Inter.getLocText("FR-Designer_Remote_Design_Search"));
+        keyButton.setText(Inter.getLocText("Fine-Designer_Remote_Design_Search"));
         keyButton.addActionListener(keyButtonActionListener);
         searchPanel.add(keyField);
         searchPanel.add(keyButton);
@@ -195,14 +195,14 @@ public class UserManagerPane extends BasicPane {
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
                         UITitledBorder.createBorderWithTitle(
-                                Inter.getLocText("FR-Designer_Remote_Design_Selected_Member")
+                                Inter.getLocText("Fine-Designer_Remote_Design_Selected_Member")
                         )
                 )
         );
 
         // 计数
         countLabel.setText(
-                Inter.getLocText("FR-Designer_Remote_Design_Selected_Member_Count",
+                Inter.getLocText("Fine-Designer_Remote_Design_Selected_Member_Count",
                         String.valueOf(addedMembers.size()))
         );
         countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0));
@@ -248,7 +248,7 @@ public class UserManagerPane extends BasicPane {
         addedList.revalidate();
         addedList.repaint();
         countLabel.setText(
-                Inter.getLocText("FR-Designer_Remote_Design_Selected_Member_Count",
+                Inter.getLocText("Fine-Designer_Remote_Design_Selected_Member_Count",
                         String.valueOf(addedMembers.size())
                 ));
     }