foray-commit Mailing List for FOray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
(1) |
2
|
3
|
4
|
|
5
|
6
|
7
|
8
|
9
|
10
|
11
(1) |
|
12
|
13
|
14
|
15
|
16
|
17
|
18
|
|
19
|
20
|
21
|
22
|
23
|
24
|
25
|
|
26
|
27
|
28
(2) |
29
(7) |
30
(3) |
|
|
|
From: <vic...@us...> - 2010-09-30 20:47:22
|
Revision: 11059
http://foray.svn.sourceforge.net/foray/?rev=11059&view=rev
Author: victormote
Date: 2010-09-30 20:47:15 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
Add basic implementations of some of the line content types.
Modified Paths:
--------------
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java
Added Paths:
-----------
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBox4a.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbGlue4a.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbPenalty4a.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LineContentIterator4a.java
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBox4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBox4a.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBox4a.java 2010-09-30 20:47:15 UTC (rev 11059)
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.linebreak;
+
+import org.axsl.linebreak.LbBox;
+
+/**
+ * A hard-wired implementation of LbBox.
+ */
+public class LbBox4a implements LbBox {
+
+ /** The width of this box, in millipoints. */
+ private int width;
+
+ /**
+ * Constructor.
+ * @param width The width of this box, in millipoints.
+ */
+ public LbBox4a(final int width) {
+ this.width = width;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getWidth() {
+ return this.width;
+ }
+
+}
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbGlue4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbGlue4a.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbGlue4a.java 2010-09-30 20:47:15 UTC (rev 11059)
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.linebreak;
+
+import org.axsl.linebreak.LbGlue;
+
+/**
+ * A hard-wired implementation of LbGlue.
+ */
+public class LbGlue4a implements LbGlue {
+
+ /** The ideal width of this glue, in millipoints. */
+ private int idealWidth;
+
+ /** The stretchability of this glue, in millipoints. */
+ private int stretchability;
+
+ /** The shrinkability of this glue, in millipoints. */
+ private int shrinkability;
+
+ /**
+ * Constructor.
+ * @param idealWidth The ideal width of this glue, in millipoints.
+ * @param stretchability The stretchability of this glue, in millipoints.
+ * @param shrinkability The shrinkability of this glue, in millipoints.
+ */
+ public LbGlue4a(final int idealWidth, final int stretchability, final int shrinkability) {
+ this.idealWidth = idealWidth;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getIdealWidth() {
+ return this.idealWidth;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getStretchability() {
+ return this.stretchability;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getShrinkability() {
+ return this.shrinkability;
+ }
+
+}
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbPenalty4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbPenalty4a.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbPenalty4a.java 2010-09-30 20:47:15 UTC (rev 11059)
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.linebreak;
+
+import org.axsl.linebreak.LbPenalty;
+
+/**
+ * A hard-wired implementation of LbPenalty.
+ */
+public class LbPenalty4a implements LbPenalty {
+
+ /** The width of this penalty, in millipoints. */
+ private int width;
+
+ /** The penalty value. */
+ private int penalty;
+
+ /** Indicates whether this is a "flagged" penalty. */
+ private boolean flagged;
+
+ /**
+ * Constructor.
+ * @param width The width of this box, in millipoints.
+ * @param penalty The penalty value.
+ * @param flagged Indicates whether this is a "flagged" penalty.
+ */
+ public LbPenalty4a(final int width, final int penalty, final boolean flagged) {
+ this.width = width;
+ this.penalty = penalty;
+ this.flagged = flagged;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getWidth() {
+ return this.width;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getPenalty() {
+ return this.penalty;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isFlagged() {
+ return this.flagged;
+ }
+
+}
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LineContentIterator4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LineContentIterator4a.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LineContentIterator4a.java 2010-09-30 20:47:15 UTC (rev 11059)
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.linebreak;
+
+import org.axsl.linebreak.LbContent;
+import org.axsl.linebreak.LineContentIterator;
+import org.axsl.text.line.LineContent;
+import org.axsl.text.line.LineNonText;
+import org.axsl.text.line.LineText;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+/**
+ * Accepts line content as input and converts it to input for the line-breaking system.
+ */
+public class LineContentIterator4a implements LineContentIterator {
+
+ /** The list of line content that has been added as input to the iterator. */
+ private List<LineContent> lineContentList = new ArrayList<LineContent>();
+
+ /** Index into {@link #lineContentList} indicating which item in the list is will next be processed by the
+ * iterator. */
+ private int lineContentIndex = 0;
+
+ /** The index into {@link #getCurrentLineText()} indicating which character in that text item will next be processed
+ * by the iterator. */
+ private int currentLineTextItemIndex = -1;
+
+ /**
+ * Constructor.
+ */
+ public LineContentIterator4a() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addContent(final LineContent newContent) {
+ this.lineContentList.add(newContent);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean hasNext() {
+ if (this.lineContentIndex >= this.lineContentList.size()) {
+ return false;
+ }
+ if (this.lineContentIndex == this.lineContentList.size() - 1) {
+ /* The current item is the last item. If it is a text item, we need to see whether we are at the end of
+ * the sequence. */
+ final LineText lineText = getCurrentLineText();
+ if (lineText != null
+ && this.currentLineTextItemIndex >= lineText.inlineText().length()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Convenenience method that returns the current line content item as a LineText item if it is one.
+ * @return The current line content as a LineText item if it is one. Otherwise, returns null.
+ */
+ private LineText getCurrentLineText() {
+ if (this.lineContentIndex >= this.lineContentList.size()) {
+ return null;
+ }
+ if (this.lineContentList.get(this.lineContentIndex) instanceof LineText) {
+ return (LineText) this.lineContentList.get(this.lineContentIndex);
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public LbContent next() {
+ if (! hasNext()) {
+ throw new NoSuchElementException("No more elements in " + this.getClass().getName());
+ }
+ final LineContent lineContent = this.lineContentList.get(this.lineContentIndex);
+ if (lineContent instanceof LineNonText) {
+ final LineNonText lineNonText = (LineNonText) lineContent;
+ final int optimum = lineNonText.inlineSizeOptimum(1);
+ final int minimum = lineNonText.inlineSizeMinimum(1);
+ final int maximum = lineNonText.inlineSizeMaximum(1);
+ this.lineContentIndex ++;
+ return new LbGlue4a(optimum, maximum - optimum, optimum - minimum);
+ }
+ if (lineContent instanceof LineText) {
+ final LineText lineText = (LineText) lineContent;
+ final int codePoint = lineText.inlineText().charAt(this.currentLineTextItemIndex);
+ final int width = lineText.inlinePrimaryFont().getFont().width(codePoint, lineText.inlineFontSize());
+ this.currentLineTextItemIndex ++;
+ if (this.currentLineTextItemIndex >= lineText.inlineText().length()) {
+ this.currentLineTextItemIndex = -1;
+ this.lineContentIndex ++;
+ }
+ return new LbBox4a(width);
+ }
+ throw new IllegalStateException("Unknown LineContent item: " + lineContent.getClass().getName());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void remove() {
+ throw new UnsupportedOperationException("Operation \"remove\" is not supported by "
+ + this.getClass().getName());
+ }
+
+}
Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java 2010-09-30 16:52:35 UTC (rev 11058)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java 2010-09-30 20:47:15 UTC (rev 11059)
@@ -30,6 +30,7 @@
import org.axsl.linebreak.LineBreaker;
import org.axsl.linebreak.LineBreakerFactory;
+import org.axsl.linebreak.LineContentIterator;
/**
* Factory for the Knuth-Plass optimum-fit line-breaking algorithm.
@@ -43,5 +44,12 @@
return new OptimumFitLb4a();
}
+ /**
+ * {@inheritDoc}
+ */
+ public LineContentIterator obtainLineContentIterator() {
+ return new LineContentIterator4a();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-30 16:52:41
|
Revision: 11058
http://foray.svn.sourceforge.net/foray/?rev=11058&view=rev
Author: victormote
Date: 2010-09-30 16:52:35 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
Rough-in an implementation of the axsl line-breaking classes.
Added Paths:
-----------
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLb4a.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java
trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/package-info.java
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLb4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLb4a.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLb4a.java 2010-09-30 16:52:35 UTC (rev 11058)
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.linebreak;
+
+import org.axsl.linebreak.LbContent;
+import org.axsl.linebreak.LineBreaker;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Line-breaker that implements the Knuth-Plass optimum-fit algorithm.
+ */
+public class OptimumFitLb4a implements LineBreaker {
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Integer> breakIntoLines(final Iterator<LbContent> paragraph) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/OptimumFitLbFactory4a.java 2010-09-30 16:52:35 UTC (rev 11058)
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.linebreak;
+
+import org.axsl.linebreak.LineBreaker;
+import org.axsl.linebreak.LineBreakerFactory;
+
+/**
+ * Factory for the Knuth-Plass optimum-fit line-breaking algorithm.
+ */
+public class OptimumFitLbFactory4a implements LineBreakerFactory {
+
+ /**
+ * {@inheritDoc}
+ */
+ public LineBreaker obtainLineBreaker() {
+ return new OptimumFitLb4a();
+ }
+
+
+}
Added: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/package-info.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/package-info.java (rev 0)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/package-info.java 2010-09-30 16:52:35 UTC (rev 11058)
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision: 11056 $
+ * $LastChangedDate: 2010-09-29 15:38:14 -0600 (Wed, 29 Sep 2010) $
+ * $LastChangedBy$
+ */
+
+/**
+ * <p>Classes for line-breaking.</p>
+ */
+
+package org.foray.linebreak;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 21:50:04
|
Revision: 11057
http://foray.svn.sourceforge.net/foray/?rev=11057&view=rev
Author: victormote
Date: 2010-09-29 21:49:57 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Clean up more references to foray-text.
Modified Paths:
--------------
trunk/foray/foray-all/doc/web/module/index.html
trunk/foray/foray-all/scripts/build.xml
trunk/foray/foray-linebreak/scripts/build.xml
Modified: trunk/foray/foray-all/doc/web/module/index.html
===================================================================
--- trunk/foray/foray-all/doc/web/module/index.html 2010-09-29 21:38:14 UTC (rev 11056)
+++ trunk/foray/foray-all/doc/web/module/index.html 2010-09-29 21:49:57 UTC (rev 11057)
@@ -28,8 +28,8 @@
<p>Because of its modular design, FOray can be thought of as a set of
open-source modules useful for developers who write document processing
applications.
-Although FOray’s reference application is an XSL-FO application, many of
-FOray’s components are independent of that standard, and can be successfully
+Although FOray’s reference application is an XSL-FO application, many of
+FOray’s components are independent of that standard, and can be successfully
used in other document processing schemes.</p>
<p>The purpose of this page is to briefly describe the FOray modules and the
@@ -118,7 +118,7 @@
</tr>
<tr>
<td><a class="Menu" href="./text/">FOrayText</a></td>
- <td>foray-text</td>
+ <td>foray-linebreak</td>
<td>Handles line-breaking chores.</td>
<td>Universals.</td>
</tr>
Modified: trunk/foray/foray-all/scripts/build.xml
===================================================================
--- trunk/foray/foray-all/scripts/build.xml 2010-09-29 21:38:14 UTC (rev 11056)
+++ trunk/foray/foray-all/scripts/build.xml 2010-09-29 21:49:57 UTC (rev 11057)
@@ -32,7 +32,7 @@
<fileset dir="${foray.sandbox}/foray-ps/build/ant" includes="foray*.jar"/>
<fileset dir="${foray.sandbox}/foray-render/build/ant" includes="foray*.jar"/>
<fileset dir="${foray.sandbox}/foray-speech/build/ant" includes="foray*.jar"/>
- <fileset dir="${foray.sandbox}/foray-text/build/ant" includes="foray*.jar"/>
+ <fileset dir="${foray.sandbox}/foray-linebreak/build/ant" includes="foray*.jar"/>
<fileset dir="${foray.sandbox}/foray-xml/build/ant" includes="foray*.jar"/>
</path>
@@ -53,7 +53,7 @@
<fileset dir="${foray.sandbox}/foray-ps/build/ant" includes="test*.jar"/>
<fileset dir="${foray.sandbox}/foray-render/build/ant" includes="test*.jar"/>
<fileset dir="${foray.sandbox}/foray-speech/build/ant" includes="test*.jar"/>
- <fileset dir="${foray.sandbox}/foray-text/build/ant" includes="test*.jar"/>
+ <fileset dir="${foray.sandbox}/foray-linebreak/build/ant" includes="test*.jar"/>
<fileset dir="${foray.sandbox}/foray-xml/build/ant" includes="test*.jar"/>
</path>
@@ -75,7 +75,7 @@
<mkdir dir="${foray.sandbox}/foray-font/build/ant/classes"/>
<mkdir dir="${foray.sandbox}/foray-speech/build/ant/classes"/>
<mkdir dir="${foray.sandbox}/foray-hyphen/build/ant/classes"/>
- <mkdir dir="${foray.sandbox}/foray-text/build/ant/classes"/>
+ <mkdir dir="${foray.sandbox}/foray-linebreak/build/ant/classes"/>
<mkdir dir="${foray.sandbox}/foray-fotree/build/ant/classes"/>
<mkdir dir="${foray.sandbox}/foray-areatree/build/ant/classes"/>
<mkdir dir="${foray.sandbox}/foray-layout/build/ant/classes"/>
@@ -150,8 +150,8 @@
dir="${foray.sandbox}/foray-hyphen/build/ant/classes">
<include name="**"/>
</fileset>
- <fileset id="foray-text-classes"
- dir="${foray.sandbox}/foray-text/build/ant/classes">
+ <fileset id="foray-linebreak-classes"
+ dir="${foray.sandbox}/foray-linebreak/build/ant/classes">
<include name="**"/>
</fileset>
<fileset id="foray-fotree-classes"
@@ -198,7 +198,7 @@
<fileset refid="foray-font-classes"/>
<fileset refid="foray-speech-classes"/>
<fileset refid="foray-hyphen-classes"/>
- <fileset refid="foray-text-classes"/>
+ <fileset refid="foray-linebreak-classes"/>
<fileset refid="foray-fotree-classes"/>
<fileset refid="foray-areatree-classes"/>
<fileset refid="foray-layout-classes"/>
@@ -425,7 +425,7 @@
<pathelement path="${foray.sandbox}/foray-render/src/java"/>
<pathelement path="${foray.sandbox}/foray-mif/src/java"/>
<pathelement path="${foray.sandbox}/foray-pdf/src/java"/>
- <pathelement path="${foray.sandbox}/foray-text/src/java"/>
+ <pathelement path="${foray.sandbox}/foray-linebreak/src/java"/>
<!-- Include the axsl source files here, so that the FOray classes can inherit doc from them.
See below where we exclude the related package names. -->
@@ -585,7 +585,7 @@
inheritall="false"
target="clean"/>
- <ant antfile="${foray.sandbox}/foray-text/scripts/build.xml"
+ <ant antfile="${foray.sandbox}/foray-linebreak/scripts/build.xml"
inheritall="false"
target="clean"/>
@@ -654,7 +654,7 @@
<ant antfile="${foray.sandbox}/foray-hyphen/scripts/build.xml"
inheritall="false"
target="style"/>
- <ant antfile="${foray.sandbox}/foray-text/scripts/build.xml"
+ <ant antfile="${foray.sandbox}/foray-linebreak/scripts/build.xml"
inheritall="false"
target="style"/>
<ant antfile="${foray.sandbox}/foray-pdf/scripts/build.xml"
@@ -795,7 +795,7 @@
<target name="text" depends="common"
description="Compile the text module">
<property name="module.text" value=", text"/>
- <ant antfile="${foray.sandbox}/foray-text/scripts/build.xml"
+ <ant antfile="${foray.sandbox}/foray-linebreak/scripts/build.xml"
inheritall="false"
target="style">
<property name="foray.config" value="${foray.config}"/>
Modified: trunk/foray/foray-linebreak/scripts/build.xml
===================================================================
--- trunk/foray/foray-linebreak/scripts/build.xml 2010-09-29 21:38:14 UTC (rev 11056)
+++ trunk/foray/foray-linebreak/scripts/build.xml 2010-09-29 21:49:57 UTC (rev 11057)
@@ -63,12 +63,12 @@
<tstamp>
<format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
</tstamp>
- <fileset id="foray-text-classes"
- dir="${foray.sandbox}/foray-text/build/ant/classes">
+ <fileset id="foray-linebreak-classes"
+ dir="${foray.sandbox}/foray-linebreak/build/ant/classes">
<include name="**"/>
</fileset>
<jar jarfile="${jar.file}">
- <fileset refid="foray-text-classes"/>
+ <fileset refid="foray-linebreak-classes"/>
<manifest>
<attribute name="Implementation-Title" value="${name}-${module}"/>
<attribute name="Implementation-Version" value="${version}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 21:38:22
|
Revision: 11056
http://foray.svn.sourceforge.net/foray/?rev=11056&view=rev
Author: victormote
Date: 2010-09-29 21:38:14 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Rename project foray-text to foray-linebreak.
Added Paths:
-----------
trunk/foray/foray-linebreak/
Removed Paths:
-------------
trunk/foray/foray-text/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 21:36:19
|
Revision: 11055
http://foray.svn.sourceforge.net/foray/?rev=11055&view=rev
Author: victormote
Date: 2010-09-29 21:36:13 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Rename project foray-text to foray-linebreak.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-text/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-29 20:04:14 UTC (rev 11054)
+++ trunk/foray/foray-all/pom.xml 2010-09-29 21:36:13 UTC (rev 11055)
@@ -464,7 +464,7 @@
</dependency>
<dependency>
<groupId>org.foray</groupId>
- <artifactId>foray-text</artifactId>
+ <artifactId>foray-linebreak</artifactId>
<version>0.4-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
@@ -585,6 +585,7 @@
<module>../foray-graphic</module>
<module>../foray-hyphen</module>
<module>../foray-layout</module>
+ <module>../foray-linebreak</module>
<module>../foray-mif</module>
<module>../foray-output</module>
<module>../foray-pdf</module>
@@ -592,7 +593,6 @@
<module>../foray-ps</module>
<module>../foray-render</module>
<module>../foray-speech</module>
- <module>../foray-text</module>
<module>../foray-xml</module>
</modules>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-09-29 20:04:14 UTC (rev 11054)
+++ trunk/foray/foray-app/pom.xml 2010-09-29 21:36:13 UTC (rev 11055)
@@ -167,7 +167,7 @@
</dependency>
<dependency>
<groupId>org.foray</groupId>
- <artifactId>foray-text</artifactId>
+ <artifactId>foray-linebreak</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-text/pom.xml
===================================================================
--- trunk/foray/foray-text/pom.xml 2010-09-29 20:04:14 UTC (rev 11054)
+++ trunk/foray/foray-text/pom.xml 2010-09-29 21:36:13 UTC (rev 11055)
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.foray</groupId>
- <artifactId>foray-text</artifactId>
+ <artifactId>foray-linebreak</artifactId>
<packaging>jar</packaging>
@@ -16,7 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
- <name>foray-text</name>
+ <name>foray-linebreak</name>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 20:04:20
|
Revision: 11054
http://foray.svn.sourceforge.net/foray/?rev=11054&view=rev
Author: victormote
Date: 2010-09-29 20:04:14 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Clean up more references to axsl-text.
Modified Paths:
--------------
trunk/foray/foray-all/scripts/build.xml
Modified: trunk/foray/foray-all/scripts/build.xml
===================================================================
--- trunk/foray/foray-all/scripts/build.xml 2010-09-29 19:21:37 UTC (rev 11053)
+++ trunk/foray/foray-all/scripts/build.xml 2010-09-29 20:04:14 UTC (rev 11054)
@@ -442,7 +442,7 @@
<pathelement path="${axsl.sandbox}/axsl-pdf/src/java"/>
<pathelement path="${axsl.sandbox}/axsl-ps/src/java"/>
<pathelement path="${axsl.sandbox}/axsl-speech/src/java"/>
- <pathelement path="${axsl.sandbox}/axsl-text/src/java"/>
+ <pathelement path="${axsl.sandbox}/axsl-linebreak/src/java"/>
</sourcepath>
<package name="org.foray.*"/>
<package name="org.axsl.*"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 19:21:43
|
Revision: 11053
http://foray.svn.sourceforge.net/foray/?rev=11053&view=rev
Author: victormote
Date: 2010-09-29 19:21:37 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Conform to axsl change from axsl-text to axsl-linebreak.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-core/pom.xml
trunk/foray/foray-text/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
+++ trunk/foray/foray-all/pom.xml 2010-09-29 19:21:37 UTC (rev 11053)
@@ -350,7 +350,7 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
- <artifactId>axsl-text</artifactId>
+ <artifactId>axsl-linebreak</artifactId>
<version>0.3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
Modified: trunk/foray/foray-core/pom.xml
===================================================================
--- trunk/foray/foray-core/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
+++ trunk/foray/foray-core/pom.xml 2010-09-29 19:21:37 UTC (rev 11053)
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
- <artifactId>axsl-text</artifactId>
+ <artifactId>axsl-linebreak</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-text/pom.xml
===================================================================
--- trunk/foray/foray-text/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
+++ trunk/foray/foray-text/pom.xml 2010-09-29 19:21:37 UTC (rev 11053)
@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
- <artifactId>axsl-text</artifactId>
+ <artifactId>axsl-linebreak</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 16:11:04
|
Revision: 11052
http://foray.svn.sourceforge.net/foray/?rev=11052&view=rev
Author: victormote
Date: 2010-09-29 16:10:56 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Conform to changes in aXSL in which i18n classes are split into a separate project.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-common/pom.xml
trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java
trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java
trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java
trunk/foray/foray-text/src/main/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-all/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
@@ -301,6 +301,13 @@
</dependency>
<dependency>
<groupId>org.axsl</groupId>
+ <artifactId>axsl-i18n</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
<artifactId>axsl-layout</artifactId>
<version>0.3-SNAPSHOT</version>
<type>jar</type>
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-common/pom.xml 2010-09-29 16:10:56 UTC (rev 11052)
@@ -47,6 +47,12 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.axsl</groupId>
+ <artifactId>axsl-i18n</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/FontUtil.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,7 +28,7 @@
package org.foray.common;
-import org.axsl.common.value.Iso15924;
+import org.axsl.i18n.Script;
/**
* Utility methods related to fonts.
@@ -41,11 +41,11 @@
private FontUtil() { }
/**
- * Converts an {@link Iso15924} script instance into its OpenType script equivalent.
+ * Converts an {@link Script} script instance into its OpenType script equivalent.
* @param script The ISO 15924 script for which the OpenType equivalent is needed.
* @return The OpenType equivalent.
*/
- public static String getOpenTypeScript(final Iso15924 script) {
+ public static String getOpenTypeScript(final Script script) {
/* TODO: This is probably not correct. */
return script.getAlphaCode().toLowerCase();
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FOLineText.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,11 +28,11 @@
package org.foray.fotree;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.fo.FoContext;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.font.FontUse;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.line.LineText;
/**
@@ -173,28 +173,28 @@
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage() {
+ public Language inlineLanguage() {
return this.realLineText.inlineLanguage(this.context);
}
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage(final FoContext context) {
+ public Language inlineLanguage(final FoContext context) {
return this.realLineText.inlineLanguage(context);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry() {
+ public Country inlineCountry() {
return this.realLineText.inlineCountry(this.context);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry(final FoContext context) {
+ public Country inlineCountry(final FoContext context) {
return this.realLineText.inlineCountry(context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FObj.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -75,9 +75,6 @@
import org.axsl.common.value.HyphenationKeep;
import org.axsl.common.value.IndexMerge;
import org.axsl.common.value.IntrusionDisplace;
-import org.axsl.common.value.Iso15924;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.common.value.LeaderAlignment;
import org.axsl.common.value.LeaderPattern;
import org.axsl.common.value.LineHeightShiftAdjustment;
@@ -258,6 +255,9 @@
import org.axsl.font.FontUse;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicServer;
+import org.axsl.i18n.Script;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.speech.SpeechException;
import org.axsl.speech.SpeechServer;
import org.axsl.speech.Voice;
@@ -2455,12 +2455,12 @@
/**
* {@inheritDoc}
*/
- public Iso639 traitLanguage(final FoContext context) {
+ public Language traitLanguage(final FoContext context) {
final String languageCode = this.getPropertyList().getLanguage(this,
context);
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
if (iso639 == null) {
- return Iso639.NULL;
+ return Language.NULL;
} else {
return iso639;
}
@@ -2469,7 +2469,7 @@
/**
* {@inheritDoc}
*/
- public Iso3166 traitCountry(final FoContext context) {
+ public Country traitCountry(final FoContext context) {
return this.getPropertyList().getCountry(this, context);
}
@@ -2612,7 +2612,7 @@
final FObj parent = this.effectiveParent(context);
if (this.isBlockLevelFo()
|| parent == null) {
- final Iso15924 script = this.traitScript(context);
+ final Script script = this.traitScript(context);
if (script.equals("auto")) {
final DtWritingMode writingMode = this.traitWritingMode(context);
if (writingMode.isHorizontal()) {
@@ -2640,7 +2640,7 @@
throw new IllegalStateException("Unable to obtain a font for baseline computation.");
}
final Font font = fontUse.getFont();
- final Iso15924 script = this.traitScript(context);
+ final Script script = this.traitScript(context);
final String opentypeScript = FontUtil.getOpenTypeScript(script);
final Font.Baseline fontBaseline = font.baseline(opentypeScript);
switch (fontBaseline) {
@@ -3820,17 +3820,17 @@
/**
* {@inheritDoc}
*/
- public Iso15924 traitScript(final FoContext context) {
+ public Script traitScript(final FoContext context) {
final String script = this.getPropertyList().traitScript(this, context);
if ("auto".equals(script)) {
return getAutoScript();
}
if ("none".equals(script)) {
- return Iso15924.UNDETERMINED;
+ return Script.UNDETERMINED;
}
- final Iso15924 iso15924 = Iso15924.findFromAlpha(script);
+ final Script iso15924 = Script.findFromAlpha(script);
if (iso15924 == null) {
- return Iso15924.UNDETERMINED;
+ return Script.UNDETERMINED;
} else {
return iso15924;
}
@@ -3840,10 +3840,10 @@
* Computes the script to be used for this object based on its content.
* @return The content-based script for this object.
*/
- protected Iso15924 getAutoScript() {
+ protected Script getAutoScript() {
/*TODO: This is incorrect. See XSL-FO 1.1, Section 7.10.3 for the
* algorithm. */
- return Iso15924.UNDETERMINED;
+ return Script.UNDETERMINED;
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -234,13 +234,13 @@
import org.axsl.common.value.Baseline;
import org.axsl.common.value.Compass;
import org.axsl.common.value.Conditionality;
-import org.axsl.common.value.Iso3166;
import org.axsl.common.value.RelativeAxis;
import org.axsl.common.value.RelativeCompass;
import org.axsl.common.value.ShadowEffect;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoInlineContext;
import org.axsl.graphic.Graphic;
+import org.axsl.i18n.Country;
import java.awt.Shape;
import java.util.ArrayList;
@@ -3081,7 +3081,7 @@
* issues.
* @return The country property.
*/
- public Iso3166 getCountry(final FObj fobj, final FoContext context) {
+ public Country getCountry(final FObj fobj, final FoContext context) {
PdCountry property = (PdCountry) getProperty(FoProperty.COUNTRY);
if (property != null) {
return property.getValue(context, fobj);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Character.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -32,8 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.common.value.WrapOption;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoTreeException;
@@ -41,6 +39,8 @@
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.font.Font;
import org.axsl.font.FontUse;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.line.LineText;
import java.util.List;
@@ -318,14 +318,14 @@
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage() {
+ public Language inlineLanguage() {
return this.inlineLanguage(null);
}
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage(final FoContext context) {
+ public Language inlineLanguage(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitLanguage(context);
}
@@ -333,14 +333,14 @@
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry() {
+ public Country inlineCountry() {
return this.inlineCountry(null);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry(final FoContext context) {
+ public Country inlineCountry(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitCountry(context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/CharacterSequence4a.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -36,8 +36,6 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.FoValue;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.common.value.LinefeedTreatment;
import org.axsl.common.value.TextTransform;
import org.axsl.common.value.WhiteSpaceTreatment;
@@ -51,6 +49,8 @@
import org.axsl.font.Font;
import org.axsl.font.FontServer;
import org.axsl.font.FontUse;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.line.LineText;
import java.util.List;
@@ -661,14 +661,14 @@
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage() {
+ public Language inlineLanguage() {
return this.inlineLanguage(null);
}
/**
* {@inheritDoc}
*/
- public Iso639 inlineLanguage(final FoContext context) {
+ public Language inlineLanguage(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitLanguage(context);
}
@@ -676,14 +676,14 @@
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry() {
+ public Country inlineCountry() {
return this.inlineCountry(null);
}
/**
* {@inheritDoc}
*/
- public Iso3166 inlineCountry(final FoContext context) {
+ public Country inlineCountry(final FoContext context) {
final FObj effectiveParent = effectiveParent(context);
return effectiveParent.traitCountry(context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdCountry.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -36,8 +36,8 @@
import org.foray.fotree.value.DtCountry;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.value.Iso3166;
import org.axsl.fo.FoContext;
+import org.axsl.i18n.Country;
/**
* The "country" property in XSL-FO.
@@ -91,7 +91,7 @@
}
final DtCountry dtCountry = DtCountry.makeCountryDT(value);
if (dtCountry != null
- && dtCountry.getValue() != Iso3166.NULL) {
+ && dtCountry.getValue() != Country.NULL) {
return dtCountry;
}
throw unexpectedValue(value, fobj);
@@ -103,7 +103,7 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Iso3166 getValue(final FoContext context, final FObj fobj) {
+ public Country getValue(final FoContext context, final FObj fobj) {
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
switch (keyword) {
@@ -111,7 +111,7 @@
return getValueNoInstance(context, fobj);
}
case NONE: {
- return Iso3166.NULL;
+ return Country.NULL;
}
}
}
@@ -127,13 +127,13 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static Iso3166 getValueNoInstance(final FoContext context,
+ public static Country getValueNoInstance(final FoContext context,
final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.getPropertyList().getCountry(parent, context);
}
- return Iso3166.NULL;
+ return Country.NULL;
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,7 +28,7 @@
package org.foray.fotree.value;
-import org.axsl.common.value.Iso3166;
+import org.axsl.i18n.Country;
import java.awt.Color;
import java.util.HashMap;
@@ -36,7 +36,7 @@
/**
* A "country" datatype in XSL-FO. Countries must conform to the ISO 3166 codes.
- * @see org.axsl.common.value.Iso3166
+ * @see org.axsl.i18n.Country
*/
public final class DtCountry extends Datatype {
@@ -44,18 +44,18 @@
* The map of ISO codes to DtCountry instances that encapsulate the ISO
* codes.
*/
- private static Map<Iso3166, DtCountry> countryMap =
- new HashMap<Iso3166, DtCountry>();
+ private static Map<Country, DtCountry> countryMap =
+ new HashMap<Country, DtCountry>();
/** The ISO 3166 code. */
- private Iso3166 value = null;
+ private Country value = null;
/**
* Private Constructor. To obtain an instance of this class, use
* {@link #makeCountryDT(String)}.
* @param value The country code.
*/
- private DtCountry(final Iso3166 value) {
+ private DtCountry(final Country value) {
this.value = value;
}
@@ -63,7 +63,7 @@
* Return the value.
* @return The value of this number.
*/
- public Iso3166 getValue() {
+ public Country getValue() {
return this.value;
}
@@ -73,16 +73,16 @@
* @return The DtCountry instance for {@code countryCode}.
*/
public static DtCountry makeCountryDT(final String countryCode) {
- final Iso3166 iso3166 = Iso3166.findFromAlpha(countryCode);
+ final Country iso3166 = Country.findFromAlpha(countryCode);
return getCountryDT(iso3166);
}
/**
- * Finds the {@link DtCountry} for a given {@link Iso3166} code.
+ * Finds the {@link DtCountry} for a given {@link Country} code.
* @param countryCode The Iso3166 country code to be converted.
* @return The DtCountry instance for {@code countryCode}.
*/
- public static DtCountry getCountryDT(final Iso3166 countryCode) {
+ public static DtCountry getCountryDT(final Country countryCode) {
if (countryCode == null) {
return null;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -28,14 +28,14 @@
package org.foray.fotree.value;
-import org.axsl.common.value.Iso639;
+import org.axsl.i18n.Language;
import java.awt.Color;
/**
* A "language" datatype in XSL-FO. Languages must conform to the 2-letter or
* 3-letter ISO 639 codes.
- * @see org.axsl.common.value.Iso639
+ * @see org.axsl.i18n.Language
*/
public class DtLanguage extends Datatype {
@@ -64,7 +64,7 @@
* @return The DtLanguage instance for {@code languageCode}.
*/
public static DtLanguage makeLanguageDT(final String languageCode) {
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
if (iso639 == null) {
return null;
}
Modified: trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java
===================================================================
--- trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/HyphenationServer4a.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -39,9 +39,9 @@
import org.foray.hyphen.util.NatLangParser;
import org.foray.hyphen.util.NaturalLanguage;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.hyphen.HyphenationException;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.apache.commons.logging.Log;
@@ -96,8 +96,8 @@
private URL naturalLanguageDir;
/** Map of all Natural Language instances. */
- private Map<Iso639, NaturalLanguage> languages =
- new HashMap<Iso639, NaturalLanguage>();
+ private Map<Language, NaturalLanguage> languages =
+ new HashMap<Language, NaturalLanguage>();
/**
* Constructor.
@@ -126,13 +126,13 @@
* @return The hyphenation tree if it exists, or null otherwise.
* @throws HyphenationException For errors retrieving the hyphenation tree.
*/
- HyphenationTree getHyphenationTree(final Iso639 rawLanguageCode,
- final Iso3166 rawCountryCode) throws HyphenationException {
+ HyphenationTree getHyphenationTree(final Language rawLanguageCode,
+ final Country rawCountryCode) throws HyphenationException {
/* Bail out if the language code is null. */
if (rawLanguageCode == null
- || rawLanguageCode.equals(Iso639.UNDETERMINED)
- || rawLanguageCode.equals(Iso639.NULL)) {
+ || rawLanguageCode.equals(Language.UNDETERMINED)
+ || rawLanguageCode.equals(Language.NULL)) {
return null;
}
@@ -162,7 +162,7 @@
* @throws HyphenationException For errors retrieving the hyphenation tree.
*/
private HyphenationTree findTreeForKey(final String key,
- final Iso639 language, final Iso3166 country)
+ final Language language, final Country country)
throws HyphenationException {
if (key == null) {
return null;
@@ -201,7 +201,7 @@
HyphenationServer4a.PATTERN_MISSING_TEXT
+ key + " (" + language.getEnglishName());
if (country != null
- && country != Iso3166.NULL) {
+ && country != Country.NULL) {
warningMessage.append(", " + country.getEnglishName());
}
warningMessage.append(")");
@@ -380,8 +380,8 @@
* {@inheritDoc}
*/
public org.axsl.hyphen.Hyphenation hyphenate(final CharSequence word,
- final int offset, final int len, final Iso639 language,
- final Iso3166 country, final int remainCount, final int pushCount,
+ final int offset, final int len, final Language language,
+ final Country country, final int remainCount, final int pushCount,
final boolean includeInhibitors) throws HyphenationException {
return this.hyphenate(word.toString().toCharArray(), offset, len,
language, country, remainCount, pushCount, includeInhibitors);
@@ -391,8 +391,8 @@
* {@inheritDoc}
*/
public org.axsl.hyphen.Hyphenation hyphenate(final char[] word,
- final int offset, final int len, final Iso639 language,
- final Iso3166 country, final int remainCount,
+ final int offset, final int len, final Language language,
+ final Country country, final int remainCount,
final int pushCount, final boolean includeInhibitors)
throws HyphenationException {
final HyphenationTree hTree = getHyphenationTree(language, country);
@@ -415,7 +415,7 @@
* {@inheritDoc}
*/
public int wordSize(final char[] characters, final int wordStart,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return 0;
}
@@ -439,7 +439,7 @@
* {@inheritDoc}
*/
public int wordSize(final CharSequence characters, final int wordStart,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return 0;
}
@@ -451,7 +451,7 @@
* {@inheritDoc}
*/
public int wordStarts(final char[] characters, final int startIndex,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return -1;
}
@@ -476,7 +476,7 @@
* {@inheritDoc}
*/
public int wordStarts(final CharSequence characters, final int startIndex,
- final Iso639 language, final Iso3166 country) {
+ final Language language, final Country country) {
if (characters == null) {
return -1;
}
@@ -492,13 +492,13 @@
* @return The country key, or null if the input is invalid.
*/
public static String buildCountryKey(final String languageCode,
- final Iso3166 rawCountryCode) {
+ final Country rawCountryCode) {
if (languageCode == null
|| languageCode.equals("")) {
return null;
}
if (rawCountryCode == null
- || rawCountryCode == Iso3166.NULL) {
+ || rawCountryCode == Country.NULL) {
return null;
}
final String countryCode = rawCountryCode.getAbbrev3().toLowerCase();
@@ -521,7 +521,7 @@
*/
public NaturalLanguage getNaturalLanguage(
final String languageCode) {
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
return this.getNaturalLanguage(iso639);
}
@@ -531,7 +531,7 @@
* @param iso639 The ISO-639 instance for the language sought.
* @return The suitable instance for {@code iso639}.
*/
- public NaturalLanguage getNaturalLanguage(final Iso639 iso639) {
+ public NaturalLanguage getNaturalLanguage(final Language iso639) {
NaturalLanguage nl = this.languages.get(iso639);
if (nl != null) {
return nl;
@@ -557,7 +557,7 @@
*/
public NaturalLanguage makeNaturalLanguage(
final String languageCode) {
- final Iso639 iso639 = Iso639.findFromAlpha(languageCode);
+ final Language iso639 = Language.findFromAlpha(languageCode);
final NaturalLanguage existingLang = this.getNaturalLanguage(iso639);
if (existingLang != null) {
/* If the instance already exists, don't return a new one for the
Modified: trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java
===================================================================
--- trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/main/java/org/foray/hyphen/util/ValidateChars.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -32,7 +32,7 @@
import org.foray.common.url.URLFactory;
import org.foray.hyphen.HyphenationServer4a;
-import org.axsl.common.value.Iso639;
+import org.axsl.i18n.Language;
import org.apache.commons.logging.Log;
import org.apache.xerces.util.XMLCatalogResolver;
@@ -105,7 +105,7 @@
/** The Iso639 instance against whose language the content of this document
* will be tested. */
- private Iso639 iso639;
+ private Language iso639;
/* TODO: This needs to be handled on an element-by-element basis, based
* upon language codes in the document itself. */
@@ -133,7 +133,7 @@
this.input = input;
this.entityResolver = getEntityResolver(catalog);
this.languageCode = languageCode;
- this.iso639 = Iso639.findFromAlpha(languageCode);
+ this.iso639 = Language.findFromAlpha(languageCode);
}
/**
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/TestHyphenationServer4a.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -35,10 +35,10 @@
import org.foray.common.Environment;
import org.foray.common.Logging;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.hyphen.AbstractTestHyphenationServer;
import org.axsl.hyphen.HyphenationException;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.apache.commons.logging.Log;
@@ -93,40 +93,40 @@
public void testResources() throws HyphenationException {
final HyphenationServer4a server = makeHyphenationServer();
- HyphenationTree tree = server.getHyphenationTree(Iso639.ENGLISH, Iso3166.UNITED_STATES);
+ HyphenationTree tree = server.getHyphenationTree(Language.ENGLISH, Country.UNITED_STATES);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.FINNISH, null);
+ tree = server.getHyphenationTree(Language.FINNISH, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.HUNGARIAN, null);
+ tree = server.getHyphenationTree(Language.HUNGARIAN, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.ITALIAN, null);
+ tree = server.getHyphenationTree(Language.ITALIAN, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.POLISH, null);
+ tree = server.getHyphenationTree(Language.POLISH, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.PORTUGUESE, null);
+ tree = server.getHyphenationTree(Language.PORTUGUESE, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.RUSSIAN, null);
+ tree = server.getHyphenationTree(Language.RUSSIAN, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
- tree = server.getHyphenationTree(Iso639.SPANISH, null);
+ tree = server.getHyphenationTree(Language.SPANISH, null);
assertNotNull(tree);
assertEquals(HyphenationTree.Source.RESOURCES, tree.getSource());
/* Try one that we know we don't have. */
- tree = server.getHyphenationTree(Iso639.KLINGON, null);
+ tree = server.getHyphenationTree(Language.KLINGON, null);
assertNull(tree);
}
Modified: trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java
===================================================================
--- trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-hyphen/src/test/java/org/foray/hyphen/util/TestNaturalLanguage.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -33,7 +33,7 @@
import org.foray.hyphen.HyphenationServer4a;
import org.foray.hyphen.TestHyphenationServer4a;
-import org.axsl.common.value.Iso639;
+import org.axsl.i18n.Language;
import org.junit.Test;
@@ -51,7 +51,7 @@
@Test
public void testValidateText() throws IOException {
final HyphenationServer4a server = TestHyphenationServer4a.makeHyphenationServerStatic();
- final NaturalLanguage nl = server.getNaturalLanguage(Iso639.MARSHALLESE);
+ final NaturalLanguage nl = server.getNaturalLanguage(Language.MARSHALLESE);
final int invalidChar = nl.validateText("ka" + '\u00B5' + "uri");
assertEquals(2, invalidChar);
}
Modified: trunk/foray/foray-text/src/main/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/main/java/org/foray/text/line/solitary/SolitaryLineBreaker.java 2010-09-29 03:54:01 UTC (rev 11051)
+++ trunk/foray/foray-text/src/main/java/org/foray/text/line/solitary/SolitaryLineBreaker.java 2010-09-29 16:10:56 UTC (rev 11052)
@@ -32,12 +32,12 @@
import org.foray.text.TextServer4a;
import org.foray.text.line.EagerLineBreaker;
-import org.axsl.common.value.Iso3166;
-import org.axsl.common.value.Iso639;
import org.axsl.font.FontConsumer;
import org.axsl.hyphen.Hyphenation;
import org.axsl.hyphen.HyphenationException;
import org.axsl.hyphen.HyphenationServer;
+import org.axsl.i18n.Country;
+import org.axsl.i18n.Language;
import org.axsl.text.TextException;
import org.axsl.text.line.LineBreakControl;
import org.axsl.text.line.LineBreakHandler;
@@ -117,7 +117,7 @@
final int end) throws TextException {
this.currentLineText = lineText;
this.currentChars = this.currentLineText.inlineText();
- final Iso639 languageInstance = lineText.inlineLanguage();
+ final Language languageInstance = lineText.inlineLanguage();
final String language = languageInstance.getAbbrev3();
this.finalWidth = 0;
@@ -398,8 +398,8 @@
*/
final HyphenationServer server =
this.getTextServer().getHyphenationServer();
- final Iso639 language = this.currentLineText.inlineLanguage();
- final Iso3166 country = this.currentLineText.inlineCountry();
+ final Language language = this.currentLineText.inlineLanguage();
+ final Country country = this.currentLineText.inlineCountry();
// Count the number of chars at the beginning that should be ignored.
final int actualWordStart = server.wordStarts(this.currentChars,
this.wordStart, language, country);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-29 03:54:07
|
Revision: 11051
http://foray.svn.sourceforge.net/foray/?rev=11051&view=rev
Author: victormote
Date: 2010-09-29 03:54:01 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Clean up checkstyle complaint.
Modified Paths:
--------------
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java 2010-09-28 22:34:33 UTC (rev 11050)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java 2010-09-29 03:54:01 UTC (rev 11051)
@@ -330,7 +330,7 @@
for (final Iterator<?> i = gvtFonts.iterator(); i.hasNext(); ) {
final GVTFontFamily fam = (GVTFontFamily) i.next();
this.fontFamily = fam.getFamilyName();
- org.axsl.font.FontUse font = this.fontConsumer.selectFontCss(
+ final org.axsl.font.FontUse font = this.fontConsumer.selectFontCss(
FontUtility.foFontFamily(this.fontFamily),
style, weight, Font.Variant.NORMAL,
org.axsl.font.Font.Stretch.NORMAL,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-28 22:34:39
|
Revision: 11050
http://foray.svn.sourceforge.net/foray/?rev=11050&view=rev
Author: victormote
Date: 2010-09-28 22:34:33 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Clean up compiler warnings about dead code (after upgrade to Eclipse Helios).
Modified Paths:
--------------
trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java
trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java
trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java
Modified: trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-app/src/main/java/org/foray/app/OutputTargetFactory.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -134,9 +134,6 @@
break;
}
}
- if (renderer == null) {
- throw new FOrayException("Unable to create renderer.");
- }
return renderer;
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/ConfigGenerator.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -322,11 +322,6 @@
this.failureCount ++;
return;
}
- if (reader == null) {
- getLogger().error("Error opening:\n " + file.getAbsolutePath());
- this.failureCount ++;
- return;
- }
this.successCount ++;
final FontFile fontFile = reader.createFontFile();
if (! (fontFile == null)) {
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontConsumer4a.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -330,9 +330,6 @@
}
return fontUse;
}
- if (fontSelected == null) {
- return null;
- }
final ConsumerFont4a consumerFont = registerFontUse(fontSelected);
/* Selection of the actual FontUse is delegated to consumerFont. */
final FontUse4a fontUse = consumerFont.selectFontUse(
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -5035,7 +5035,7 @@
FoProperty.BACKGROUND);
if (background != null) {
backgroundPosition = background.getPosition();
- if (property != null) {
+ if (backgroundPosition != null) {
return backgroundPosition.getShorthandValue(context,
fobj, AbsoluteAxis.VERTICAL,
paddingRectangleHeight, backgroundImageHeight);
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -462,6 +462,10 @@
/* The variable svgDocument below is the same object as the one
* commented out above ... */
final Document svgDocument = svgRoot.getOwnerDocument();
+ if (svgDocument == null) {
+ throw new GraphicException("Error converting MathML to SVG: "
+ + "Document is null.");
+ }
/* ... however, the root element below is /NOT/ the same as the svgRoot
* variable above ... */
@@ -471,10 +475,6 @@
svgDocument.removeChild(svgRoot2);
svgDocument.appendChild(svgRoot);
- if (svgDocument == null) {
- throw new GraphicException("Error converting MathML to SVG: "
- + "Document is null.");
- }
if (! (svgDocument instanceof SVGDocument)) {
throw new GraphicException("Error converting MathML to SVG: "
+ "Converted document is not SVG.");
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PDFTextPainter.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -313,7 +313,6 @@
final AttributedCharacterIterator aci, final Graphics2D g2d,
final Float size, final boolean italic, final boolean bold)
throws FontException {
- org.axsl.font.FontUse font = null;
Font.Style style = Font.Style.NORMAL;
if (italic) {
style = Font.Style.ITALIC;
@@ -331,7 +330,7 @@
for (final Iterator<?> i = gvtFonts.iterator(); i.hasNext(); ) {
final GVTFontFamily fam = (GVTFontFamily) i.next();
this.fontFamily = fam.getFamilyName();
- font = this.fontConsumer.selectFontCss(
+ org.axsl.font.FontUse font = this.fontConsumer.selectFontCss(
FontUtility.foFontFamily(this.fontFamily),
style, weight, Font.Variant.NORMAL,
org.axsl.font.Font.Stretch.NORMAL,
@@ -346,17 +345,14 @@
}
}
}
- if (font == null) {
- this.fontFamily = "any";
- return this.fontConsumer.selectFontXsl(
- org.axsl.font.Font.SelectionStrategy.AUTO,
- new String[] {"any"}, style, weight,
- Font.Variant.NORMAL,
- org.axsl.font.Font.Stretch.NORMAL,
- fsize * WKConstants.MILLIPOINTS_PER_POINT,
- ' ');
- }
- return font;
+ this.fontFamily = "any";
+ return this.fontConsumer.selectFontXsl(
+ org.axsl.font.Font.SelectionStrategy.AUTO,
+ new String[] {"any"}, style, weight,
+ Font.Variant.NORMAL,
+ org.axsl.font.Font.Stretch.NORMAL,
+ fsize * WKConstants.MILLIPOINTS_PER_POINT,
+ ' ');
}
/**
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java 2010-09-28 22:08:58 UTC (rev 11049)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/output/SvgPdf.java 2010-09-28 22:34:33 UTC (rev 11050)
@@ -84,11 +84,11 @@
doc = this.svg.getSvgDocument();
final PDFGraphics2D graphics = getPDFContent4SVG(fontConsumer, doc,
strokeText, outputContext, output);
- graphics.dispose();
if (graphics == null) {
throw new GraphicException("Unable to convert to PDF: "
+ this.svg.getUrl().toExternalForm());
}
+ graphics.dispose();
if (graphics.ioErrorFound()) {
throw new GraphicException("I/O error(s) while converting to PDF: "
+ this.svg.getUrl().toExternalForm());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-28 22:09:04
|
Revision: 11049
http://foray.svn.sourceforge.net/foray/?rev=11049&view=rev
Author: victormote
Date: 2010-09-28 22:08:58 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Remove one dependency on ant.
Modified Paths:
--------------
trunk/foray/foray-common/pom.xml
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
+++ trunk/foray/foray-common/pom.xml 2010-09-28 22:08:58 UTC (rev 11049)
@@ -18,6 +18,10 @@
</parent>
<name>foray-common</name>
+ <properties>
+ <doc.dir>../foray-all/doc</doc.dir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
@@ -65,21 +69,27 @@
<build>
<plugins>
+
+ <!-- Copy the DTD file(s) into the output directory so they will be included in the jar file. -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
<executions>
<execution>
- <!-- Copy all of the common resources maintained in other places into the build directory. -->
+ <id>copy-resources</id>
<phase>generate-test-resources</phase>
<goals>
- <goal>run</goal>
+ <goal>copy-resources</goal>
</goals>
<configuration>
- <tasks>
- <ant antfile="./scripts/build.xml" inheritall="false" target="resources"/>
- </tasks>
- </configuration>
+ <outputDirectory>target/classes/org/foray/common/dtds</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${doc.dir}/web/dtds/0.1/en</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-11 19:18:10
|
Revision: 11048
http://foray.svn.sourceforge.net/foray/?rev=11048&view=rev
Author: victormote
Date: 2010-09-11 19:18:03 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Add "name" elements to all POMs.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-areatree/pom.xml
trunk/foray/foray-common/pom.xml
trunk/foray/foray-core/pom.xml
trunk/foray/foray-font/pom.xml
trunk/foray/foray-fotree/pom.xml
trunk/foray/foray-graphic/pom.xml
trunk/foray/foray-hyphen/pom.xml
trunk/foray/foray-layout/pom.xml
trunk/foray/foray-mif/pom.xml
trunk/foray/foray-output/pom.xml
trunk/foray/foray-pdf/pom.xml
trunk/foray/foray-pioneer/pom.xml
trunk/foray/foray-ps/pom.xml
trunk/foray/foray-render/pom.xml
trunk/foray/foray-speech/pom.xml
trunk/foray/foray-text/pom.xml
trunk/foray/foray-xml/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-all/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -21,6 +21,7 @@
<artifactId>oss-parent</artifactId>
<version>4</version>
</parent>
+ <name>foray-all</name>
<dependencyManagement>
<dependencies>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-app/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-app</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-areatree/pom.xml
===================================================================
--- trunk/foray/foray-areatree/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-areatree/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-areatree</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-common/pom.xml
===================================================================
--- trunk/foray/foray-common/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-common/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-common</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-core/pom.xml
===================================================================
--- trunk/foray/foray-core/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-core/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,8 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-core</name>
+
<dependencies>
<!-- TODO: This project has a runtime dependency on foray-common-0.4-dev-rsrc.jar which has not yet been accounted
Modified: trunk/foray/foray-font/pom.xml
===================================================================
--- trunk/foray/foray-font/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-font/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-font</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-fotree/pom.xml
===================================================================
--- trunk/foray/foray-fotree/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-fotree/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-fotree</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-graphic/pom.xml
===================================================================
--- trunk/foray/foray-graphic/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-graphic/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-graphic</name>
<dependencies>
Modified: trunk/foray/foray-hyphen/pom.xml
===================================================================
--- trunk/foray/foray-hyphen/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-hyphen/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-hyphen</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-layout/pom.xml
===================================================================
--- trunk/foray/foray-layout/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-layout/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-layout</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-mif/pom.xml
===================================================================
--- trunk/foray/foray-mif/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-mif/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-mif</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-output/pom.xml
===================================================================
--- trunk/foray/foray-output/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-output/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-output</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-pdf/pom.xml
===================================================================
--- trunk/foray/foray-pdf/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-pdf/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-pdf</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-pioneer/pom.xml
===================================================================
--- trunk/foray/foray-pioneer/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-pioneer/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-pioneer</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-ps/pom.xml
===================================================================
--- trunk/foray/foray-ps/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-ps/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,8 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-ps</name>
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
Modified: trunk/foray/foray-render/pom.xml
===================================================================
--- trunk/foray/foray-render/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-render/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-render</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-speech/pom.xml
===================================================================
--- trunk/foray/foray-speech/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-speech/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-speech</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-text/pom.xml
===================================================================
--- trunk/foray/foray-text/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-text/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-text</name>
<dependencies>
<dependency>
Modified: trunk/foray/foray-xml/pom.xml
===================================================================
--- trunk/foray/foray-xml/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
+++ trunk/foray/foray-xml/pom.xml 2010-09-11 19:18:03 UTC (rev 11048)
@@ -16,6 +16,7 @@
<version>0.4-SNAPSHOT</version>
<relativePath>../foray-all/pom.xml</relativePath>
</parent>
+ <name>foray-xml</name>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2010-09-01 15:03:14
|
Revision: 11047
http://foray.svn.sourceforge.net/foray/?rev=11047&view=rev
Author: victormote
Date: 2010-09-01 15:03:07 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Clean up some maven warnings by referencing Ant in its new location.
Modified Paths:
--------------
trunk/foray/foray-all/pom.xml
trunk/foray/foray-app/pom.xml
trunk/foray/foray-font/pom.xml
trunk/foray/foray-hyphen/pom.xml
Modified: trunk/foray/foray-all/pom.xml
===================================================================
--- trunk/foray/foray-all/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-all/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -93,7 +93,7 @@
<!-- Apache Ant. -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
<scope>compile</scope>
Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-app/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -57,7 +57,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-font/pom.xml
===================================================================
--- trunk/foray/foray-font/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-font/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -49,7 +49,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
Modified: trunk/foray/foray-hyphen/pom.xml
===================================================================
--- trunk/foray/foray-hyphen/pom.xml 2010-08-22 01:02:21 UTC (rev 11046)
+++ trunk/foray/foray-hyphen/pom.xml 2010-09-01 15:03:07 UTC (rev 11047)
@@ -43,7 +43,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|