[FOray-commit] SF.net SVN: foray:[12580] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2022-02-09 03:52:08
|
Revision: 12580
http://sourceforge.net/p/foray/code/12580
Author: victormote
Date: 2022-02-09 03:52:05 +0000 (Wed, 09 Feb 2022)
Log Message:
-----------
Conform to aXSL changes: Move more trait methods to standard location.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-02-09 03:21:47 UTC (rev 12579)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-02-09 03:52:05 UTC (rev 12580)
@@ -719,7 +719,12 @@
@Override
public String destinationName() {
- final String id = traitId();
+ String id = null;
+ final Fo generatedBy = this.traitGeneratedBy();
+ if (generatedBy instanceof IdPa) {
+ id = ((IdPa) generatedBy).traitId();
+ }
+
if (id == null || id.equals("")) {
return null;
}
@@ -909,15 +914,6 @@
return this;
}
- @Override
- public String traitId() {
- final Fo generatedBy = this.traitGeneratedBy();
- if (generatedBy instanceof IdPa) {
- return ((IdPa) generatedBy).traitId();
- }
- return null;
- }
-
/**
* Returns the border-start-width trait for this area.
* @return The border-start-width trait for this area.
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java 2022-02-09 03:21:47 UTC (rev 12579)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java 2022-02-09 03:52:05 UTC (rev 12580)
@@ -505,8 +505,8 @@
final AreaOriginDescriptor proxy = area.traitGeneratedByProxy();
if (proxy != null) {
String idString = "";
- if (area.traitId() != null && ! area.traitId().equals("")) {
- idString = "(id " + area.traitId() + ")";
+ if (proxy.traitId() != null && ! proxy.traitId().equals("")) {
+ idString = "(id " + proxy.traitId() + ")";
}
outputAttribute(buffer, "generated-by", proxy.getName() + idString);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|