gmazza 2003/12/27 14:00:38
Modified: src/java/org/apache/fop/fo FObj.java
GenericShorthandParser.java PropertyList.java
PropertyManager.java
src/java/org/apache/fop/fo/expr FromParentFunction.java
src/java/org/apache/fop/fo/flow Block.java
BlockContainer.java Inline.java Marker.java
Log:
*Partial* conversion of PropertyList.get(String propName) to new
PropertyList.get(int propId) method. This method will remain
overloaded until all calls converted to int constants.
Work based on Finn Bock's patch.
Revision Changes Path
1.29 +4 -3 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FObj.java 26 Dec 2003 22:11:17 -0000 1.28
+++ FObj.java 27 Dec 2003 22:00:38 -0000 1.29
@@ -66,7 +66,7 @@
/**
* Base class for representation of formatting objects and their processing.
*/
-public class FObj extends FONode {
+public class FObj extends FONode implements Constants {
private static final String FO_URI = "http://www.w3.org/1999/XSL/Format";;
public static Property.Maker[] propertyListTable = null;
@@ -257,7 +257,8 @@
* @return the property
*/
public Property getProperty(String name) {
- return (propertyList.get(name));
+ int propId = FOPropertyMapping.getPropertyId(name);
+ return (propertyList.get(propId));
}
/**
@@ -267,7 +268,7 @@
* fo and sets the id attribute of this object.
*/
public void setupID() {
- Property prop = this.propertyList.get("id");
+ Property prop = this.propertyList.get(PR_ID);
if (prop != null) {
String str = prop.getString();
if (str != null && !str.equals("")) {
1.4 +1 -3 xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java
Index: GenericShorthandParser.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GenericShorthandParser.java 26 Dec 2003 23:41:47 -0000 1.3
+++ GenericShorthandParser.java 27 Dec 2003 22:00:38 -0000 1.4
@@ -52,7 +52,6 @@
import java.util.Vector;
import java.util.Enumeration;
-import org.apache.fop.fo.properties.FOPropertyMapping;
public class GenericShorthandParser implements ShorthandParser {
@@ -96,8 +95,7 @@
if (count() == 1) {
String sval = ((Property)list.elementAt(0)).getString();
if (sval != null && sval.equals("inherit")) {
- String name = FOPropertyMapping.getPropertyName(propId);
- return propertyList.getFromParent(name);
+ return propertyList.getFromParent(propId);
}
}
return convertValueForProperty(propId, maker, propertyList);
1.11 +23 -6 xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PropertyList.java 26 Dec 2003 23:41:47 -0000 1.10
+++ PropertyList.java 27 Dec 2003 22:00:38 -0000 1.11
@@ -229,7 +229,8 @@
public Property getInherited(String propertyName) {
if (parentPropertyList != null
&& isInherited(namespace, elementName, propertyName)) {
- return parentPropertyList.get(propertyName);
+ int propertyId = FOPropertyMapping.getPropertyId(propertyName);
+ return parentPropertyList.get(propertyId);
} else {
// return the "initial" value
try {
@@ -290,14 +291,28 @@
* this will try to compute it based on other properties, or if it is
* inheritable, to return the inherited value. If all else fails, it returns
* the default value.
- * @param propertyName property name
+ * @param propId The Constants ID of the property whose value is desired.
* @return the Property corresponding to that name
*/
- public Property get(String propertyName) {
+ public Property get(int propId) {
+ String propertyName = FOPropertyMapping.getPropertyName(propId);
return get(propertyName, true, true);
}
/**
+ * TEMPORARY until conversion to int's complete
+ * Return the property on the current FlowObject. If it isn't set explicitly,
+ * this will try to compute it based on other properties, or if it is
+ * inheritable, to return the inherited value. If all else fails, it returns
+ * the default value.
+ * @param propertyName The name of the property whose value is desired.
+ * @return the Property corresponding to that name
+ */
+ public Property get(String propertyName) {
+ return get(propertyName, true, true);
+ }
+
+ /**
* Return the property on the current FlowObject. Depending on the passed flags,
* this will try to compute it based on other properties, or if it is
* inheritable, to return the inherited value. If all else fails, it returns
@@ -381,13 +396,15 @@
/**
* Return the value of this property on the parent of this FO.
* Implements the from-parent function.
- * @param propertyName The name of the property whose value is desired.
+ * @param propId The Constants ID of the property whose value is desired.
* @return The computed value on the parent or the initial value if this
* FO is the root or is in a different namespace from its parent.
*/
- public Property getFromParent(String propertyName) {
+ public Property getFromParent(int propId) {
+ String propertyName = FOPropertyMapping.getPropertyName(propId);
+
if (parentPropertyList != null) {
- return parentPropertyList.get(propertyName);
+ return parentPropertyList.get(propId);
} else {
try {
return makeProperty(namespace, elementName, propertyName);
1.18 +52 -52 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PropertyManager.java 22 Dec 2003 23:23:05 -0000 1.17
+++ PropertyManager.java 27 Dec 2003 22:00:38 -0000 1.18
@@ -74,7 +74,7 @@
/**
* Helper class for managing groups of properties.
*/
-public class PropertyManager {
+public class PropertyManager implements Constants {
private PropertyList propertyList;
private FOTreeControl foTreeControl = null;
@@ -138,9 +138,9 @@
}
/[EMAIL PROTECTED] this is ugly. need to improve. */
- String fontFamily = propertyList.get("font-family").getString();
- String fontStyle = propertyList.get("font-style").getString();
- String fw = propertyList.get("font-weight").getString();
+ String fontFamily = propertyList.get(PR_FONT_FAMILY).getString();
+ String fontStyle = propertyList.get(PR_FONT_STYLE).getString();
+ String fw = propertyList.get(PR_FONT_WEIGHT).getString();
int fontWeight = 400;
if (fw.equals("bolder")) {
// +100 from inherited
@@ -161,7 +161,7 @@
// NOTE: this is incomplete. font-size may be specified with
// various kinds of keywords too
- int fontSize = propertyList.get("font-size").getLength().getValue();
+ int fontSize = propertyList.get(PR_FONT_SIZE).getLength().getValue();
//int fontVariant = propertyList.get("font-variant").getEnum();
String fname = foTreeControl.fontLookup(fontFamily, fontStyle,
fontWeight);
@@ -213,18 +213,18 @@
if (hyphProps == null) {
this.hyphProps = new CommonHyphenation();
hyphProps.hyphenate =
- this.propertyList.get("hyphenate").getEnum();
+ this.propertyList.get(PR_HYPHENATE).getEnum();
hyphProps.hyphenationChar = this.propertyList.get(
- "hyphenation-character").getCharacter();
+ PR_HYPHENATION_CHARACTER).getCharacter();
hyphProps.hyphenationPushCharacterCount = this.propertyList.get(
- "hyphenation-push-character-count").getNumber().
+ PR_HYPHENATION_PUSH_CHARACTER_COUNT).getNumber().
intValue();
hyphProps.hyphenationRemainCharacterCount = this.propertyList.get(
- "hyphenation-remain-character-count").getNumber().
+ PR_HYPHENATION_REMAIN_CHARACTER_COUNT).getNumber().
intValue();
hyphProps.language =
- this.propertyList.get("language").getString();
- hyphProps.country = this.propertyList.get("country").getString();
+ this.propertyList.get(PR_LANGUAGE).getString();
+ hyphProps.country = this.propertyList.get(PR_COUNTRY).getString();
}
return hyphProps;
}
@@ -306,22 +306,22 @@
// Common Margin Properties-Block
props.marginTop =
- this.propertyList.get("margin-top").getLength().getValue();
+ this.propertyList.get(PR_MARGIN_TOP).getLength().getValue();
props.marginBottom =
- this.propertyList.get("margin-bottom").getLength().getValue();
+ this.propertyList.get(PR_MARGIN_BOTTOM).getLength().getValue();
props.marginLeft =
- this.propertyList.get("margin-left").getLength().getValue();
+ this.propertyList.get(PR_MARGIN_LEFT).getLength().getValue();
props.marginRight =
- this.propertyList.get("margin-right").getLength().getValue();
+ this.propertyList.get(PR_MARGIN_RIGHT).getLength().getValue();
// For now, we only get the optimum value for space-before and after
- props.spaceBefore = this.propertyList.get("space-before").
+ props.spaceBefore = this.propertyList.get(PR_SPACE_BEFORE).
getSpace().getOptimum().getLength().getValue();
- props.spaceAfter = this.propertyList.get("space-after").
+ props.spaceAfter = this.propertyList.get(PR_SPACE_AFTER).
getSpace().getOptimum().getLength().getValue();
- props.startIndent = this.propertyList.get("start-indent").
+ props.startIndent = this.propertyList.get(PR_START_INDENT).
getLength().getValue();
- props.endIndent = this.propertyList.get("end-indent").
+ props.endIndent = this.propertyList.get(PR_END_INDENT).
getLength().getValue();
return props;
@@ -334,22 +334,22 @@
*/
public CommonBackground getBackgroundProps() {
CommonBackground bp = new CommonBackground();
- bp.backAttachment = propertyList.get("background-attachment").getEnum();
- bp.backColor = propertyList.get("background-color").getColorType();
+ bp.backAttachment = propertyList.get(PR_BACKGROUND_ATTACHMENT).getEnum();
+ bp.backColor = propertyList.get(PR_BACKGROUND_COLOR).getColorType();
if (bp.backColor.getAlpha() == 0) {
bp.backColor = null;
}
- bp.backImage = propertyList.get("background-image").getString();
+ bp.backImage = propertyList.get(PR_BACKGROUND_IMAGE).getString();
if (bp.backImage == null || NONE.equals(bp.backImage)) {
bp.backImage = null;
} else {
- bp.backRepeat = propertyList.get("background-repeat").getEnum();
- Property prop = propertyList.get("background-position-horizontal");
+ bp.backRepeat = propertyList.get(PR_BACKGROUND_REPEAT).getEnum();
+ Property prop = propertyList.get(PR_BACKGROUND_POSITION_HORIZONTAL);
if (prop != null) {
bp.backPosHorizontal = prop.getLength();
}
- prop = propertyList.get("background-position-vertical");
+ prop = propertyList.get(PR_BACKGROUND_POSITION_VERTICAL);
if (prop != null) {
bp.backPosVertical = prop.getLength();
}
@@ -375,8 +375,8 @@
*/
public InlineProps getInlineProps() {
InlineProps props = new InlineProps();
- props.spaceStart = new
SpaceVal(propertyList.get("space-start").getSpace());
- props.spaceEnd = new SpaceVal(propertyList.get("space-end").getSpace());
+ props.spaceStart = new
SpaceVal(propertyList.get(PR_SPACE_START).getSpace());
+ props.spaceEnd = new SpaceVal(propertyList.get(PR_SPACE_END).getSpace());
return props;
}
@@ -388,11 +388,11 @@
public CommonAccessibility getAccessibilityProps() {
CommonAccessibility props = new CommonAccessibility();
String str;
- str = this.propertyList.get("source-document").getString();
+ str = this.propertyList.get(PR_SOURCE_DOCUMENT).getString();
if (!NONE.equals(str)) {
props.sourceDoc = str;
}
- str = this.propertyList.get("role").getString();
+ str = this.propertyList.get(PR_ROLE).getString();
if (!NONE.equals(str)) {
props.role = str;
}
@@ -427,11 +427,11 @@
public CommonAbsolutePosition getAbsolutePositionProps() {
CommonAbsolutePosition props = new CommonAbsolutePosition();
props.absolutePosition =
- this.propertyList.get("absolute-position").getEnum();
- props.top = this.propertyList.get("top").getLength().getValue();
- props.bottom = this.propertyList.get("bottom").getLength().getValue();
- props.left = this.propertyList.get("left").getLength().getValue();
- props.right = this.propertyList.get("right").getLength().getValue();
+ this.propertyList.get(PR_ABSOLUTE_POSITION).getEnum();
+ props.top = this.propertyList.get(PR_TOP).getLength().getValue();
+ props.bottom = this.propertyList.get(PR_BOTTOM).getLength().getValue();
+ props.left = this.propertyList.get(PR_LEFT).getLength().getValue();
+ props.right = this.propertyList.get(PR_RIGHT).getLength().getValue();
return props;
}
@@ -442,12 +442,12 @@
*/
public BlockProps getBlockProps() {
BlockProps props = new BlockProps();
- props.firstIndent =
this.propertyList.get("text-indent").getLength().getValue();
+ props.firstIndent =
this.propertyList.get(PR_TEXT_INDENT).getLength().getValue();
props.lastIndent = 0;
/*this.propertyList.get("last-line-end-indent").getLength().mvalue(); */
- props.textAlign = this.propertyList.get("text-align").getEnum();
- props.textAlignLast = this.propertyList.get("text-align-last").getEnum();
- props.lineStackType =
this.propertyList.get("line-stacking-strategy").getEnum();
+ props.textAlign = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
+ props.textAlignLast = this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
+ props.lineStackType =
this.propertyList.get(PR_LINE_STACKING_STRATEGY).getEnum();
return props;
}
@@ -459,13 +459,13 @@
*/
public LayoutProps getLayoutProps() {
LayoutProps props = new LayoutProps();
- props.breakBefore = this.propertyList.get("break-before").getEnum();
- props.breakAfter = this.propertyList.get("break-after").getEnum();
- props.bIsSpan = (this.propertyList.get("span").getEnum() == Span.ALL);
+ props.breakBefore = this.propertyList.get(PR_BREAK_BEFORE).getEnum();
+ props.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
+ props.bIsSpan = (this.propertyList.get(PR_SPAN).getEnum() == Span.ALL);
props.spaceBefore = new SpaceVal(
- this.propertyList.get("space-before").getSpace());
+ this.propertyList.get(PR_SPACE_BEFORE).getSpace());
props.spaceAfter = new SpaceVal(
- this.propertyList.get("space-after").getSpace());
+ this.propertyList.get(PR_SPACE_AFTER).getSpace());
return props;
}
@@ -480,28 +480,28 @@
if (textInfo == null) {
textInfo = new TextInfo();
textInfo.fs = getFontState(foTreeControl);
- textInfo.color = propertyList.get("color").getColorType();
+ textInfo.color = propertyList.get(PR_COLOR).getColorType();
textInfo.verticalAlign =
- propertyList.get("vertical-align").getEnum();
+ propertyList.get(PR_VERTICAL_ALIGN).getEnum();
- textInfo.wrapOption = propertyList.get("wrap-option").getEnum();
+ textInfo.wrapOption = propertyList.get(PR_WRAP_OPTION).getEnum();
textInfo.bWrap = (textInfo.wrapOption == Constants.WRAP);
textInfo.wordSpacing = new SpaceVal(
- propertyList.get("word-spacing").getSpace());
+ propertyList.get(PR_WORD_SPACING).getSpace());
/* textInfo.letterSpacing =
new SpaceVal(propertyList.get("letter-spacing").getSpace());*/
textInfo.whiteSpaceCollapse =
- propertyList.get("white-space-collapse").getEnum();
+ propertyList.get(PR_WHITE_SPACE_COLLAPSE).getEnum();
textInfo.lineHeight = this.propertyList.get(
- "line-height").getLength().getValue();
+ PR_LINE_HEIGHT).getLength().getValue();
textInfo.textTransform
- = this.propertyList.get("text-transform").getEnum();
+ = this.propertyList.get(PR_TEXT_TRANSFORM).getEnum();
}
return textInfo;
@@ -512,14 +512,14 @@
* @return the enumerated reference-orientation
*/
public int getAbsRefOrient() {
- return propertyList.get("reference-orientation").getNumber().intValue();
+ return propertyList.get(PR_REFERENCE_ORIENTATION).getNumber().intValue();
}
/**
* @return the enumerated writing-mode
*/
public int getWritingMode() {
- return propertyList.get("writing-mode").getEnum();
+ return propertyList.get(PR_WRITING_MODE).getEnum();
}
}
1.3 +3 -1 xml-fop/src/java/org/apache/fop/fo/expr/FromParentFunction.java
Index: FromParentFunction.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/expr/FromParentFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FromParentFunction.java 13 Jul 2003 03:16:11 -0000 1.2
+++ FromParentFunction.java 27 Dec 2003 22:00:38 -0000 1.3
@@ -51,6 +51,8 @@
package org.apache.fop.fo.expr;
import org.apache.fop.fo.Property;
+import org.apache.fop.fo.properties.FOPropertyMapping;
+
/**
* Class modelling the from-parent Property Value function. See Sec. 5.10.4 of
@@ -86,7 +88,7 @@
* non-inherited properties too. Perhaps the result is different for
* a property line line-height which "inherits specified"???
*/
- return pInfo.getPropertyList().getFromParent(propName);
+ return
pInfo.getPropertyList().getFromParent(FOPropertyMapping.getPropertyId(propName));
}
}
1.11 +16 -16 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Block.java 22 Dec 2003 21:37:44 -0000 1.10
+++ Block.java 27 Dec 2003 22:00:38 -0000 1.11
@@ -132,14 +132,14 @@
*/
public void handleAttrs(Attributes attlist) throws FOPException {
super.handleAttrs(attlist);
- this.span = this.propertyList.get("span").getEnum();
+ this.span = this.propertyList.get(PR_SPAN).getEnum();
this.wsTreatment =
- this.propertyList.get("white-space-treatment").getEnum();
+ this.propertyList.get(PR_WHITE_SPACE_TREATMENT).getEnum();
this.bWScollapse =
- (this.propertyList.get("white-space-collapse").getEnum()
+ (this.propertyList.get(PR_WHITE_SPACE_COLLAPSE).getEnum()
== Constants.TRUE);
this.lfTreatment =
- this.propertyList.get("linefeed-treatment").getEnum();
+ this.propertyList.get(PR_LINEFEED_TREATMENT).getEnum();
setupID();
@@ -199,29 +199,29 @@
// this.propertyList.get("wrap-option");
// this.propertyList.get("z-index");
- this.align = this.propertyList.get("text-align").getEnum();
+ this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
this.alignLast =
- this.propertyList.get("text-align-last").getEnum();
- this.breakAfter = this.propertyList.get("break-after").getEnum();
+ this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
+ this.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
this.lineHeight = this.propertyList.get(
- "line-height").getLength().getValue();
+ PR_LINE_HEIGHT).getLength().getValue();
this.startIndent = this.propertyList.get(
- "start-indent").getLength().getValue();
+ PR_START_INDENT).getLength().getValue();
this.endIndent = this.propertyList.get(
- "end-indent").getLength().getValue();
+ PR_END_INDENT).getLength().getValue();
this.spaceBefore = this.propertyList.get(
- "space-before.optimum").getLength().getValue();
+ PR_SPACE_BEFORE |
CP_OPTIMUM).getLength().getValue();
this.spaceAfter = this.propertyList.get(
- "space-after.optimum").getLength().getValue();
+ PR_SPACE_AFTER | CP_OPTIMUM).getLength().getValue();
this.textIndent = this.propertyList.get(
- "text-indent").getLength().getValue();
+ PR_TEXT_INDENT).getLength().getValue();
this.keepWithNext =
- this.propertyList.get("keep-with-next").getEnum();
+ this.propertyList.get(PR_KEEP_WITH_NEXT).getEnum();
this.blockWidows =
- this.propertyList.get("widows").getNumber().intValue();
+ this.propertyList.get(PR_WIDOWS).getNumber().intValue();
this.blockOrphans =
- this.propertyList.get("orphans").getNumber().intValue();
+ this.propertyList.get(PR_ORPHANS).getNumber().intValue();
}
1.8 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BlockContainer.java 20 Dec 2003 06:53:22 -0000 1.7
+++ BlockContainer.java 27 Dec 2003 22:00:38 -0000 1.8
@@ -93,7 +93,7 @@
*/
public void handleAttrs(Attributes attlist) throws FOPException {
super.handleAttrs(attlist);
- this.span = this.propertyList.get("span").getEnum();
+ this.span = this.propertyList.get(PR_SPAN).getEnum();
setupID();
}
@@ -126,11 +126,11 @@
// this.propertyList.get("writing-mode");
this.backgroundColor =
- this.propertyList.get("background-color").getColorType();
+ this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
- this.width = this.propertyList.get("width").getLength().getValue();
- this.height = this.propertyList.get("height").getLength().getValue();
- span = this.propertyList.get("span").getEnum();
+ this.width = this.propertyList.get(PR_WIDTH).getLength().getValue();
+ this.height = this.propertyList.get(PR_HEIGHT).getLength().getValue();
+ span = this.propertyList.get(PR_SPAN).getEnum();
}
1.8 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Inline.java 20 Dec 2003 06:53:22 -0000 1.7
+++ Inline.java 27 Dec 2003 22:00:38 -0000 1.8
@@ -133,7 +133,7 @@
// this.propertyList.get("visibility");
// this.propertyList.get("z-index");
- int textDecoration = this.propertyList.get("text-decoration").getEnum();
+ int textDecoration = this.propertyList.get(PR_TEXT_DECORATION).getEnum();
if (textDecoration == TextDecoration.UNDERLINE) {
this.underlined = true;
1.5 +2 -1 xml-fop/src/java/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Marker.java 20 Dec 2003 06:53:22 -0000 1.4
+++ Marker.java 27 Dec 2003 22:00:38 -0000 1.5
@@ -55,6 +55,7 @@
// FOP
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.FOTreeVisitor;
@@ -89,7 +90,7 @@
super.handleAttrs(attlist);
this.markerClassName =
- this.propertyList.get("marker-class-name").getString();
+ this.propertyList.get(Constants.PR_MARKER_CLASS_NAME).getString();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
