Browse Source

Merge pull request #5 in BA/design from ~XIAXIANG/design:master to dev

* commit 'cefe497d0243d5bcd6c3d1d1b0098b0582c643ad':
  rt
  rt
  rt
  rt
  删除master中的版本构建时间标记,传错版本了
  增加版本构建时间标记
  增加版本构建标识
master
richie 9 years ago
parent
commit
ea46422d8b
  1. 6
      designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java
  2. 2
      designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
  3. 5
      designer_base/src/com/fr/design/extra/PluginFromStorePane.java
  4. 5
      designer_base/src/com/fr/design/extra/PluginUpdatePane.java

6
designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java

@ -225,10 +225,14 @@ public class BBSLoginDialog extends UIDialog {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip"));
}
public void tipForUsernameEmpty(){
private void tipForUsernameEmpty(){
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip"));
}
public void showTipForDownloadPluginWithoutLogin() {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip"));
}
private void tipForPasswordEmpty(){
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip"));
}

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

@ -81,7 +81,7 @@ public class UserInfoLabel extends UILabel{
bbsLoginDialog = new BBSLoginDialog(DesignerContext.getDesignerFrame(), UserInfoLabel.this);
}
bbsLoginDialog.clearLoginInformation();
bbsLoginDialog.tipForUsernameEmpty();
bbsLoginDialog.showTipForDownloadPluginWithoutLogin();
bbsLoginDialog.setModal(true);
bbsLoginDialog.showWindow();
}

5
designer_base/src/com/fr/design/extra/PluginFromStorePane.java

@ -184,6 +184,9 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<Plugin[],
}
private void doUpdateOnline(final PluginStatusCheckCompletePane pane) {
if (StringUtils.isEmpty(DesignerEnvManager.getEnvManager().getBBSName())){
LoginCheckContext.fireLoginCheckListener();
}
if (StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getBBSName())){
new SwingWorker<Void, Double>(){
@ -229,8 +232,6 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<Plugin[],
}
}
}.execute();
} else {
LoginCheckContext.fireLoginCheckListener();
}
}

5
designer_base/src/com/fr/design/extra/PluginUpdatePane.java

@ -165,6 +165,9 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
}
private void doUpdateOnline(final PluginStatusCheckCompletePane pane) {
if (StringUtils.isEmpty(DesignerEnvManager.getEnvManager().getBBSName())){
LoginCheckContext.fireLoginCheckListener();
}
if (StringUtils.isNotEmpty(DesignerEnvManager.getEnvManager().getBBSName())){
new SwingWorker<Void, Double>(){
@ -205,8 +208,6 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<Plugin[], Vo
}
}
}.execute();
} else {
LoginCheckContext.fireLoginCheckListener();
}
}

Loading…
Cancel
Save