Browse Source

Merge pull request #528 in BA/design from ~NEIL/design:master to master

* commit '5238a07606504cb04bbc74d4cdb6b7809a4c2c26':
  无JIRA任务, 代码还原
master
superman 8 years ago
parent
commit
3753ac8236
  1. 10
      designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

10
designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -27,7 +27,6 @@ import com.fr.file.FILE;
import com.fr.file.FileNodeFILE; import com.fr.file.FileNodeFILE;
import com.fr.file.filetree.FileNode; import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.CoreConstants; import com.fr.stable.CoreConstants;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
@ -43,7 +42,6 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -414,13 +412,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel")); UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel"));
// mod by anchore 16/11/16 cancelButton.setBounds(250, 90, 60, 25);
if (ComparatorUtils.equals(Locale.JAPAN, GeneralContext.getLocale())) {
cancelButton.setBounds(250, 90, 80, 25);
} else {
cancelButton.setBounds(180, 90, 80, 25);
}
//cancelButton.setBounds(250, 90, 60, 25);
cancelButton.addActionListener(new ActionListener() { cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
jd.dispose(); jd.dispose();

Loading…
Cancel
Save