Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public class TabIp6Ui extends Composite implements NetworkTab {
private static final String STATUS_LAN = "netIPv6StatusEnabledLAN";
private static final String STATUS_WAN = "netIPv6StatusEnabledWAN";
private static final String CONFIGURE_AUTO = "netIPv6MethodAuto";
private static final String CONFIGURE_DHCP = "netIPv6MethodDhcp";
private static final String CONFIGURE_MANUAL = "netIPv6MethodManual";
private static final String AUTOCONF_EUI64 = "netIPv6AddressGenModeEUI64";
private static final String AUTOCONF_STABLEPRIVACY = "netIPv6AddressGenModeStablePrivacy";
Expand Down Expand Up @@ -248,7 +247,6 @@ private void initStatusField() {

private void initConfigureField() {
this.configure.addItem(MessageUtils.get(CONFIGURE_AUTO), CONFIGURE_AUTO);
this.configure.addItem(MessageUtils.get(CONFIGURE_DHCP), CONFIGURE_DHCP);
this.configure.addItem(MessageUtils.get(CONFIGURE_MANUAL), CONFIGURE_MANUAL);

this.configure.addMouseOverHandler(event -> {
Expand Down Expand Up @@ -560,15 +558,13 @@ private void refreshFieldsBasedOnSelectedValues() {
this.dns.setText("");
}

if (this.configure.getSelectedValue().equals(CONFIGURE_AUTO)
|| this.configure.getSelectedValue().equals(CONFIGURE_DHCP)) {
if (this.configure.getSelectedValue().equals(CONFIGURE_AUTO)) {
this.ip.setEnabled(false);
this.subnet.setEnabled(false);
this.gateway.setEnabled(false);
}

if (this.configure.getSelectedValue().equals(CONFIGURE_MANUAL)
|| this.configure.getSelectedValue().equals(CONFIGURE_DHCP)) {
if (this.configure.getSelectedValue().equals(CONFIGURE_MANUAL)) {
this.autoconfiguration.setEnabled(false);
this.privacy.setEnabled(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ netIPv6StatusDisabled=Disabled
netIPv6StatusEnabledLAN=Enabled for LAN
netIPv6StatusEnabledWAN=Enabled for WAN

netIPv6MethodAuto=Stateless Address Auto-Configuration (SLAAC)
netIPv6MethodDhcp=Using DHCPv6
netIPv6MethodAuto=Auto
netIPv6MethodManual=Manually

netIPv6AddressGenModeEUI64=EUI64
Expand Down