|
|
@ -75,7 +75,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> { |
|
|
|
private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); |
|
|
|
private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); |
|
|
|
private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); |
|
|
|
private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); |
|
|
|
private UILabel uiLabel = new UILabel(); |
|
|
|
private UILabel uiLabel = new UILabel(); |
|
|
|
private static final String IPV6_JUDGE_SYMBOL = "["; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 是否启用 https 勾选框 |
|
|
|
* 是否启用 https 勾选框 |
|
|
@ -210,9 +209,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> { |
|
|
|
|
|
|
|
|
|
|
|
private void actionURLInputChange() { |
|
|
|
private void actionURLInputChange() { |
|
|
|
remoteWorkspaceURL = new RemoteWorkspaceURL(remoteEnvURLInput.getText()); |
|
|
|
remoteWorkspaceURL = new RemoteWorkspaceURL(remoteEnvURLInput.getText()); |
|
|
|
if (remoteWorkspaceURL.getURL().contains(IPV6_JUDGE_SYMBOL)) { |
|
|
|
|
|
|
|
remoteWorkspaceURL.refreshIPV6Format(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
fillIndividualField(); |
|
|
|
fillIndividualField(); |
|
|
|
|
|
|
|
|
|
|
|
httpsCheckbox.setSelected(remoteWorkspaceURL.getHttps()); |
|
|
|
httpsCheckbox.setSelected(remoteWorkspaceURL.getHttps()); |
|
|
@ -329,10 +325,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> { |
|
|
|
this.remoteWorkspaceURL = Strings.isNullOrEmpty(connection.getUrl()) |
|
|
|
this.remoteWorkspaceURL = Strings.isNullOrEmpty(connection.getUrl()) |
|
|
|
? RemoteWorkspaceURL.createDefaultURL() |
|
|
|
? RemoteWorkspaceURL.createDefaultURL() |
|
|
|
: new RemoteWorkspaceURL(connection.getUrl()); |
|
|
|
: new RemoteWorkspaceURL(connection.getUrl()); |
|
|
|
//判断一下IP地址是不是IPV6的格式,如果是的话在拆分地址和端口的时候需要调整一下格式,用[ 或者 ] 判断
|
|
|
|
|
|
|
|
if (!Strings.isNullOrEmpty(connection.getUrl()) && connection.getUrl().contains(IPV6_JUDGE_SYMBOL)) { |
|
|
|
|
|
|
|
this.remoteWorkspaceURL.refreshIPV6Format(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
String username = fromNullable(connection.getUserName()).or(StringUtils.EMPTY); |
|
|
|
String username = fromNullable(connection.getUserName()).or(StringUtils.EMPTY); |
|
|
|
String pwd = fromNullable(connection.getPassword()).or(StringUtils.EMPTY); |
|
|
|
String pwd = fromNullable(connection.getPassword()).or(StringUtils.EMPTY); |
|
|
|
String certPath = fromNullable(connection.getCertPath()).or(StringUtils.EMPTY); |
|
|
|
String certPath = fromNullable(connection.getCertPath()).or(StringUtils.EMPTY); |
|
|
|