Browse Source

REPORT-51958 远程环境检测及同步

feature/10.0
pengda 4 years ago
parent
commit
80fdf1f17d
  1. 2
      designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
  2. 7
      designer-base/src/main/java/com/fr/env/VersionCheckMessageDialog.java

2
designer-base/src/main/java/com/fr/env/CheckServiceDialog.java vendored

@ -312,7 +312,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
String[] option = {Toolkit.i18nText("Fine-Design_Report_Yes"), Toolkit.i18nText("Fine-Design_Report_No")}; String[] option = {Toolkit.i18nText("Fine-Design_Report_Yes"), Toolkit.i18nText("Fine-Design_Report_No")};
int a = JOptionPane.showOptionDialog(getParent(), Toolkit.i18nText("Fine-Design_Basic_Sync_Info_Information"), int a = FineJOptionPane.showOptionDialog(getParent(), Toolkit.i18nText("Fine-Design_Basic_Sync_Info_Information"),
Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, QUESTION_MESSAGE, IOUtils.readIcon("com/fr/design/icon/versioncheck/question.png"), option, 1); Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, QUESTION_MESSAGE, IOUtils.readIcon("com/fr/design/icon/versioncheck/question.png"), option, 1);
if (0 == a) { if (0 == a) {
//jar包一致的话只更新插件 //jar包一致的话只更新插件

7
designer-base/src/main/java/com/fr/env/VersionCheckMessageDialog.java vendored

@ -73,9 +73,11 @@ public class VersionCheckMessageDialog extends JDialog implements ActionListener
}else{ }else{
noExistServiceDescription = VersionCheckUtils.getNoExistServiceDescription(this.envName); noExistServiceDescription = VersionCheckUtils.getNoExistServiceDescription(this.envName);
} }
detailPanel.addMouseListener(new MouseAdapter() { detailPanel.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
hideDialog();
CheckServiceDialog checkServiceDialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), localBranch, remoteBranch, noExistServiceDescription); CheckServiceDialog checkServiceDialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), localBranch, remoteBranch, noExistServiceDescription);
checkServiceDialog.setVisible(true); checkServiceDialog.setVisible(true);
} }
@ -92,9 +94,12 @@ public class VersionCheckMessageDialog extends JDialog implements ActionListener
GUICoreUtils.centerWindow(this); GUICoreUtils.centerWindow(this);
} }
private void hideDialog(){
this.dispose();
}
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
this.dispose(); hideDialog();
} }
} }

Loading…
Cancel
Save