From d3ef77c7d66c49c84df92d5863dae49beaeca708 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Tue, 5 Mar 2024 12:24:48 +0000 Subject: FOP-3160: Rename util to avoid conflicts with core --- fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java | 2 +- fop-core/src/main/java/org/apache/fop/fo/FONode.java | 2 +- .../src/main/java/org/apache/fop/render/intermediate/IFParser.java | 2 +- .../src/main/java/org/apache/fop/util/text/ChoiceFieldPart.java | 5 +++-- .../src/main/java/org/apache/fop/util/text/EqualsFieldPart.java | 5 +++-- .../src/main/java/org/apache/fop/util/text/GlyphNameFieldPart.java | 4 ++-- fop-core/src/main/java/org/apache/fop/util/text/HexFieldPart.java | 4 ++-- fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java | 5 +++-- .../src/main/java/org/apache/fop/util/text/LocatorFormatter.java | 2 +- .../org.apache.fop.util.text.AdvancedMessageFormat$Function | 1 - .../org.apache.fop.util.text.AdvancedMessageFormat$ObjectFormatter | 1 - .../org.apache.fop.util.text.AdvancedMessageFormat$PartFactory | 6 ------ .../org.apache.fop.utils.text.AdvancedMessageFormat$Function | 1 + .../org.apache.fop.utils.text.AdvancedMessageFormat$ObjectFormatter | 1 + .../org.apache.fop.utils.text.AdvancedMessageFormat$PartFactory | 6 ++++++ 15 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$Function delete mode 100644 fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$ObjectFormatter delete mode 100644 fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$PartFactory create mode 100644 fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$Function create mode 100644 fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$ObjectFormatter create mode 100644 fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$PartFactory (limited to 'fop-core/src/main') diff --git a/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java b/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java index 587e8e449..ca4e097ef 100644 --- a/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java +++ b/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java @@ -87,10 +87,10 @@ import org.apache.fop.util.ColorUtil; import org.apache.fop.util.ContentHandlerFactory; import org.apache.fop.util.ContentHandlerFactoryRegistry; import org.apache.fop.util.ConversionUtils; -import org.apache.fop.util.DefaultErrorListener; import org.apache.fop.util.LanguageTags; import org.apache.fop.util.XMLConstants; import org.apache.fop.util.XMLUtil; +import org.apache.fop.utils.DefaultErrorListener; import static org.apache.fop.fo.Constants.FO_REGION_AFTER; import static org.apache.fop.fo.Constants.FO_REGION_BEFORE; diff --git a/fop-core/src/main/java/org/apache/fop/fo/FONode.java b/fop-core/src/main/java/org/apache/fop/fo/FONode.java index f3c582dd5..c6c8cc3ce 100644 --- a/fop-core/src/main/java/org/apache/fop/fo/FONode.java +++ b/fop-core/src/main/java/org/apache/fop/fo/FONode.java @@ -47,7 +47,7 @@ import org.apache.fop.fo.flow.ChangeBar; import org.apache.fop.fo.pagination.Root; import org.apache.fop.util.CharUtilities; import org.apache.fop.util.ContentHandlerFactory; -import org.apache.fop.util.text.AdvancedMessageFormat.Function; +import org.apache.fop.utils.text.AdvancedMessageFormat.Function; /** * Base class for nodes in the XML tree diff --git a/fop-core/src/main/java/org/apache/fop/render/intermediate/IFParser.java b/fop-core/src/main/java/org/apache/fop/render/intermediate/IFParser.java index a75e61cf3..47529d11a 100644 --- a/fop-core/src/main/java/org/apache/fop/render/intermediate/IFParser.java +++ b/fop-core/src/main/java/org/apache/fop/render/intermediate/IFParser.java @@ -65,9 +65,9 @@ import org.apache.fop.util.ColorUtil; import org.apache.fop.util.ContentHandlerFactory; import org.apache.fop.util.ContentHandlerFactoryRegistry; import org.apache.fop.util.DOMBuilderContentHandlerFactory; -import org.apache.fop.util.DefaultErrorListener; import org.apache.fop.util.LanguageTags; import org.apache.fop.util.XMLUtil; +import org.apache.fop.utils.DefaultErrorListener; /** * This is a parser for the intermediate format XML which converts the intermediate file into diff --git a/fop-core/src/main/java/org/apache/fop/util/text/ChoiceFieldPart.java b/fop-core/src/main/java/org/apache/fop/util/text/ChoiceFieldPart.java index c87b9c61f..12b47c8ac 100644 --- a/fop-core/src/main/java/org/apache/fop/util/text/ChoiceFieldPart.java +++ b/fop-core/src/main/java/org/apache/fop/util/text/ChoiceFieldPart.java @@ -24,8 +24,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.fop.util.text.AdvancedMessageFormat.Part; -import org.apache.fop.util.text.AdvancedMessageFormat.PartFactory; +import org.apache.fop.utils.text.AdvancedMessageFormat; +import org.apache.fop.utils.text.AdvancedMessageFormat.Part; +import org.apache.fop.utils.text.AdvancedMessageFormat.PartFactory; /** * Defines a "choice" field part that works like {@link ChoiceFormat}. diff --git a/fop-core/src/main/java/org/apache/fop/util/text/EqualsFieldPart.java b/fop-core/src/main/java/org/apache/fop/util/text/EqualsFieldPart.java index 153322f27..bafb9b156 100644 --- a/fop-core/src/main/java/org/apache/fop/util/text/EqualsFieldPart.java +++ b/fop-core/src/main/java/org/apache/fop/util/text/EqualsFieldPart.java @@ -21,8 +21,9 @@ package org.apache.fop.util.text; import java.util.Map; -import org.apache.fop.util.text.AdvancedMessageFormat.Part; -import org.apache.fop.util.text.AdvancedMessageFormat.PartFactory; +import org.apache.fop.utils.text.AdvancedMessageFormat; +import org.apache.fop.utils.text.AdvancedMessageFormat.Part; +import org.apache.fop.utils.text.AdvancedMessageFormat.PartFactory; /** * Defines an "equals" field part that can compare a field's string value against another string. diff --git a/fop-core/src/main/java/org/apache/fop/util/text/GlyphNameFieldPart.java b/fop-core/src/main/java/org/apache/fop/util/text/GlyphNameFieldPart.java index 48346c13a..21683b066 100644 --- a/fop-core/src/main/java/org/apache/fop/util/text/GlyphNameFieldPart.java +++ b/fop-core/src/main/java/org/apache/fop/util/text/GlyphNameFieldPart.java @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.xmlgraphics.fonts.Glyphs; -import org.apache.fop.util.text.AdvancedMessageFormat.Part; -import org.apache.fop.util.text.AdvancedMessageFormat.PartFactory; +import org.apache.fop.utils.text.AdvancedMessageFormat.Part; +import org.apache.fop.utils.text.AdvancedMessageFormat.PartFactory; /** * Function formatting a character to a glyph name. diff --git a/fop-core/src/main/java/org/apache/fop/util/text/HexFieldPart.java b/fop-core/src/main/java/org/apache/fop/util/text/HexFieldPart.java index 075adb00f..61affb4ba 100644 --- a/fop-core/src/main/java/org/apache/fop/util/text/HexFieldPart.java +++ b/fop-core/src/main/java/org/apache/fop/util/text/HexFieldPart.java @@ -21,8 +21,8 @@ package org.apache.fop.util.text; import java.util.Map; -import org.apache.fop.util.text.AdvancedMessageFormat.Part; -import org.apache.fop.util.text.AdvancedMessageFormat.PartFactory; +import org.apache.fop.utils.text.AdvancedMessageFormat.Part; +import org.apache.fop.utils.text.AdvancedMessageFormat.PartFactory; /** * Function formatting a number or character to a hex value. diff --git a/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java b/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java index 52c06bad1..315b2c0de 100644 --- a/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java +++ b/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java @@ -21,8 +21,9 @@ package org.apache.fop.util.text; import java.util.Map; -import org.apache.fop.util.text.AdvancedMessageFormat.Part; -import org.apache.fop.util.text.AdvancedMessageFormat.PartFactory; +import org.apache.fop.utils.text.AdvancedMessageFormat; +import org.apache.fop.utils.text.AdvancedMessageFormat.Part; +import org.apache.fop.utils.text.AdvancedMessageFormat.PartFactory; /** * Defines an "if" field part that checks if field's value is true or false. diff --git a/fop-core/src/main/java/org/apache/fop/util/text/LocatorFormatter.java b/fop-core/src/main/java/org/apache/fop/util/text/LocatorFormatter.java index 07e7f2aaa..39842610e 100644 --- a/fop-core/src/main/java/org/apache/fop/util/text/LocatorFormatter.java +++ b/fop-core/src/main/java/org/apache/fop/util/text/LocatorFormatter.java @@ -21,7 +21,7 @@ package org.apache.fop.util.text; import org.xml.sax.Locator; -import org.apache.fop.util.text.AdvancedMessageFormat.ObjectFormatter; +import org.apache.fop.utils.text.AdvancedMessageFormat.ObjectFormatter; /** * Object formatter for the SAX Locator object. diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$Function b/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$Function deleted file mode 100644 index 375130f2a..000000000 --- a/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$Function +++ /dev/null @@ -1 +0,0 @@ -org.apache.fop.fo.FONode$GatherContextInfoFunction diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$ObjectFormatter b/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$ObjectFormatter deleted file mode 100644 index 9e3860b31..000000000 --- a/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$ObjectFormatter +++ /dev/null @@ -1 +0,0 @@ -org.apache.fop.util.text.LocatorFormatter diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$PartFactory b/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$PartFactory deleted file mode 100644 index 1647fb8d5..000000000 --- a/fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$PartFactory +++ /dev/null @@ -1,6 +0,0 @@ -org.apache.fop.util.text.IfFieldPart$Factory -org.apache.fop.util.text.EqualsFieldPart$Factory -org.apache.fop.util.text.ChoiceFieldPart$Factory -org.apache.fop.util.text.HexFieldPart$Factory -org.apache.fop.util.text.GlyphNameFieldPart$Factory -org.apache.fop.events.EventFormatter$LookupFieldPartFactory diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$Function b/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$Function new file mode 100644 index 000000000..375130f2a --- /dev/null +++ b/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$Function @@ -0,0 +1 @@ +org.apache.fop.fo.FONode$GatherContextInfoFunction diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$ObjectFormatter b/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$ObjectFormatter new file mode 100644 index 000000000..9e3860b31 --- /dev/null +++ b/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$ObjectFormatter @@ -0,0 +1 @@ +org.apache.fop.util.text.LocatorFormatter diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$PartFactory b/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$PartFactory new file mode 100644 index 000000000..1647fb8d5 --- /dev/null +++ b/fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$PartFactory @@ -0,0 +1,6 @@ +org.apache.fop.util.text.IfFieldPart$Factory +org.apache.fop.util.text.EqualsFieldPart$Factory +org.apache.fop.util.text.ChoiceFieldPart$Factory +org.apache.fop.util.text.HexFieldPart$Factory +org.apache.fop.util.text.GlyphNameFieldPart$Factory +org.apache.fop.events.EventFormatter$LookupFieldPartFactory -- cgit v1.2.3