Browse Source

FOP-3160: Rename events to avoid conflicts with events module

pull/80/head
Simon Steiner 1 month ago
parent
commit
3133a012c1

+ 2
- 2
fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java View File

@@ -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;

fop-core/src/main/java/org/apache/fop/events/FOPEventListenerProxy.java → fop-core/src/main/java/org/apache/fop/event/FOPEventListenerProxy.java View File

@@ -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;

fop-core/src/main/java/org/apache/fop/events/LoggingEventListener.java → fop-core/src/main/java/org/apache/fop/event/LoggingEventListener.java View File

@@ -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;

/**

fop-core/src/main/java/org/apache/fop/events/PropertyExceptionFactory.java → fop-core/src/main/java/org/apache/fop/event/PropertyExceptionFactory.java View File

@@ -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;

/**

fop-core/src/main/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java → fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java View File

@@ -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}.

fop-core/src/main/java/org/apache/fop/events/ValidationExceptionFactory.java → fop-core/src/main/java/org/apache/fop/event/ValidationExceptionFactory.java View File

@@ -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;

/**

fop-core/src/main/java/org/apache/fop/events/package.html → fop-core/src/main/java/org/apache/fop/event/package.html View File

@@ -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>

+ 3
- 3
fop-core/src/main/resources/META-INF/services/org.apache.fop.events.EventExceptionManager$ExceptionFactory View File

@@ -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

Loading…
Cancel
Save