Browse Source

Merge pull request #1630 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'bb8323bc62c236d29f9348a6b7dcb89865fe8cd9':
  REPORT-28242 加个判断
feature/big-screen
vito 5 years ago
parent
commit
2c53802b33
  1. 3
      designer-realize/src/main/java/com/fr/design/present/StyleArrayPane.java

3
designer-realize/src/main/java/com/fr/design/present/StyleArrayPane.java

@ -4,6 +4,7 @@ import com.fr.base.Style;
import com.fr.config.ServerPreferenceConfig; import com.fr.config.ServerPreferenceConfig;
import com.fr.config.StyleMap; import com.fr.config.StyleMap;
import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.NameInspector;
import com.fr.design.gui.controlpane.AbstractNameableCreator; import com.fr.design.gui.controlpane.AbstractNameableCreator;
import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
@ -35,7 +36,7 @@ public class StyleArrayPane extends JListControlPane {
super(); super();
this.addModNameActionListener(new ModNameActionListener() { this.addModNameActionListener(new ModNameActionListener() {
public void nameModed(int index, String oldName, String newName) { public void nameModed(int index, String oldName, String newName) {
if (ComparatorUtils.equals(oldName, newName)) { if (ComparatorUtils.equals(oldName, newName) || ComparatorUtils.equals(newName, NameInspector.ILLEGAL_NAME_HOLDER)) {
return; return;
} }
namePermitted = true; namePermitted = true;

Loading…
Cancel
Save