[FOray-commit] SF.net SVN: foray: [8595] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8595] trunk/foray
|
From: <vic...@us...> - 2007-02-03 00:12:31
|
Revision: 8595
http://svn.sourceforge.net/foray/?rev=8595&view=rev
Author: victormote
Date: 2007-02-02 16:12:31 -0800 (Fri, 02 Feb 2007)
Log Message:
-----------
Conform to axsl changes for converting an enumeration to a typesafe enum.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java
trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java
trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -282,7 +282,7 @@
public org.axsl.fontR.FontUse selectFontXSL(final int selectionStrategy,
final String [] familyList, final Font.Style style,
final Font.Weight weight, final Font.Variant variant,
- final int stretch, final int size, final int codePoint)
+ final Font.Stretch stretch, final int size, final int codePoint)
throws FontException {
final FontSelector selector = getFontSelector(selectionStrategy);
final RegisteredFontDesc fontDescSelected = selector.selectFont(
@@ -469,8 +469,8 @@
*/
public org.axsl.fontR.FontUse selectFontCSS(final String [] familyList,
final Font.Style style, final Font.Weight weight,
- final Font.Variant variant, final int stretch, final int size,
- final int codePoint) throws FontException {
+ final Font.Variant variant, final Font.Stretch stretch,
+ final int size, final int codePoint) throws FontException {
return selectFontXSL(Font.SelectionStrategy.CHARACTER_BY_CHARACTER,
familyList, style, weight,
variant, stretch, size, codePoint);
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -659,7 +659,8 @@
}
final org.axsl.fontR.Font.Variant fontVariant
= org.axsl.fontR.Font.Variant.NORMAL;
- final byte fontStretch = org.axsl.fontR.Font.Stretch.NORMAL;
+ final org.axsl.fontR.Font.Stretch fontStretch
+ = org.axsl.fontR.Font.Stretch.NORMAL;
new RegisteredFontDesc(rf, rff, null, fontStyle, fontWeight,
fontVariant, fontStretch);
try {
@@ -1150,7 +1151,7 @@
final org.axsl.fontR.Font.Style style,
final org.axsl.fontR.Font.Weight weight,
final org.axsl.fontR.Font.Variant variant,
- final byte stretch,
+ final org.axsl.fontR.Font.Stretch stretch,
final float simulatedSmallCaps, final float simulatedOblique,
final float simulatedBackslant, final float[] simulatedStretch)
throws FontException {
Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -66,7 +66,7 @@
*/
public abstract RegisteredFontDesc selectFont(String [] familyList,
Font.Style style, Font.Weight weight, Font.Variant variant,
- int stretch, int size, int codePoint) throws FontException;
+ Font.Stretch stretch, int size, int codePoint) throws FontException;
/**
* Returns the parent font consumer instance.
Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -58,9 +58,8 @@
*/
public RegisteredFontDesc selectFont(final String [] familyList,
final Font.Style style, final Font.Weight weight,
- final Font.Variant variant, final int stretch, final int size,
- final int codePoint)
- throws FontException {
+ final Font.Variant variant, final Font.Stretch stretch,
+ final int size, final int codePoint) throws FontException {
FOrayFont fontSelected = null;
RegisteredFontDesc fontDescSelected = null;
if (familyList != null) {
@@ -101,7 +100,8 @@
*/
private RegisteredFontDesc selectFont(final String familyToTry,
final Font.Style style, final Font.Weight weight,
- final Font.Variant variant, final int stretch, final int size) {
+ final Font.Variant variant, final Font.Stretch stretch,
+ final int size) {
if (familyToTry == null) {
return null;
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -101,7 +101,7 @@
private Font.Variant fontVariant;
/** The stretch value of this description. */
- private byte fontStretch;
+ private Font.Stretch fontStretch;
/**
* Percentage that should be applied to the standard font size to obtain
@@ -158,7 +158,7 @@
public RegisteredFontDesc(final RegisteredFont rf,
final RegisteredFontFamily rff, final Encoding encoding,
final Font.Style fontStyle, final Font.Weight fontWeight,
- final Font.Variant fontVariant, final byte fontStretch) {
+ final Font.Variant fontVariant, final Font.Stretch fontStretch) {
this.registeredFont = rf;
this.registeredFontFamily = rff;
this.encoding = encoding;
@@ -196,7 +196,7 @@
* Return the font-stretch for this registered description.
* @return The font-stretch value.
*/
- public byte getFontStretch() {
+ public Font.Stretch getFontStretch() {
return this.fontStretch;
}
@@ -604,12 +604,12 @@
* considered in the test.
* @return True iff the style of this font description matches the criteria.
*/
- public boolean stretchMatches(final int desiredStretch,
+ public boolean stretchMatches(final Font.Stretch desiredStretch,
final boolean considerSimulated) {
if (desiredStretch == Font.Stretch.ANY) {
return true;
}
- final int actualStretch = getFontStretch();
+ final Font.Stretch actualStretch = getFontStretch();
if (actualStretch == desiredStretch) {
return true;
}
@@ -652,7 +652,7 @@
public boolean matchPerfect(final RegisteredFontFamily family,
final boolean considerSimulated, final Font.Style style,
final Font.Weight weight, final Font.Variant variant,
- final int stretch, final boolean freeStandingFonts,
+ final Font.Stretch stretch, final boolean freeStandingFonts,
final boolean systemFonts) {
if (! generalTypeMatches(freeStandingFonts, systemFonts)) {
return false;
@@ -685,7 +685,7 @@
*/
public boolean matchIgnoreWeight(final RegisteredFontFamily family,
final boolean considerSimulated, final Font.Style style,
- final Font.Variant variant, final int stretch,
+ final Font.Variant variant, final Font.Stretch stretch,
final boolean freeStandingFonts, final boolean systemFonts) {
if (! generalTypeMatches(freeStandingFonts, systemFonts)) {
return false;
Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -108,8 +108,8 @@
if (fontVariant == Font.Variant.UNKNOWN) {
fontVariant = Font.Variant.NORMAL;
}
- byte fontStretch = FontUtility.foFontStretch(stretch, false);
- if (fontStretch < 0) {
+ Font.Stretch fontStretch = FontUtility.foFontStretch(stretch, false);
+ if (fontStretch == Font.Stretch.UNKNOWN) {
fontStretch = Font.Stretch.NORMAL;
}
final float simSmallCaps = convertPercent(simulatedSmallCaps);
@@ -150,7 +150,7 @@
protected void registerFontDesc(final RegisteredFont registeredFont,
final Encoding encoding, final Font.Style style,
final Font.Weight weight,
- final Font.Variant variant, final byte stretch,
+ final Font.Variant variant, final Font.Stretch stretch,
final float simulatedSmallCaps, final float simulatedOblique,
final float simulatedBackslant, final float[] simulatedStretch)
throws FontException {
@@ -193,7 +193,7 @@
*/
protected RegisteredFontDesc findRegisteredFontDesc(final Font.Style style,
final Font.Weight weight, final Font.Variant variant,
- final int stretch, final boolean freeStandingFonts,
+ final Font.Stretch stretch, final boolean freeStandingFonts,
final boolean systemFonts) {
/* First, look for a perfect match without considering simulated
* features. */
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -1247,7 +1247,7 @@
/**
* {@inheritDoc}
*/
- public short traitFontStretch(final FOContext context) {
+ public Font.Stretch traitFontStretch(final FOContext context) {
return propertyList.getFontStretch(context);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -246,7 +246,7 @@
getFontStyle(context),
getFontWeight(context),
getFontVariant(context),
- convertFontStretch(getFontStretch(context)),
+ getFontStretch(context),
getFontSize(context),
firstChar);
} catch (final FontException e) {
@@ -267,7 +267,7 @@
getFontStyle(context),
getFontWeight(context),
getFontVariant(context),
- convertFontStretch(getFontStretch(context)),
+ getFontStretch(context),
getFontSize(context),
codePoint);
} catch (final FontException e) {
@@ -1767,7 +1767,7 @@
return FontVariant.getValueNoInstance(context, fobj);
}
- public short getFontStretch(final FOContext context) {
+ public org.axsl.fontR.Font.Stretch getFontStretch(final FOContext context) {
final FontStretch property = (FontStretch) getProperty(
FoProperty.FONT_STRETCH);
if (property != null) {
@@ -3301,36 +3301,4 @@
return org.axsl.fontR.Font.Style.NORMAL;
}
- public static int convertFontStretch(final short parsedFontStretch) {
- switch (parsedFontStretch) {
- case FoValue.ULTRA_CONDENSED: {
- return org.axsl.fontR.Font.Stretch.ULTRA_CONDENSED;
- }
- case FoValue.EXTRA_CONDENSED: {
- return org.axsl.fontR.Font.Stretch.EXTRA_CONDENSED;
- }
- case FoValue.CONDENSED: {
- return org.axsl.fontR.Font.Stretch.CONDENSED;
- }
- case FoValue.SEMI_CONDENSED: {
- return org.axsl.fontR.Font.Stretch.SEMI_CONDENSED;
- }
- case FoValue.NORMAL: {
- return org.axsl.fontR.Font.Stretch.NORMAL;
- }
- case FoValue.SEMI_EXPANDED: {
- return org.axsl.fontR.Font.Stretch.SEMI_EXPANDED;
- }
- case FoValue.EXPANDED: {
- return org.axsl.fontR.Font.Stretch.EXPANDED;
- }
- case FoValue.EXTRA_EXPANDED: {
- return org.axsl.fontR.Font.Stretch.EXTRA_EXPANDED;
- }
- case FoValue.ULTRA_EXPANDED: {
- return org.axsl.fontR.Font.Stretch.ULTRA_EXPANDED;
- }
- }
- return org.axsl.fontR.Font.Stretch.NORMAL;
- }
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -36,6 +36,7 @@
import org.foray.fotree.value.PropertyValue;
import org.axsl.common.FoValue;
+import org.axsl.fontR.Font;
import org.axsl.foR.FOContext;
/**
@@ -80,28 +81,53 @@
throw unexpectedValue(value, propertyList);
}
- public short getValue(final FObj fobj) {
+ public Font.Stretch getValue(final FObj fobj) {
if (value() instanceof PropertyKeyword) {
final short keyword = ((PropertyKeyword) value()).getValue();
switch (keyword) {
- case FoValue.INHERIT: {
+ case FoValue.ULTRA_CONDENSED: {
+ return Font.Stretch.ULTRA_CONDENSED;
}
+ case FoValue.EXTRA_CONDENSED: {
+ return Font.Stretch.EXTRA_CONDENSED;
}
+ case FoValue.CONDENSED: {
+ return Font.Stretch.CONDENSED;
+ }
+ case FoValue.SEMI_CONDENSED: {
+ return Font.Stretch.SEMI_CONDENSED;
+ }
+ case FoValue.NORMAL: {
+ return Font.Stretch.NORMAL;
+ }
+ case FoValue.SEMI_EXPANDED: {
+ return Font.Stretch.SEMI_EXPANDED;
+ }
+ case FoValue.EXPANDED: {
+ return Font.Stretch.EXPANDED;
+ }
+ case FoValue.EXTRA_EXPANDED: {
+ return Font.Stretch.EXTRA_EXPANDED;
+ }
+ case FoValue.ULTRA_EXPANDED: {
+ return Font.Stretch.ULTRA_EXPANDED;
+ }
+ }
}
- return 0;
+ return Font.Stretch.NORMAL;
}
- public static short getValueNoInstance(final FOContext context,
+ public static Font.Stretch getValueNoInstance(final FOContext context,
final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitFontStretch(context);
}
- return FoValue.NORMAL;
+ return Font.Stretch.NORMAL;
}
- public static short getInitialValue() {
- return FoValue.NORMAL;
+ public static Font.Stretch getInitialValue() {
+ return Font.Stretch.NORMAL;
}
protected short[] getValidKeywords() {
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2007-02-02 23:41:34 UTC (rev 8594)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2007-02-03 00:12:31 UTC (rev 8595)
@@ -997,7 +997,8 @@
font = this.fontConsumer.selectFontCSS(fontFamily,
org.axsl.fontR.Font.Style.NORMAL,
org.axsl.fontR.Font.Weight.NORMAL,
- org.axsl.fontR.Font.Variant.NORMAL, 0, 0, ch);
+ org.axsl.fontR.Font.Variant.NORMAL,
+ org.axsl.fontR.Font.Stretch.NORMAL, 0, ch);
} catch (final FontException e) {
/* We can't find a font for this character, so skip it. */
continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
