Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5148] trunk/core/src
|
From: <cr...@us...> - 2009-03-24 12:32:47
|
Revision: 5148
http://jnode.svn.sourceforge.net/jnode/?rev=5148&view=rev
Author: crawley
Date: 2009-03-24 12:32:31 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
Javadoc fixes
Modified Paths:
--------------
trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java
trunk/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java
trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
trunk/core/src/core/org/jnode/vm/x86/VmX86Thread.java
trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java
trunk/core/src/driver/org/jnode/driver/bus/pci/Capability.java
trunk/core/src/driver/org/jnode/driver/console/TextConsole.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/SystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/firmware/AcpiDevice.java
trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreenUtils.java
trunk/core/src/endorsed/nanoxml/org/jnode/nanoxml/XMLElement.java
trunk/core/src/test/org/jnode/test/ResourceTest.java
trunk/core/src/test/org/jnode/test/core/ProxyTest.java
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -166,7 +166,7 @@
}
/**
- * @param quad
+ * @param q a quad
*/
public void add(Quad<T> q) {
addDef(q);
@@ -216,7 +216,7 @@
}
/**
- * @return
+ * @return the predecessors
*/
public List<IRBasicBlock<T>> getPredecessors() {
return predecessors;
@@ -358,7 +358,8 @@
}
/**
- * @return {@code if this block is the start of an exception handler
+ * @return {@code true} if this block is the start of an exception handler,
+ * otherwise {@code false}
*/
public boolean isStartOfExceptionHandler() {
return startOfExceptionHandler;
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -52,7 +52,7 @@
/**
* Create all determined basic blocks
*
- * @return
+ * @return the blocks.
*/
public IRBasicBlock<T>[] createBasicBlocks() {
// Sort the blocks on start PC
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/quad/PhiAssignQuad.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -44,7 +44,7 @@
/**
* @param dfb
- * @param def
+ * @param lhsIndex
*/
public PhiAssignQuad(IRBasicBlock<T> dfb, int lhsIndex) {
this(dfb.getStartPC(), dfb, lhsIndex);
Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -784,7 +784,7 @@
if (executor == null) {
executor = AccessController.doPrivileged(new PrivilegedAction<ExecutorService>() {
public ExecutorService run() {
- return Executors.newSingleThreadExecutor(new IsolateThreadFactory2(VmIsolate.this));
+ return Executors.newSingleThreadExecutor(new IsolateThreadFactory(VmIsolate.this));
}
});
}
@@ -1102,7 +1102,7 @@
/**
* Returns the VmIsolate instance which created this VmIsolate instance.
*
- * @return
+ * @return the creator
*/
public VmIsolate getCreator() {
return creator;
Modified: trunk/core/src/core/org/jnode/vm/x86/VmX86Thread.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/VmX86Thread.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/core/org/jnode/vm/x86/VmX86Thread.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -279,7 +279,7 @@
* Gets the stack pointer of this thread.
* Valid only when the thread is not running.
*
- * @return
+ * @return the stack pointer
*/
public final Address getStackPointer() {
return esp;
Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/DoubleWordItem.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -129,7 +129,7 @@
/**
* Create a clone of this item, which must be a constant.
*
- * @return
+ * @return the clone
*/
protected abstract DoubleWordItem cloneConstant(EmitterContext ec);
@@ -148,7 +148,7 @@
* Gets the offset from the LSB part of this item to the FramePointer
* register. This is only valid if this item has a LOCAL kind.
*
- * @return
+ * @return the offset
*/
final int getLsbOffsetToFP(EmitterContext ec) {
return super.getOffsetToFP(ec);
@@ -157,7 +157,7 @@
/**
* Gets the register holding the LSB part of this item in 32-bit mode.
*
- * @return
+ * @return the register
*/
final X86Register.GPR getLsbRegister(EmitterContext ec) {
if (!ec.getStream().isCode32()) {
@@ -174,7 +174,7 @@
* Gets the offset from the MSB part of this item to the FramePointer
* register. This is only valid if this item has a LOCAL kind.
*
- * @return
+ * @return the offset
*/
final int getMsbOffsetToFP(EmitterContext ec) {
return super.getOffsetToFP(ec) + 4;
@@ -183,7 +183,7 @@
/**
* Gets the register holding the MSB part of this item in 32-bit mode.
*
- * @return
+ * @return the register
*/
final X86Register.GPR getMsbRegister(EmitterContext ec) {
if (!ec.getStream().isCode32()) {
@@ -199,7 +199,7 @@
/**
* Gets the register holding this item in 64-bit mode.
*
- * @return
+ * @return the register
*/
final X86Register.GPR64 getRegister(EmitterContext ec) {
if (!ec.getStream().isCode64()) {
Modified: trunk/core/src/driver/org/jnode/driver/bus/pci/Capability.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/bus/pci/Capability.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/bus/pci/Capability.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -128,7 +128,7 @@
/**
* Gets the capability ID.
*
- * @return
+ * @return the id
*/
public final int getId() {
return id;
Modified: trunk/core/src/driver/org/jnode/driver/console/TextConsole.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/TextConsole.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/console/TextConsole.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -176,21 +176,21 @@
* characters are the result of processing keyboard events, performing line
* editing and completion.
*
- * @return
+ * @return the Reader
*/
public Reader getIn();
/**
* Gets the Writer that receives 'error' output for this console.
*
- * @return
+ * @return the error Writer
*/
public Writer getErr();
/**
* Gets the Writer that receives 'normal' output for this console.
*
- * @return
+ * @return the normal Writer
*/
public Writer getOut();
Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -224,81 +224,51 @@
return tabSize;
}
- /**
- * @param tabSize The tabSize to set.
- */
@Override
public void setTabSize(int tabSize) {
this.tabSize = tabSize;
}
- /**
- * @see org.jnode.driver.console.TextConsole#getColor(int, int)
- */
@Override
public int getColor(int x, int y) {
return screen.getColor(screen.getOffset(x, y));
}
- /**
- * @see org.jnode.driver.console.TextConsole#getChar(int, int)
- */
@Override
public char getChar(int x, int y) {
return screen.getChar(screen.getOffset(x, y));
}
- /**
- * @see org.jnode.driver.console.TextConsole#getCursorX()
- */
@Override
public int getCursorX() {
return curX;
}
- /**
- * @see org.jnode.driver.console.TextConsole#getCursorY()
- */
@Override
public int getCursorY() {
return curY;
}
- /**
- * @see org.jnode.driver.console.TextConsole#getHeight()
- */
@Override
public int getHeight() {
return screen.getHeight();
}
- /**
- * @see org.jnode.driver.console.TextConsole#getWidth()
- */
@Override
public int getWidth() {
return screen.getWidth();
}
- /**
- * @see org.jnode.driver.console.TextConsole#getHeight()
- */
@Override
public int getDeviceHeight() {
return screen.getDeviceHeight();
}
- /**
- * @see org.jnode.driver.console.TextConsole#getWidth()
- */
@Override
public int getDeviceWidth() {
return screen.getDeviceWidth();
}
- /**
- * @see org.jnode.driver.console.TextConsole#setChar(int, int, char, int)
- */
@Override
public void setChar(int x, int y, char ch, int color) {
int offset = screen.getOffset(x, y);
@@ -320,9 +290,6 @@
syncScreen(offset, cLength);
}
- /**
- * @see org.jnode.driver.console.TextConsole#setCursor(int, int)
- */
@Override
public void setCursor(int x, int y) {
this.curX = x;
@@ -371,9 +338,6 @@
}
}
- /**
- * @see org.jnode.driver.console.TextConsole#getIn()
- */
@Override
public Reader getIn() {
return in;
@@ -383,17 +347,11 @@
this.in = in;
}
- /**
- * @see org.jnode.driver.console.TextConsole#getErr()
- */
@Override
public Writer getErr() {
return err;
}
- /**
- * @see org.jnode.driver.console.TextConsole#getOut()
- */
@Override
public Writer getOut() {
return out;
@@ -419,9 +377,6 @@
syncScreen(offset, 1);
}
- /**
- * @see org.jnode.system.event.FocusListener#focusGained(org.jnode.system.event.FocusEvent)
- */
@Override
public void focusGained(FocusEvent event) {
super.focusGained(event);
@@ -444,9 +399,6 @@
}
}
- /**
- * @see org.jnode.system.event.FocusListener#focusLost(org.jnode.system.event.FocusEvent)
- */
@Override
public void focusLost(FocusEvent event) {
if (in instanceof FocusListener) {
@@ -478,9 +430,6 @@
return options;
}
- /**
- * @see Console#systemScreenChanged(TextScreen)
- */
@Override
public void systemScreenChanged(TextScreen systemScreen) {
// ensure that old and new screens are compatible
Modified: trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -51,11 +51,6 @@
this.creatorRevision = getString(32, 4);
}
- /**
- * Convert to a String representation.
- *
- * @see java.lang.Object#toString()
- */
public String toString() {
return super.toString() + "/{" + oemId + ", " + creatorId + "}";
}
@@ -63,7 +58,7 @@
/**
* Gets the OEM ID.
*
- * @return
+ * @return the id
*/
public final String getOemId() {
return oemId;
@@ -72,7 +67,7 @@
/**
* Gets the OEM table ID.
*
- * @return
+ * @return the table id
*/
public final String getOemTableId() {
return oemTableId;
Modified: trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -59,7 +59,7 @@
/**
* Gets the length of this table in bytes.
*
- * @return
+ * @return the table size
*/
public final int getSize() {
return tableResource.getSize().toInt();
@@ -75,7 +75,7 @@
/**
* Gets the signature of this table.
*
- * @return
+ * @return the sigarure
*/
public String getSignature() {
return signature;
@@ -85,7 +85,7 @@
* Gets a 32-bit address from a given offset in the table.
*
* @param offset
- * @return
+ * @return the address
*/
protected final Address getAddress32(int offset) {
return Address.fromIntZeroExtend(tableResource.getInt(offset));
@@ -95,7 +95,7 @@
* Gets a 64-bit address from a given offset in the table.
*
* @param offset
- * @return
+ * @return the address
*/
protected final Address getAddress64(int offset) {
return Address.fromLong(tableResource.getLong(offset));
@@ -105,7 +105,7 @@
* Gets a 32-bit integer from a given offset in the table.
*
* @param offset
- * @return
+ * @return the integer
*/
protected final int getInt(int offset) {
return tableResource.getInt(offset);
@@ -115,7 +115,7 @@
* Gets a 16-bit integer from a given offset in the table.
*
* @param offset
- * @return
+ * @return the short without sign extension
*/
protected final int getShort(int offset) {
return ((tableResource.getByte(offset + 1) & 0xff) << 8)
@@ -127,7 +127,7 @@
*
* @param offset
* @param length Length in bytes of the string.
- * @return
+ * @return the string
*/
protected final String getString(int offset, int length) {
final char[] arr = new char[length];
@@ -141,7 +141,7 @@
* Gets a 8-bit integer from a given offset in the table.
*
* @param offset
- * @return
+ * @return the byte without sign extension
*/
protected final int getByte(int offset) {
return tableResource.getByte(offset) & 0xff;
@@ -151,7 +151,6 @@
* Gets a series 8-bit integer from a given offset in the table.
*
* @param offset
- * @return
*/
protected final void getBytes(int offset, byte[] dst, int dstOfs, int length) {
tableResource.getBytes(offset, dst, dstOfs, length);
Modified: trunk/core/src/driver/org/jnode/driver/system/acpi/SystemDescriptionTable.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/system/acpi/SystemDescriptionTable.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/system/acpi/SystemDescriptionTable.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -45,9 +45,9 @@
}
/**
- * List of AcpiTable.
+ * List of AcpiTables
*
- * @return
+ * @return the tables
*/
public final List<AcpiTable> getTables() {
return Collections.unmodifiableList(tables);
@@ -56,7 +56,7 @@
/**
* Release all resources.
*
- * @see org.jnode.driver.system.acpi.AcpiTable#release()
+ * @see AcpiTable#release()
*/
public void release() {
super.release();
Modified: trunk/core/src/driver/org/jnode/driver/system/firmware/AcpiDevice.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/system/firmware/AcpiDevice.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/system/firmware/AcpiDevice.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -45,7 +45,7 @@
/**
* Gets the information of the ACPI root descriptor table.
*
- * @return
+ * @return the information descriptor
*/
public final AcpiRSDPInfo getRsdpInfo() {
return rsdpInfo;
Modified: trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -96,7 +96,7 @@
/**
* Gets the height of the virtual screen in characters. For a buffered
* screen this is the height of the buffer. The height of the physical
- * screen is given by {@line #getDeviceHeight()}.
+ * screen is given by {@link #getDeviceHeight()}.
*
* @return Returns the virtual screen height.
*/
@@ -105,7 +105,7 @@
/**
* Gets the width of the virtual screen in characters. For a buffered
* screen this is the width of the buffer. The width of the physical
- * screen is given by {@line #getDeviceWidth()}.
+ * screen is given by {@link #getDeviceWidth()}.
*
* @return Returns the virtual screen width.
*/
@@ -130,7 +130,7 @@
*
* @param x
* @param y
- * @return
+ * @return the offset
*/
public int getOffset(int x, int y);
@@ -145,7 +145,7 @@
* Create an in-memory buffer text screen that is compatible
* with this screen.
*
- * @return
+ * @return the text screen.
*/
public TextScreen createCompatibleBufferScreen();
@@ -153,7 +153,7 @@
* Create an in-memory buffer text screen that is compatible
* with this, but larger and supports scrolling.
*
- * @return
+ * @return the buffer screen
*/
public ScrollableTextScreen createCompatibleScrollableBufferScreen(int height);
Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcTextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcTextScreen.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcTextScreen.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -91,7 +91,7 @@
*
* @param x
* @param y
- * @return
+ * @return the offset
*/
@Override
public final int getOffset(int x, int y) {
@@ -118,7 +118,7 @@
* Create an in-memory buffer text screen that is compatible
* with the system screen, but larges and supports scrolling.
*
- * @return
+ * @return the text screen
*/
@Override
public final ScrollableTextScreen createCompatibleScrollableBufferScreen(int height) {
Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreenUtils.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreenUtils.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreenUtils.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -49,9 +49,9 @@
}
/**
- * Exchange the background and the foreground colors
+ * Exchange the background and the foreground colors in a character/color value
* @param characterAndColor
- * @return
+ * @return the modified character/color value
*/
public static final char exchangeColors(char characterAndColor) {
int color = PcTextScreenUtils.decodeColor(characterAndColor);
Modified: trunk/core/src/endorsed/nanoxml/org/jnode/nanoxml/XMLElement.java
===================================================================
--- trunk/core/src/endorsed/nanoxml/org/jnode/nanoxml/XMLElement.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/endorsed/nanoxml/org/jnode/nanoxml/XMLElement.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -63,30 +63,28 @@
* </CODE></UL></DD></DL>
* <DL><DT><B>Retrieving Attributes</B></DT>
* <DD>
- * You can enumerate the attributes of an element using the method
- * {@link #enumerateAttributeNames() enumerateAttributeNames}.
+ * You can get the attributes of an element using the method
+ * {@link #attributeNames() attributeNames}.
* The attribute values can be retrieved using the method
* {@link #getStringAttribute(String) getStringAttribute}.
* The following example shows how to list the attributes of an element:
- * <UL><CODE>
- * XMLElement element = ...;<BR>
- * Enumeration enum = element.getAttributeNames();<BR>
- * while (enum.hasMoreElements()) {<BR>
- * String key = (String) enum.nextElement();<BR>
- * String value = element.getStringAttribute(key);<BR>
- * System.out.println(key + " = " + value);<BR>
- * }
- * </CODE></UL></DD></DL>
+ * <UL><pre>
+ * XMLElement element = ...;
+ * for (String key : element.getAttributeNames()) {
+ * String value = element.getStringAttribute(key);
+ * System.out.println(key + " = " + value);
+ * }
+ * </pre></UL></DD></DL>
* <DL><DT><B>Retrieving Child Elements</B></DT>
* <DD>
* You can enumerate the children of an element using
- * {@link #enumerateChildren() enumerateChildren}.
+ * {@link #iteratorChildren() iteratorChildren}.
* The number of child elements can be retrieved using
* {@link #countChildren() countChildren}.
* </DD></DL>
* <DL><DT><B>Elements Containing Character Data</B></DT>
* <DD>
- * If an elements contains character data, like in the following example:
+ * If an element contains character data, as in the following example:
* <UL><CODE>
* <title>The Title</title>
* </CODE></UL>
@@ -268,9 +266,9 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => 0
- * <li>enumerateChildren() => empty enumeration
- * <li>enumeratePropertyNames() => empty enumeration
- * <li>getChildren() => empty vector
+ * <li>iteratorChildren() => empty iteration
+ * <li>attributeNames() => empty set
+ * <li>getChildren() => empty list
* <li>getContent() => ""
* <li>getLineNr() => 0
* <li>getName() => null
@@ -303,9 +301,9 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => 0
- * <li>enumerateChildren() => empty enumeration
- * <li>enumeratePropertyNames() => empty enumeration
- * <li>getChildren() => empty vector
+ * <li>iteratorChildren() => empty iteration
+ * <li>attributeNames() => empty set
+ * <li>getChildren() => empty list
* <li>getContent() => ""
* <li>getLineNr() => 0
* <li>getName() => null
@@ -334,9 +332,9 @@
*
* </dl><dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => 0
- * <li>enumerateChildren() => empty enumeration
- * <li>enumeratePropertyNames() => empty enumeration
- * <li>getChildren() => empty vector
+ * <li>iteratorChildren() => empty iteration
+ * <li>attributeNames() => empty set
+ * <li>getChildren() => empty list
* <li>getContent() => ""
* <li>getLineNr() => 0
* <li>getName() => null
@@ -372,9 +370,9 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => 0
- * <li>enumerateChildren() => empty enumeration
- * <li>enumeratePropertyNames() => empty enumeration
- * <li>getChildren() => empty vector
+ * <li>iteratorChildren() => empty iteration
+ * <li>attributeNames() => empty set
+ * <li>getChildren() => empty list
* <li>getContent() => ""
* <li>getLineNr() => 0
* <li>getName() => null
@@ -410,9 +408,9 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => 0
- * <li>enumerateChildren() => empty enumeration
- * <li>enumeratePropertyNames() => empty enumeration
- * <li>getChildren() => empty vector
+ * <li>iteratorChildren() => empty iteration
+ * <li>attributeNames() => empty set
+ * <li>getChildren() => empty list
* <li>getContent() => ""
* <li>getLineNr() => 0
* <li>getName() => null
@@ -437,7 +435,7 @@
* Creates and initializes a new XML element.
* <P>
* This constructor should <I>only</I> be called from
- * {@link #createAnotherElement() createAnotherElement}
+ * {@link #createAnotherElement()}
* to create child elements.
*
* @param entities
@@ -462,9 +460,9 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => 0
- * <li>enumerateChildren() => empty enumeration
- * <li>enumeratePropertyNames() => empty enumeration
- * <li>getChildren() => empty vector
+ * <li>iteratorChildren() => empty iteration
+ * <li>attributeNames() => empty set
+ * <li>getChildren() => empty list
* <li>getContent() => ""
* <li>getLineNr() => 0
* <li>getName() => null
@@ -518,12 +516,12 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => old.countChildren() + 1
- * <li>enumerateChildren() => old.enumerateChildren() + child
- * <li>getChildren() => old.enumerateChildren() + child
+ * <li>iteratorChildren() => old.iteratorChildren() + child
+ * <li>getChildren() => old.iteratorChildren() + child
* </ul></dd></dl><dl>
*
* @see XMLElement#countChildren()
- * @see XMLElement#enumerateChildren()
+ * @see XMLElement#iteratorChildren()
* @see XMLElement#getChildren()
* @see XMLElement#removeChild(XMLElement)
* removeChild(XMLElement)
@@ -549,8 +547,7 @@
* </ul></dd></dl>
*
* <dl><dt><b>Postconditions:</b></dt><dd>
- * <ul><li>enumerateAttributeNames()
- * => old.enumerateAttributeNames() + name
+ * <ul><li>attributeNames() => old.ttributeNames() + name
* <li>getAttribute(name) => value
* </ul></dd></dl><dl>
*
@@ -558,7 +555,7 @@
* setDoubleAttribute(String, double)
* @see XMLElement#setIntAttribute(String, int)
* setIntAttribute(String, int)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getAttribute(String)
* getAttribute(String)
* @see XMLElement#getAttribute(String, Object)
@@ -595,8 +592,7 @@
* @param value
* The value of the attribute.
*
- * @deprecated Use {@link #setAttribute(String, Object)
- * setAttribute} instead.
+ * @deprecated Use {@link #setAttribute(String, Object)} instead.
*/
public void addProperty(String name,
Object value)
@@ -619,8 +615,7 @@
* </ul></dd></dl>
*
* <dl><dt><b>Postconditions:</b></dt><dd>
- * <ul><li>enumerateAttributeNames()
- * => old.enumerateAttributeNames() + name
+ * <ul><li>attributeNames() => old.attributeNames() + name
* <li>getIntAttribute(name) => value
* </ul></dd></dl><dl>
*
@@ -630,7 +625,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getIntAttribute(String)
* getIntAttribute(String)
* @see XMLElement#getIntAttribute(String, int)
@@ -658,13 +653,12 @@
* @param value
* The value of the attribute.
*
- * @deprecated Use {@link #setIntAttribute(String, int)
- * setIntAttribute} instead.
+ * @deprecated Use {@link #setIntAttribute(String, int)} instead.
*/
- public void addProperty(String key,
+ public void addProperty(String name,
int value)
{
- this.setIntAttribute(key, value);
+ this.setIntAttribute(name, value);
}
@@ -682,8 +676,7 @@
* </ul></dd></dl>
*
* <dl><dt><b>Postconditions:</b></dt><dd>
- * <ul><li>enumerateAttributeNames()
- * => old.enumerateAttributeNames() + name
+ * <ul><li>attributeNames() => old.attributeNames() + name
* <li>getDoubleAttribute(name) => value
* </ul></dd></dl><dl>
*
@@ -693,7 +686,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getDoubleAttribute(String)
* getDoubleAttribute(String)
* @see XMLElement#getDoubleAttribute(String, double)
@@ -721,8 +714,7 @@
* @param value
* The value of the attribute.
*
- * @deprecated Use {@link #setDoubleAttribute(String, double)
- * setDoubleAttribute} instead.
+ * @deprecated Use {@link #setDoubleAttribute(String, double)} instead.
*/
public void addProperty(String name,
double value)
@@ -740,7 +732,7 @@
*
* @see XMLElement#addChild(XMLElement)
* addChild(XMLElement)
- * @see XMLElement#enumerateChildren()
+ * @see XMLElement#iteratorChildren()
* @see XMLElement#getChildren()
* @see XMLElement#removeChild(XMLElement)
* removeChild(XMLElement)
@@ -841,7 +833,7 @@
* @see XMLElement#addChild(XMLElement)
* addChild(XMLElement)
* @see XMLElement#countChildren()
- * @see XMLElement#enumerateChildren()
+ * @see XMLElement#iteratorChildren()
* @see XMLElement#removeChild(XMLElement)
* removeChild(XMLElement)
*/
@@ -855,7 +847,7 @@
* Returns the PCDATA content of the object. If there is no such content,
* <CODE>null</CODE> is returned.
*
- * @deprecated Use {@link #getContent() getContent} instead.
+ * @deprecated Use {@link #getContent()} instead.
*/
public String getContents()
{
@@ -905,7 +897,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getAttribute(String, Object)
* getAttribute(String, Object)
* @see XMLElement#getAttribute(String,
@@ -935,7 +927,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getAttribute(String)
* getAttribute(String)
* @see XMLElement#getAttribute(String,
@@ -988,7 +980,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getAttribute(String)
* getAttribute(String)
* @see XMLElement#getAttribute(String, Object)
@@ -1034,7 +1026,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getStringAttribute(String,
* String)
* getStringAttribute(String, String)
@@ -1065,7 +1057,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getStringAttribute(String)
* getStringAttribute(String)
* @see XMLElement#getStringAttribute(String,
@@ -1112,7 +1104,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getStringAttribute(String)
* getStringAttribute(String)
* @see XMLElement#getStringAttribute(String,
@@ -1142,7 +1134,7 @@
*
* @see XMLElement#setIntAttribute(String, int)
* setIntAttribute(String, int)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getIntAttribute(String, int)
* getIntAttribute(String, int)
* @see XMLElement#getIntAttribute(String,
@@ -1170,7 +1162,7 @@
*
* @see XMLElement#setIntAttribute(String, int)
* setIntAttribute(String, int)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getIntAttribute(String)
* getIntAttribute(String)
* @see XMLElement#getIntAttribute(String,
@@ -1228,7 +1220,7 @@
*
* @see XMLElement#setIntAttribute(String, int)
* setIntAttribute(String, int)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getIntAttribute(String)
* getIntAttribute(String)
* @see XMLElement#getIntAttribute(String, int)
@@ -1279,7 +1271,7 @@
*
* @see XMLElement#setDoubleAttribute(String, double)
* setDoubleAttribute(String, double)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getDoubleAttribute(String, double)
* getDoubleAttribute(String, double)
* @see XMLElement#getDoubleAttribute(String,
@@ -1307,7 +1299,7 @@
*
* @see XMLElement#setDoubleAttribute(String, double)
* setDoubleAttribute(String, double)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getDoubleAttribute(String)
* getDoubleAttribute(String)
* @see XMLElement#getDoubleAttribute(String,
@@ -1366,7 +1358,7 @@
*
* @see XMLElement#setDoubleAttribute(String, double)
* setDoubleAttribute(String, double)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#getDoubleAttribute(String)
* getDoubleAttribute(String)
* @see XMLElement#getDoubleAttribute(String, double)
@@ -1430,7 +1422,7 @@
* setAttribute(String, Object)
* @see XMLElement#removeAttribute(String)
* removeAttribute(String)
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
*/
public boolean getBooleanAttribute(String name,
String trueValue,
@@ -1457,8 +1449,7 @@
* Returns an attribute by looking up a key in a hashtable.
*
* @deprecated Use {@link #getIntAttribute(String,
- * java.util.Hashtable, String, boolean)
- * getIntAttribute} instead.
+ * java.util.Hashtable, String, boolean)} instead.
*/
public int getIntProperty(String name,
Hashtable valueSet,
@@ -1471,8 +1462,7 @@
/**
* Returns an attribute.
*
- * @deprecated Use {@link #getStringAttribute(String)
- * getStringAttribute} instead.
+ * @deprecated Use {@link #getStringAttribute(String)} instead.
*/
public String getProperty(String name)
{
@@ -1483,8 +1473,7 @@
/**
* Returns an attribute.
*
- * @deprecated Use {@link #getStringAttribute(String,
- * String) getStringAttribute} instead.
+ * @deprecated Use {@link #getStringAttribute(String, String)} instead.
*/
public String getProperty(String name,
String defaultValue)
@@ -1496,8 +1485,7 @@
/**
* Returns an attribute.
*
- * @deprecated Use {@link #getIntAttribute(String, int)
- * getIntAttribute} instead.
+ * @deprecated Use {@link #getIntAttribute(String, int)} instead.
*/
public int getProperty(String name,
int defaultValue)
@@ -1509,8 +1497,7 @@
/**
* Returns an attribute.
*
- * @deprecated Use {@link #getDoubleAttribute(String, double)
- * getDoubleAttribute} instead.
+ * @deprecated Use {@link #getDoubleAttribute(String, double)} instead.
*/
public double getProperty(String name,
double defaultValue)
@@ -1523,8 +1510,7 @@
* Returns an attribute.
*
* @deprecated Use {@link #getBooleanAttribute(String,
- * String, String, boolean)
- * getBooleanAttribute} instead.
+ * String, String, boolean)} instead.
*/
public boolean getProperty(String key,
String trueValue,
@@ -1540,8 +1526,7 @@
* Returns an attribute by looking up a key in a hashtable.
*
* @deprecated Use {@link #getAttribute(String,
- * java.util.Hashtable, String, boolean)
- * getAttribute} instead.
+ * java.util.Hashtable, String, boolean)} instead.
*/
public Object getProperty(String name,
Hashtable valueSet,
@@ -1555,8 +1540,7 @@
* Returns an attribute by looking up a key in a hashtable.
*
* @deprecated Use {@link #getStringAttribute(String,
- * java.util.Hashtable, String, boolean)
- * getStringAttribute} instead.
+ * java.util.Hashtable, String, boolean)} instead.
*/
public String getStringProperty(String name,
Hashtable valueSet,
@@ -1570,8 +1554,7 @@
* Returns an attribute by looking up a key in a hashtable.
*
* @deprecated Use {@link #getIntAttribute(String,
- * java.util.Hashtable, String, boolean)
- * getIntAttribute} instead.
+ * java.util.Hashtable, String, boolean)} instead.
*/
public int getSpecialIntProperty(String name,
Hashtable valueSet,
@@ -1585,8 +1568,7 @@
* Returns an attribute by looking up a key in a hashtable.
*
* @deprecated Use {@link #getDoubleAttribute(String,
- * java.util.Hashtable, String, boolean)
- * getDoubleAttribute} instead.
+ * java.util.Hashtable, String, boolean)} instead.
*/
public double getSpecialDoubleProperty(String name,
Hashtable valueSet,
@@ -1610,7 +1592,7 @@
/**
* Returns the name of the element.
*
- * @deprecated Use {@link #getName() getName} instead.
+ * @deprecated Use {@link #getName()} instead.
*/
public String getTagName()
{
@@ -1708,8 +1690,8 @@
/**
* Reads one XML element from a String and parses it.
*
- * @param reader
- * The reader from which to retrieve the XML data.
+ * @param string
+ * The string from which to read the XML data.
*
* </dl><dl><dt><b>Preconditions:</b></dt><dd>
* <ul><li><code>string != null</code>
@@ -1739,8 +1721,8 @@
/**
* Reads one XML element from a String and parses it.
*
- * @param reader
- * The reader from which to retrieve the XML data.
+ * @param string
+ * The String from which to read the XML data.
* @param offset
* The first character in <code>string</code> to scan.
*
@@ -1769,8 +1751,8 @@
/**
* Reads one XML element from a String and parses it.
*
- * @param reader
- * The reader from which to retrieve the XML data.
+ * @param string
+ * The String from which to read the XML data.
* @param offset
* The first character in <code>string</code> to scan.
* @param end
@@ -1804,8 +1786,8 @@
/**
* Reads one XML element from a String and parses it.
*
- * @param reader
- * The reader from which to retrieve the XML data.
+ * @param string
+ * The String from which to read the XML data.
* @param offset
* The first character in <code>string</code> to scan.
* @param end
@@ -1847,8 +1829,8 @@
/**
* Reads one XML element from a char array and parses it.
*
- * @param reader
- * The reader from which to retrieve the XML data.
+ * @param input
+ * The array from which to read the XML data.
* @param offset
* The first character in <code>string</code> to scan.
* @param end
@@ -1882,8 +1864,8 @@
/**
* Reads one XML element from a char array and parses it.
*
- * @param reader
- * The reader from which to retrieve the XML data.
+ * @param input
+ * The array from which to read the XML data.
* @param offset
* The first character in <code>string</code> to scan.
* @param end
@@ -1935,14 +1917,14 @@
*
* <dl><dt><b>Postconditions:</b></dt><dd>
* <ul><li>countChildren() => old.countChildren() - 1
- * <li>enumerateChildren() => old.enumerateChildren() - child
- * <li>getChildren() => old.enumerateChildren() - child
+ * <li>iteratorChildren() => old.iteratorChildren() - child
+ * <li>getChildren() => old.iteratorChildren() - child
* </ul></dd></dl><dl>
*
* @see XMLElement#addChild(XMLElement)
* addChild(XMLElement)
* @see XMLElement#countChildren()
- * @see XMLElement#enumerateChildren()
+ * @see XMLElement#iteratorChildren()
* @see XMLElement#getChildren()
*/
public void removeChild(XMLElement child)
@@ -1963,12 +1945,11 @@
* </ul></dd></dl>
*
* <dl><dt><b>Postconditions:</b></dt><dd>
- * <ul><li>enumerateAttributeNames()
- * => old.enumerateAttributeNames() - name
+ * <ul><li>ttributeNames() => old.attributeNames() - name
* <li>getAttribute(name) => <code>null</code>
* </ul></dd></dl><dl>
*
- * @see XMLElement#enumerateAttributeNames()
+ * @see XMLElement#attributeNames()
* @see XMLElement#setDoubleAttribute(String, double)
* setDoubleAttribute(String, double)
* @see XMLElement#setIntAttribute(String, int)
Modified: trunk/core/src/test/org/jnode/test/ResourceTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/ResourceTest.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/test/org/jnode/test/ResourceTest.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -33,7 +33,7 @@
import org.jnode.plugin.PluginUtils;
/**
- * Documentation at {@link http://www.javaworld.com/javaworld/javaqa/2003-08/01-qa-0808-property.html}
+ * Documentation at http://www.javaworld.com/javaworld/javaqa/2003-08/01-qa-0808-property.html.
*
* @author Ewout Prangsma (ep...@us...)
* @author Fabien DUMINY (fd...@jn...)
Modified: trunk/core/src/test/org/jnode/test/core/ProxyTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/core/ProxyTest.java 2009-03-23 13:59:36 UTC (rev 5147)
+++ trunk/core/src/test/org/jnode/test/core/ProxyTest.java 2009-03-24 12:32:31 UTC (rev 5148)
@@ -31,8 +31,7 @@
/**
* @param args
- * @throws java.io.FileNotFoundException
- * @throws
+ * @throws IOException;
*/
public static void main(String[] args) throws IOException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
