Browse Source

Merge pull request #1293 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'b9b17af01f608d8db3b9755e097f591c6ada30c8':
  无JIRA任务,去掉冗余代码(功能重复,且没有做国际化)
  REPORT-4769 选中一个单元格,点击左对齐,切换另一个单元格对齐高亮没有消失
master
superman 7 years ago
parent
commit
20e71ff488
  1. 2
      designer/src/com/fr/design/actions/ButtonGroupAction.java
  2. 12
      designer_base/src/com/fr/design/DesignerEnvManager.java

2
designer/src/com/fr/design/actions/ButtonGroupAction.java

@ -36,7 +36,7 @@ public abstract class ButtonGroupAction extends ElementCaseAction{
break;
}
}
if(value == -1 && createToolBarComponent().hasClick()) {
if(createToolBarComponent().hasClick()) {
index = getSelectedIndex();
createToolBarComponent().setClickState(false);
}

12
designer_base/src/com/fr/design/DesignerEnvManager.java

@ -1479,18 +1479,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
}
});
// xml读完之后,看一下nameEnvMap是不是长度为0
if (nameEnvMap.isEmpty() && StableUtils.getInstallHome() != null) {
String install_home = StableUtils.getInstallHome();
if (install_home != null && new java.io.File(install_home).exists()) {
nameEnvMap.put("Default", LocalEnv.createEnv(StableUtils.pathJoin(new String[]{
install_home, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME
})));
curEnvName = "Default";
}
}
}
private void readRecentOpenFileList(XMLableReader reader) {

Loading…
Cancel
Save