aboutsummaryrefslogtreecommitdiffstats
path: root/fop-core/src/main
diff options
context:
space:
mode:
authorSimon Steiner <ssteiner@apache.org>2024-03-05 12:24:48 +0000
committerSimon Steiner <ssteiner@apache.org>2024-03-05 12:24:48 +0000
commitd3ef77c7d66c49c84df92d5863dae49beaeca708 (patch)
treeb194e1a2fe33d2ae158f8299d5f68c6a643f5c13 /fop-core/src/main
parentd96ba9a11710d02716b6f4f6107ebfa9ccec7134 (diff)
downloadxmlgraphics-fop-d3ef77c7d66c49c84df92d5863dae49beaeca708.tar.gz
xmlgraphics-fop-d3ef77c7d66c49c84df92d5863dae49beaeca708.zip
FOP-3160: Rename util to avoid conflicts with core
Diffstat (limited to 'fop-core/src/main')
-rw-r--r--fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/fo/FONode.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/render/intermediate/IFParser.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/util/text/ChoiceFieldPart.java5
-rw-r--r--fop-core/src/main/java/org/apache/fop/util/text/EqualsFieldPart.java5
-rw-r--r--fop-core/src/main/java/org/apache/fop/util/text/GlyphNameFieldPart.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/util/text/HexFieldPart.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java5
-rw-r--r--fop-core/src/main/java/org/apache/fop/util/text/LocatorFormatter.java2
-rw-r--r--fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$Function (renamed from fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$Function)0
-rw-r--r--fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$ObjectFormatter (renamed from fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$ObjectFormatter)0
-rw-r--r--fop-core/src/main/resources/META-INF/services/org.apache.fop.utils.text.AdvancedMessageFormat$PartFactory (renamed from fop-core/src/main/resources/META-INF/services/org.apache.fop.util.text.AdvancedMessageFormat$PartFactory)0
12 files changed, 17 insertions, 14 deletions
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.utils.text.AdvancedMessageFormat$Function
index 375130f2a..375130f2a 100644
--- 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.utils.text.AdvancedMessageFormat$Function
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.utils.text.AdvancedMessageFormat$ObjectFormatter
index 9e3860b31..9e3860b31 100644
--- 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.utils.text.AdvancedMessageFormat$ObjectFormatter
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.utils.text.AdvancedMessageFormat$PartFactory
index 1647fb8d5..1647fb8d5 100644
--- 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.utils.text.AdvancedMessageFormat$PartFactory