Browse Source

Merge pull request #587 in BA/design from ~VITO/design:master to master

* commit '86bea80f192d53f286b25b423a78d8c350a72565':
  REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
master
superman 8 years ago
parent
commit
2d164d9a82
  1. 8
      designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java

8
designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -18,6 +18,7 @@ import com.fr.general.Inter;
import com.fr.general.SiteCenter;
import com.fr.general.http.HttpClient;
import com.fr.stable.EncodeConstants;
import com.fr.stable.OperatingSystem;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
@ -34,7 +35,6 @@ import java.util.HashMap;
/**
* @author neil
*
* @date: 2015-3-4-上午9:05:52
*/
public class UserInfoLabel extends UILabel {
@ -139,7 +139,8 @@ public class UserInfoLabel extends UILabel{
@Override
public void run() {
if(!FRContext.isChineseEnv()){
// vito:最新mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
if (!FRContext.isChineseEnv() || OperatingSystem.isMacOS()) {
return;
}
String lastBBSNewsTime = DesignerEnvManager.getEnvManager().getLastShowBBSNewsTime();
@ -185,7 +186,6 @@ public class UserInfoLabel extends UILabel{
/**
* 重置当前用户名
*
*/
public void resetUserName() {
this.userName = StringUtils.EMPTY;
@ -271,7 +271,7 @@ public class UserInfoLabel extends UILabel{
public void mouseEntered(MouseEvent e) {
UserInfoLabel.this.setCursor(new Cursor(Cursor.HAND_CURSOR));
};
}
@Override
public void mouseClicked(MouseEvent e) {

Loading…
Cancel
Save