# HG changeset patch # User henryjen # Date 1401843057 25200 # Tue Jun 03 17:50:57 2014 -0700 # Node ID 2814e51f8da399cb7b8cfa14b377217282b54a85 # Parent b84aa47bbe0ea23d00c6e46437904774c4a69249 8044740: Convert all JDK versions used in @since tag to 1.n[.n] in jdk repo Reviewed-by: diff --git a/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java --- a/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -523,7 +523,7 @@ * that is used for menu shortcuts on this toolkit. * @see java.awt.MenuBar * @see java.awt.MenuShortcut - * @since JDK1.1 + * @since 1.1 */ @Override public int getMenuShortcutKeyMask() { diff --git a/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java b/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java --- a/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java +++ b/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java @@ -839,7 +839,7 @@ return parts; } - /** @since JDK 7, JSR 292 */ + /** @since 1.7, JSR 292 */ public static class MethodHandleEntry extends Entry { final int refKind; @@ -889,7 +889,7 @@ } } - /** @since JDK 7, JSR 292 */ + /** @since 1.7, JSR 292 */ public static class MethodTypeEntry extends Entry { final SignatureEntry typeRef; @@ -924,7 +924,7 @@ } } - /** @since JDK 7, JSR 292 */ + /** @since 1.7, JSR 292 */ public static class InvokeDynamicEntry extends Entry { final BootstrapMethodEntry bssRef; @@ -977,7 +977,7 @@ } } - /** @since JDK 7, JSR 292 */ + /** @since 1.7, JSR 292 */ public static class BootstrapMethodEntry extends Entry { final MethodHandleEntry bsmRef; diff --git a/src/share/classes/com/sun/java/util/jar/pack/package.html b/src/share/classes/com/sun/java/util/jar/pack/package.html --- a/src/share/classes/com/sun/java/util/jar/pack/package.html +++ b/src/share/classes/com/sun/java/util/jar/pack/package.html @@ -2,7 +2,7 @@
diff --git a/src/share/classes/com/sun/management/DiagnosticCommandMBean.java b/src/share/classes/com/sun/management/DiagnosticCommandMBean.java --- a/src/share/classes/com/sun/management/DiagnosticCommandMBean.java +++ b/src/share/classes/com/sun/management/DiagnosticCommandMBean.java @@ -212,7 +212,7 @@ * {@linkplain javax.management.Notification#getUserData() userData} that * is the new {@code MBeanInfo}. * - * @since 8 + * @since 1.8 */ public interface DiagnosticCommandMBean extends DynamicMBean { diff --git a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java --- a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java +++ b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java @@ -7697,7 +7697,7 @@ * @param columnIndex the first column is 1, the second is 2, ... * @return a SQLXML object that maps an SQL XML value * @throws SQLException if a database access error occurs - * @since 6.0 + * @since 1.6 */ public SQLXML getSQLXML(int columnIndex) throws SQLException { throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString()); @@ -7723,7 +7723,7 @@ * @return the column value if the value is a SQLNULL
the
* value returned is null
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public RowId getRowId(int columnIndex) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7738,7 +7738,7 @@
* @return the column value if the value is a SQL NULL
the
* value returned is null
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public RowId getRowId(String columnName) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7754,7 +7754,7 @@
* @param columnIndex the first column is 1, the second 2, ...
* @param x the column value
* @throws SQLException if a database access occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateRowId(int columnIndex, RowId x) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7770,7 +7770,7 @@
* @param columnName the name of the column
* @param x the column value
* @throws SQLException if a database access occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateRowId(String columnName, RowId x) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7780,7 +7780,7 @@
* Retrieves the holdability of this ResultSet object
* @return either ResultSet.HOLD_CURSORS_OVER_COMMIT or ResultSet.CLOSE_CURSORS_AT_COMMIT
* @throws SQLException if a database error occurs
- * @since 6.0
+ * @since 1.6
*/
public int getHoldability() throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7791,7 +7791,7 @@
* method close has been called on it, or if it is automatically closed.
* @return true if this ResultSet object is closed; false if it is still open
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public boolean isClosed() throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7803,7 +7803,7 @@
* @param columnIndex the first column is 1, the second 2, ...
* @param nString the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNString(int columnIndex, String nString) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7815,7 +7815,7 @@
* @param columnName name of the Column
* @param nString the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNString(String columnName, String nString) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7828,7 +7828,7 @@
* @param columnIndex the first column is 1, the second 2, ...
* @param nClob the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7840,7 +7840,7 @@
* @param columnName name of the column
* @param nClob the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNClob(String columnName, NClob nClob) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7855,7 +7855,7 @@
* @return a NClob
object representing the SQL
* NCLOB
value in the specified column
* @exception SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public NClob getNClob(int i) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
@@ -7871,7 +7871,7 @@
* @return a NClob
object representing the SQL NCLOB
* value in the specified column
* @exception SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public NClob getNClob(String colName) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("cachedrowsetimpl.opnotysupp").toString());
diff --git a/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java b/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
--- a/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
+++ b/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
@@ -4505,7 +4505,7 @@
* @param columnIndex the first column is 1, the second is 2, ...
* @return a SQLXML object that maps an SQL XML value
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public SQLXML getSQLXML(int columnIndex) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4531,7 +4531,7 @@
* @return the column value if the value is a SQL NULL
the
* value returned is null
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public RowId getRowId(int columnIndex) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4546,7 +4546,7 @@
* @return the column value if the value is a SQL NULL
the
* value returned is null
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public RowId getRowId(String columnName) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4562,7 +4562,7 @@
* @param columnIndex the first column is 1, the second 2, ...
* @param x the column value
* @throws SQLException if a database access occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateRowId(int columnIndex, RowId x) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4578,7 +4578,7 @@
* @param columnName the name of the column
* @param x the column value
* @throws SQLException if a database access occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateRowId(String columnName, RowId x) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4588,7 +4588,7 @@
* Retrieves the holdability of this ResultSet object
* @return either ResultSet.HOLD_CURSORS_OVER_COMMIT or ResultSet.CLOSE_CURSORS_AT_COMMIT
* @throws SQLException if a database error occurs
- * @since 6.0
+ * @since 1.6
*/
public int getHoldability() throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4599,7 +4599,7 @@
* method close has been called on it, or if it is automatically closed.
* @return true if this ResultSet object is closed; false if it is still open
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public boolean isClosed() throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4611,7 +4611,7 @@
* @param columnIndex the first column is 1, the second 2, ...
* @param nString the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNString(int columnIndex, String nString) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4623,7 +4623,7 @@
* @param columnName name of the Column
* @param nString the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNString(String columnName, String nString) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4636,7 +4636,7 @@
* @param columnIndex the first column is 1, the second 2, ...
* @param nClob the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4648,7 +4648,7 @@
* @param columnName name of the column
* @param nClob the value for the column to be updated
* @throws SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public void updateNClob(String columnName, NClob nClob) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4663,7 +4663,7 @@
* @return a NClob
object representing the SQL
* NCLOB
value in the specified column
* @exception SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public NClob getNClob(int i) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
@@ -4679,7 +4679,7 @@
* @return a NClob
object representing the SQL NCLOB
* value in the specified column
* @exception SQLException if a database access error occurs
- * @since 6.0
+ * @since 1.6
*/
public NClob getNClob(String colName) throws SQLException {
throw new SQLFeatureNotSupportedException(resBundle.handleGetObject("jdbcrowsetimpl.featnotsupp").toString());
diff --git a/src/share/classes/java/applet/Applet.java b/src/share/classes/java/applet/Applet.java
--- a/src/share/classes/java/applet/Applet.java
+++ b/src/share/classes/java/applet/Applet.java
@@ -45,7 +45,7 @@
*
* @author Arthur van Hoff
* @author Chris Warth
- * @since JDK1.0
+ * @since 1.0
*/
public class Applet extends Panel {
@@ -375,7 +375,7 @@
*
* @return the locale of the applet; if no locale has
* been set, the default locale is returned.
- * @since JDK1.1
+ * @since 1.1
*/
public Locale getLocale() {
Locale locale = super.getLocale();
diff --git a/src/share/classes/java/applet/AppletContext.java b/src/share/classes/java/applet/AppletContext.java
--- a/src/share/classes/java/applet/AppletContext.java
+++ b/src/share/classes/java/applet/AppletContext.java
@@ -43,7 +43,7 @@
* information about its environment.
*
* @author Arthur van Hoff
- * @since JDK1.0
+ * @since 1.0
*/
public interface AppletContext {
/**
diff --git a/src/share/classes/java/applet/AppletStub.java b/src/share/classes/java/applet/AppletStub.java
--- a/src/share/classes/java/applet/AppletStub.java
+++ b/src/share/classes/java/applet/AppletStub.java
@@ -35,7 +35,7 @@
*
* @author Arthur van Hoff
* @see java.applet.Applet#setStub(java.applet.AppletStub)
- * @since JDK1.0
+ * @since 1.0
*/
public interface AppletStub {
/**
diff --git a/src/share/classes/java/applet/AudioClip.java b/src/share/classes/java/applet/AudioClip.java
--- a/src/share/classes/java/applet/AudioClip.java
+++ b/src/share/classes/java/applet/AudioClip.java
@@ -32,7 +32,7 @@
* together to produce a composite.
*
* @author Arthur van Hoff
- * @since JDK1.0
+ * @since 1.0
*/
public interface AudioClip {
/**
diff --git a/src/share/classes/java/applet/package.html b/src/share/classes/java/applet/package.html
--- a/src/share/classes/java/applet/package.html
+++ b/src/share/classes/java/applet/package.html
@@ -31,8 +31,8 @@
uses to communicate with its applet context.
The applet framework involves two -entities: the applet and the applet context. An applet is an -embeddable window (see the Panel class) with a few extra methods that the applet +entities: the applet and the applet context. An applet is an +embeddable window (see the Panel class) with a few extra methods that the applet context can use to initialize, start, and stop the applet.
The applet context is an application that is responsible for loading and running @@ -55,6 +55,6 @@ --> -@since JDK1.0 +@since 1.0