You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2010/11/13 22:28:53 UTC
svn commit: r1034884 - in /incubator/river/jtsk/trunk/src/com/sun/jini:
mercury/ norm/ outrigger/
Author: sijskes
Date: Sat Nov 13 21:28:51 2010
New Revision: 1034884
URL: http://svn.apache.org/viewvc?rev=1034884&view=rev
Log:
fixed javadoc and imports
Modified:
incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java
incubator/river/jtsk/trunk/src/com/sun/jini/mercury/RemoteEventIteratorData.java
incubator/river/jtsk/trunk/src/com/sun/jini/norm/LeaseTable.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/OutriggerAdmin.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/RepEnum.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SnapshotRep.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SpaceProxy2.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/ThrowThis.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitor.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitorTask.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TypeTree.java
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java Sat Nov 13 21:28:51 2010
@@ -4426,10 +4426,8 @@ class MailboxImpl implements MailboxBack
*
* Note that event state is kept separately and maintained by the
* event logging mechanism.
- *
- * @see Mailbox.LocalLogHandler
*/
-
+ //@see Mailbox.LocalLogHandler
private void takeSnapshot(OutputStream out) throws IOException {
if (operationsLogger.isLoggable(Level.FINER)) {
operationsLogger.entering(mailboxSourceClass,
@@ -4475,9 +4473,8 @@ class MailboxImpl implements MailboxBack
* from the snapshot file; and then modifying that base state according
* to the records retrieved from the log file. This method is invoked to
* perform the first step in that reconstruction.
- *
- * @see Mailbox.LocalLogHandler
*/
+ // @see Mailbox.LocalLogHandler
private void recoverSnapshot(InputStream in)
throws IOException, ClassNotFoundException
{
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mercury/RemoteEventIteratorData.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mercury/RemoteEventIteratorData.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mercury/RemoteEventIteratorData.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/RemoteEventIteratorData.java Sat Nov 13 21:28:51 2010
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mercury;
import java.io.Serializable;
@@ -41,9 +42,7 @@ class RemoteEventIteratorData implements
/**
* Creates a new RemoteEventIteratorData instance.
* @param uuid value of <code>uuid</code> field.
- * @param reps value of <code>events</code> field.
- * @param intialLeaseDuration value of <code>intialLeaseDuration</code>
- * field.
+ * @param events value of <code>events</code> field.
*/
RemoteEventIteratorData(Uuid uuid, Collection events) {
this.uuid = uuid;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/norm/LeaseTable.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/norm/LeaseTable.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/norm/LeaseTable.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/norm/LeaseTable.java Sat Nov 13 21:28:51 2010
@@ -71,7 +71,7 @@ class LeaseTable {
* Add a mapping from lease wrapper to client lease. Gets client
* lease from wrapper.
*
- * @param wrapper client lease wrapper, and client lease to add to
+ * @param clw client lease wrapper, and client lease to add to
* table
*/
void put(ClientLeaseWrapper clw) {
@@ -85,7 +85,7 @@ class LeaseTable {
/**
* Remove a lease from the table.
*
- * @param wrapper client lease wrapper for the lease we want to
+ * @param clw client lease wrapper for the lease we want to
* remove
*/
void remove(ClientLeaseWrapper clw) {
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java Sat Nov 13 21:28:51 2010
@@ -502,7 +502,7 @@ class EntryRep implements StorableResour
* an object of the same class with the same values for each field.
* This is <em>not</em> a template match -- see <code>matches</code>.
*
- * @see matches
+ * @see #matches
*/
public boolean equals(Object o) {
// The other passed in was null--obviously not equal
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java Sat Nov 13 21:28:51 2010
@@ -50,8 +50,8 @@ import com.sun.jini.logging.Levels;
* @author Sun Microsystems, Inc.
*
* @see JoinManager
- * @see JoinAdminState
*/
+// @see JoinAdminState
class JoinStateManager implements StorableObject {
/** <code>ProxyPreparer</code> for <code>LookupLocators</code> */
private ProxyPreparer lookupLocatorPreparer;
@@ -532,8 +532,8 @@ class JoinStateManager implements Storab
* <p>
* Packages each attribute in its own <code>MarshalledObject</code> so
* a bad codebase on an attribute class will not corrupt the whole array.
- * @see JoinAdminActivationState#readAttributes
- */
+ */
+ // @see JoinAdminActivationState#readAttributes
static private void writeAttributes(Entry[] attributes,
ObjectOutputStream out)
throws IOException
@@ -558,9 +558,8 @@ class JoinStateManager implements Storab
* Will try and recover as many attributes as possible.
* Attributes which can't be recovered won't be returned but they
* will remain in the log.
- *
- * @see JoinAdminActivationState#writeAttributes
- */
+ */
+ // @see JoinAdminActivationState#writeAttributes
static private Entry[] readAttributes(ObjectInputStream in)
throws IOException, ClassNotFoundException
{
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/OutriggerAdmin.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/OutriggerAdmin.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/OutriggerAdmin.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/OutriggerAdmin.java Sat Nov 13 21:28:51 2010
@@ -35,9 +35,9 @@ import net.jini.space.JavaSpace;
*
* @author Sun Microsystems, Inc.
*
- * @see OutriggerServerImpl#AdminProxy
* @see JavaSpaceAdmin
*/
+// @see OutriggerServerImpl#AdminProxy
interface OutriggerAdmin extends Remote, DestroyAdmin, JoinAdmin {
/** Return the space administered by this object. */
JavaSpace space() throws RemoteException;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/RepEnum.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/RepEnum.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/RepEnum.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/RepEnum.java Sat Nov 13 21:28:51 2010
@@ -24,8 +24,8 @@ package com.sun.jini.outrigger;
* @author Sun Microsystems, Inc.
*
* @see EntryHolder#contents
- * @see OutriggerServerImpl#AllReps
*/
+// * @see OutriggerServerImpl#AllReps
interface RepEnum {
/**
* Return the next <code>EntryRep</code> object, or <code>null</code>
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SnapshotRep.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SnapshotRep.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SnapshotRep.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SnapshotRep.java Sat Nov 13 21:28:51 2010
@@ -66,8 +66,8 @@ import net.jini.core.entry.Entry;
*
* @author Sun Microsystems, Inc.
*
- * @see SpaceProxy#snapshot
*/
+// @see SpaceProxy#snapshot
class SnapshotRep implements Entry {
static final long serialVersionUID = 5126328162389368097L;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SpaceProxy2.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SpaceProxy2.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SpaceProxy2.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/SpaceProxy2.java Sat Nov 13 21:28:51 2010
@@ -68,8 +68,8 @@ import com.sun.jini.landlord.LandlordLea
*
* @author Sun Microsystems, Inc.
*
- * @see OutriggerSpace
*/
+// @see OutriggerSpace
class SpaceProxy2 implements JavaSpace05, Administrable, ReferentUuid,
Serializable
{
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/ThrowThis.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/ThrowThis.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/ThrowThis.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/ThrowThis.java Sat Nov 13 21:28:51 2010
@@ -23,8 +23,8 @@ package com.sun.jini.outrigger;
*
* @author Sun Microsystems, Inc.
*
- * @see SpaceProxy
*/
+// @see SpaceProxy
class ThrowThis implements java.io.Serializable {
static final long serialVersionUID = -7432214583908049814L;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitor.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitor.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitor.java Sat Nov 13 21:28:51 2010
@@ -67,10 +67,10 @@ class TxnMonitor implements Runnable {
* doesn't have to wait for all the setup before returning -- it
* just puts the data on this list and the <code>TxnMonitor</code>
* pulls it off using its own thread.
- *
- * @see #ToMonitor
+ *
* @see OutriggerServerImpl#getMatch
*/
+ // @see #ToMonitor
private LinkedList pending = new LinkedList();
/** wakeup manager for <code>TxnMonitorTask</code>s */
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitorTask.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitorTask.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitorTask.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TxnMonitorTask.java Sat Nov 13 21:28:51 2010
@@ -231,8 +231,8 @@ class TxnMonitorTask extends RetryTask
* all), we simply add each lease in this task to the monitor's
* queue.
*
- * @see TxnEntryHandle#monitor
*/
+ // @see TxnEntryHandle#monitor
//!! Would it be worth the overhead to make TxnEntryHandle.monitor
//!! search for the transaction with the smallest set of leases? -arnold
synchronized void addSibling(Txn txn) {
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TypeTree.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TypeTree.java?rev=1034884&r1=1034883&r2=1034884&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TypeTree.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/TypeTree.java Sat Nov 13 21:28:51 2010
@@ -43,8 +43,8 @@ class TypeTree {
/**
* A generator used to randomize the order of iterator returns
- * @see #RandomizedIterator
*/
+ // @see #RandomizedIterator
static final private Random numgen = new Random();
/**
@@ -62,9 +62,8 @@ class TypeTree {
/**
* An iterator that will walk through a list of known types.
- *
- * @see #RandomizedIterator
*/
+ // @see #RandomizedIterator
private abstract class TypeTreeIterator implements Iterator {
protected int cursor; // the current position in the list
protected Object[] typearray; // the list of types as an array