--- a/jdk/src/share/classes/javax/sound/sampled/CompoundControl.java Wed Jun 04 16:55:06 2014 +0400
+++ b/jdk/src/share/classes/javax/sound/sampled/CompoundControl.java Wed Jun 04 17:14:56 2014 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -26,55 +26,37 @@
package javax.sound.sampled;
/**
- * A <code>CompoundControl</code>, such as a graphic equalizer, provides control
- * over two or more related properties, each of which is itself represented as
- * a <code>Control</code>.
+ * A {@code CompoundControl}, such as a graphic equalizer, provides control over
+ * two or more related properties, each of which is itself represented as a
+ * {@code Control}.
*
* @author Kara Kytle
* @since 1.3
*/
public abstract class CompoundControl extends Control {
-
- // TYPE DEFINES
-
-
- // INSTANCE VARIABLES
-
-
/**
* The set of member controls.
*/
private Control[] controls;
-
-
- // CONSTRUCTORS
-
-
/**
* Constructs a new compound control object with the given parameters.
*
- * @param type the type of control represented this compound control object
- * @param memberControls the set of member controls
+ * @param type the type of control represented this compound control object
+ * @param memberControls the set of member controls
*/
protected CompoundControl(Type type, Control[] memberControls) {
-
super(type);
this.controls = memberControls;
}
-
-
- // METHODS
-
-
/**
* Returns the set of member controls that comprise the compound control.
- * @return the set of member controls.
+ *
+ * @return the set of member controls
*/
public Control[] getMemberControls() {
-
Control[] localArray = new Control[controls.length];
for (int i = 0; i < controls.length; i++) {
@@ -84,14 +66,12 @@
return localArray;
}
-
- // ABSTRACT METHOD IMPLEMENTATIONS: CONTROL
-
-
/**
- * Provides a string representation of the control
+ * Provides a string representation of the control.
+ *
* @return a string description
*/
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
@@ -108,13 +88,9 @@
return new String(getType() + " Control containing " + buf + " Controls.");
}
-
- // INNER CLASSES
-
-
/**
- * An instance of the <code>CompoundControl.Type</code> inner class identifies one kind of
- * compound control. Static instances are provided for the
+ * An instance of the {@code CompoundControl.Type} inner class identifies
+ * one kind of compound control. Static instances are provided for the
* common types.
*
* @author Kara Kytle
@@ -122,19 +98,13 @@
*/
public static class Type extends Control.Type {
-
- // TYPE DEFINES
-
- // CONSTRUCTOR
-
-
/**
* Constructs a new compound control type.
- * @param name the name of the new compound control type
+ *
+ * @param name the name of the new compound control type
*/
- protected Type(String name) {
+ protected Type(final String name) {
super(name);
}
- } // class Type
-
-} // class CompoundControl
+ }
+}