diff -r f2358d18923a -r 1d9cb0d080e3 jdk/src/share/classes/java/net/NetworkInterface.java --- a/jdk/src/share/classes/java/net/NetworkInterface.java Mon Jul 29 19:36:54 2013 -0700 +++ b/jdk/src/share/classes/java/net/NetworkInterface.java Tue Jul 30 11:04:19 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,9 +98,9 @@ * Convenience method to return an Enumeration with all or a * subset of the InetAddresses bound to this network interface. *

- * If there is a security manager, its checkConnect + * If there is a security manager, its {@code checkConnect} * method is called for each InetAddress. Only InetAddresses where - * the checkConnect doesn't throw a SecurityException + * the {@code checkConnect} doesn't throw a SecurityException * will be returned in the Enumeration. However, if the caller has the * {@link NetPermission}("getNetworkInformation") permission, then all * InetAddresses are returned. @@ -154,15 +154,15 @@ } /** - * Get a List of all or a subset of the InterfaceAddresses + * Get a List of all or a subset of the {@code InterfaceAddresses} * of this network interface. *

- * If there is a security manager, its checkConnect + * If there is a security manager, its {@code checkConnect} * method is called with the InetAddress for each InterfaceAddress. - * Only InterfaceAddresses where the checkConnect doesn't throw + * Only InterfaceAddresses where the {@code checkConnect} doesn't throw * a SecurityException will be returned in the List. * - * @return a List object with all or a subset of the + * @return a {@code List} object with all or a subset of the * InterfaceAddresss of this network interface * @since 1.6 */ @@ -216,10 +216,10 @@ /** * Returns the parent NetworkInterface of this interface if this is - * a subinterface, or null if it is a physical + * a subinterface, or {@code null} if it is a physical * (non virtual) interface or has no parent. * - * @return The NetworkInterface this interface is attached to. + * @return The {@code NetworkInterface} this interface is attached to. * @since 1.6 */ public NetworkInterface getParent() { @@ -260,15 +260,15 @@ * @param name * The name of the network interface. * - * @return A NetworkInterface with the specified name, - * or null if there is no network interface + * @return A {@code NetworkInterface} with the specified name, + * or {@code null} if there is no network interface * with the specified name. * * @throws SocketException * If an I/O error occurs. * * @throws NullPointerException - * If the specified name is null. + * If the specified name is {@code null}. */ public static NetworkInterface getByName(String name) throws SocketException { if (name == null) @@ -303,17 +303,17 @@ * returned. * * @param addr - * The InetAddress to search with. + * The {@code InetAddress} to search with. * - * @return A NetworkInterface - * or null if there is no network interface + * @return A {@code NetworkInterface} + * or {@code null} if there is no network interface * with the specified IP address. * * @throws SocketException * If an I/O error occurs. * * @throws NullPointerException - * If the specified address is null. + * If the specified address is {@code null}. */ public static NetworkInterface getByInetAddress(InetAddress addr) throws SocketException { if (addr == null) { @@ -378,7 +378,7 @@ /** * Returns whether a network interface is up and running. * - * @return true if the interface is up and running. + * @return {@code true} if the interface is up and running. * @exception SocketException if an I/O error occurs. * @since 1.6 */ @@ -390,7 +390,7 @@ /** * Returns whether a network interface is a loopback interface. * - * @return true if the interface is a loopback interface. + * @return {@code true} if the interface is a loopback interface. * @exception SocketException if an I/O error occurs. * @since 1.6 */ @@ -404,7 +404,7 @@ * A typical point to point interface would be a PPP connection through * a modem. * - * @return true if the interface is a point to point + * @return {@code true} if the interface is a point to point * interface. * @exception SocketException if an I/O error occurs. * @since 1.6 @@ -417,7 +417,7 @@ /** * Returns whether a network interface supports multicasting or not. * - * @return true if the interface supports Multicasting. + * @return {@code true} if the interface supports Multicasting. * @exception SocketException if an I/O error occurs. * @since 1.6 */ @@ -432,7 +432,7 @@ * If a security manager is set, then the caller must have * the permission {@link NetPermission}("getNetworkInformation"). * - * @return a byte array containing the address, or null if + * @return a byte array containing the address, or {@code null} if * the address doesn't exist, is not accessible or a security * manager is set and the caller does not have the permission * NetPermission("getNetworkInformation") @@ -481,7 +481,7 @@ * can be several virtual interfaces attached to a single physical * interface. * - * @return true if this interface is a virtual interface. + * @return {@code true} if this interface is a virtual interface. * @since 1.6 */ public boolean isVirtual() { @@ -497,16 +497,16 @@ /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same NetworkInterface + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same NetworkInterface * as this object. *

- * Two instances of NetworkInterface represent the same + * Two instances of {@code NetworkInterface} represent the same * NetworkInterface if both name and addrs are the same for both. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InetAddress#getAddress() */ public boolean equals(Object obj) {