You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2024/03/05 13:06:48 UTC
(xmlgraphics-fop) branch main updated: FOP-3160: Rename events to avoid conflicts with events module
This is an automated email from the ASF dual-hosted git repository.
ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-fop.git
The following commit(s) were added to refs/heads/main by this push:
new 3133a012c FOP-3160: Rename events to avoid conflicts with events module
3133a012c is described below
commit 3133a012c156e91876ad60383f9397d038f474a5
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Tue Mar 5 12:51:05 2024 +0000
FOP-3160: Rename events to avoid conflicts with events module
---
fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java | 4 ++--
.../org/apache/fop/{events => event}/FOPEventListenerProxy.java | 4 +++-
.../java/org/apache/fop/{events => event}/LoggingEventListener.java | 5 ++++-
.../org/apache/fop/{events => event}/PropertyExceptionFactory.java | 4 +++-
.../fop/{events => event}/UnsupportedOperationExceptionFactory.java | 4 +++-
.../apache/fop/{events => event}/ValidationExceptionFactory.java | 4 +++-
.../src/main/java/org/apache/fop/{events => event}/package.html | 2 +-
.../org.apache.fop.events.EventExceptionManager$ExceptionFactory | 6 +++---
8 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java b/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
index 02b0128cd..9fec79bf4 100644
--- a/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
+++ b/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
@@ -47,12 +47,12 @@ import org.apache.fop.accessibility.StructureTreeEventHandler;
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.ConfigurationException;
+import org.apache.fop.event.FOPEventListenerProxy;
+import org.apache.fop.event.LoggingEventListener;
import org.apache.fop.events.DefaultEventBroadcaster;
import org.apache.fop.events.Event;
import org.apache.fop.events.EventBroadcaster;
import org.apache.fop.events.EventListener;
-import org.apache.fop.events.FOPEventListenerProxy;
-import org.apache.fop.events.LoggingEventListener;
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fo.FOEventHandler;
import org.apache.fop.fonts.FontManager;
diff --git a/fop-core/src/main/java/org/apache/fop/events/FOPEventListenerProxy.java b/fop-core/src/main/java/org/apache/fop/event/FOPEventListenerProxy.java
similarity index 96%
rename from fop-core/src/main/java/org/apache/fop/events/FOPEventListenerProxy.java
rename to fop-core/src/main/java/org/apache/fop/event/FOPEventListenerProxy.java
index d57ef1e15..310d418b6 100644
--- a/fop-core/src/main/java/org/apache/fop/events/FOPEventListenerProxy.java
+++ b/fop-core/src/main/java/org/apache/fop/event/FOPEventListenerProxy.java
@@ -17,9 +17,11 @@
/* $Id$ */
-package org.apache.fop.events;
+package org.apache.fop.event;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.events.Event;
+import org.apache.fop.events.EventListener;
import org.apache.fop.events.model.EventSeverity;
import org.apache.fop.fo.FOValidationEventProducer;
import org.apache.fop.layoutmgr.BlockLevelEventProducer;
diff --git a/fop-core/src/main/java/org/apache/fop/events/LoggingEventListener.java b/fop-core/src/main/java/org/apache/fop/event/LoggingEventListener.java
similarity index 96%
rename from fop-core/src/main/java/org/apache/fop/events/LoggingEventListener.java
rename to fop-core/src/main/java/org/apache/fop/event/LoggingEventListener.java
index 7df05f6d3..82d95a78d 100644
--- a/fop-core/src/main/java/org/apache/fop/events/LoggingEventListener.java
+++ b/fop-core/src/main/java/org/apache/fop/event/LoggingEventListener.java
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.events;
+package org.apache.fop.event;
import java.util.HashSet;
import java.util.Set;
@@ -25,6 +25,9 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.events.Event;
+import org.apache.fop.events.EventFormatter;
+import org.apache.fop.events.EventListener;
import org.apache.fop.events.model.EventSeverity;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/events/PropertyExceptionFactory.java b/fop-core/src/main/java/org/apache/fop/event/PropertyExceptionFactory.java
similarity index 93%
rename from fop-core/src/main/java/org/apache/fop/events/PropertyExceptionFactory.java
rename to fop-core/src/main/java/org/apache/fop/event/PropertyExceptionFactory.java
index 04f954f98..bba919509 100644
--- a/fop-core/src/main/java/org/apache/fop/events/PropertyExceptionFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/event/PropertyExceptionFactory.java
@@ -17,11 +17,13 @@
/* $Id$ */
-package org.apache.fop.events;
+package org.apache.fop.event;
import java.util.Locale;
+import org.apache.fop.events.Event;
import org.apache.fop.events.EventExceptionManager.ExceptionFactory;
+import org.apache.fop.events.EventFormatter;
import org.apache.fop.fo.expr.PropertyException;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java b/fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java
similarity index 93%
rename from fop-core/src/main/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java
rename to fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java
index b15dea7c0..ccccac097 100644
--- a/fop-core/src/main/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java
@@ -17,11 +17,13 @@
/* $Id$ */
-package org.apache.fop.events;
+package org.apache.fop.event;
import java.util.Locale;
+import org.apache.fop.events.Event;
import org.apache.fop.events.EventExceptionManager.ExceptionFactory;
+import org.apache.fop.events.EventFormatter;
/**
* Exception factory for {@link UnsupportedOperationException}.
diff --git a/fop-core/src/main/java/org/apache/fop/events/ValidationExceptionFactory.java b/fop-core/src/main/java/org/apache/fop/event/ValidationExceptionFactory.java
similarity index 93%
rename from fop-core/src/main/java/org/apache/fop/events/ValidationExceptionFactory.java
rename to fop-core/src/main/java/org/apache/fop/event/ValidationExceptionFactory.java
index 59f952961..c6db9f047 100644
--- a/fop-core/src/main/java/org/apache/fop/events/ValidationExceptionFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/event/ValidationExceptionFactory.java
@@ -17,13 +17,15 @@
/* $Id$ */
-package org.apache.fop.events;
+package org.apache.fop.event;
import java.util.Locale;
import org.xml.sax.Locator;
+import org.apache.fop.events.Event;
import org.apache.fop.events.EventExceptionManager.ExceptionFactory;
+import org.apache.fop.events.EventFormatter;
import org.apache.fop.fo.ValidationException;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/events/package.html b/fop-core/src/main/java/org/apache/fop/event/package.html
similarity index 94%
rename from fop-core/src/main/java/org/apache/fop/events/package.html
rename to fop-core/src/main/java/org/apache/fop/event/package.html
index d2e6d63de..852827182 100644
--- a/fop-core/src/main/java/org/apache/fop/events/package.html
+++ b/fop-core/src/main/java/org/apache/fop/event/package.html
@@ -16,7 +16,7 @@
-->
<!-- $Id$ -->
<HTML>
-<TITLE>org.apache.fop.events Package</TITLE>
+<TITLE>org.apache.fop.event Package</TITLE>
<BODY>
<P>Subsystem for reporting events inside FOP to client applications.</P>
</BODY>
diff --git a/fop-core/src/main/resources/META-INF/services/org.apache.fop.events.EventExceptionManager$ExceptionFactory b/fop-core/src/main/resources/META-INF/services/org.apache.fop.events.EventExceptionManager$ExceptionFactory
index 13540a4db..32fae1443 100644
--- a/fop-core/src/main/resources/META-INF/services/org.apache.fop.events.EventExceptionManager$ExceptionFactory
+++ b/fop-core/src/main/resources/META-INF/services/org.apache.fop.events.EventExceptionManager$ExceptionFactory
@@ -1,5 +1,5 @@
-org.apache.fop.events.ValidationExceptionFactory
-org.apache.fop.events.PropertyExceptionFactory
-org.apache.fop.events.UnsupportedOperationExceptionFactory
+org.apache.fop.event.ValidationExceptionFactory
+org.apache.fop.event.PropertyExceptionFactory
+org.apache.fop.event.UnsupportedOperationExceptionFactory
org.apache.fop.layoutmgr.LayoutException$LayoutExceptionFactory
org.apache.fop.fo.pagination.PageProductionException$PageProductionExceptionFactory
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org