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 2025/05/12 13:03:20 UTC

(xmlgraphics-fop) branch main updated: Set classes to static

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 ae5289ad7 Set classes to static
ae5289ad7 is described below

commit ae5289ad7352845ae110cd51cbdb3c9c8c136518
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Mon May 12 14:03:11 2025 +0100

    Set classes to static
---
 .../src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java   | 2 +-
 fop-core/src/main/java/org/apache/fop/afp/modca/Registry.java         | 2 +-
 fop-core/src/main/java/org/apache/fop/area/LineArea.java              | 2 +-
 fop-core/src/main/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java    | 2 +-
 .../org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java    | 2 +-
 fop-core/src/main/java/org/apache/fop/fo/flow/Character.java          | 2 +-
 fop-core/src/main/java/org/apache/fop/fo/flow/Marker.java             | 2 +-
 .../java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java    | 2 +-
 .../java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java   | 2 +-
 .../main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java  | 2 +-
 .../java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java | 2 +-
 .../main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java  | 2 +-
 .../java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java     | 2 +-
 fop-core/src/main/java/org/apache/fop/pdf/PDFEncoding.java            | 2 +-
 .../src/main/java/org/apache/fop/render/awt/viewer/PreviewPanel.java  | 2 +-
 .../java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java   | 2 +-
 .../java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java     | 2 +-
 fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java      | 2 +-
 .../java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java     | 2 +-
 .../main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java | 4 ++--
 fop-core/src/main/java/org/apache/fop/util/AbstractPaintingState.java | 2 +-
 fop-core/src/tools/resources/findbugs/exclusions.xml                  | 4 ----
 22 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java b/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
index 4174f31d8..4c4db49b5 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
@@ -621,7 +621,7 @@ public abstract class CharacterSetBuilder {
         }
     }
 
-    private class FontControl {
+    private static class FontControl {
 
         private int dpi;
         private int unitsPerEm;
diff --git a/fop-core/src/main/java/org/apache/fop/afp/modca/Registry.java b/fop-core/src/main/java/org/apache/fop/afp/modca/Registry.java
index fe0a42790..45cd85284 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/modca/Registry.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/modca/Registry.java
@@ -209,7 +209,7 @@ public final class Registry {
     /**
      * Encapsulates a MOD:CA Registry Object Type entry
      */
-    public class ObjectType {
+    public static class ObjectType {
         private final byte componentId;
         private final byte[] oid;
         private final String name;
diff --git a/fop-core/src/main/java/org/apache/fop/area/LineArea.java b/fop-core/src/main/java/org/apache/fop/area/LineArea.java
index f659c2d78..3c1ae5217 100644
--- a/fop-core/src/main/java/org/apache/fop/area/LineArea.java
+++ b/fop-core/src/main/java/org/apache/fop/area/LineArea.java
@@ -44,7 +44,7 @@ public class LineArea extends Area {
      * page-number or a page-number-citation is resolved
      */
     // @SuppressFBWarnings("SE_INNER_CLASS")
-    private final class LineAdjustingInfo implements Serializable {
+    private static final class LineAdjustingInfo implements Serializable {
 
         private static final long serialVersionUID = -6103629976229458273L;
 
diff --git a/fop-core/src/main/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java b/fop-core/src/main/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
index 8bd28caf5..4b3b14dcf 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
@@ -439,7 +439,7 @@ public class XMLWhiteSpaceHandler {
      * with an iterator that starts at the first white-space
      * character in the sequence of trailing white-space
      */
-    private class PendingInline {
+    private static class PendingInline {
         protected CharIterator firstTrailingWhiteSpace;
 
         PendingInline(CharIterator firstTrailingWhiteSpace) {
diff --git a/fop-core/src/main/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java b/fop-core/src/main/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java
index fd64f1a98..9021945c3 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java
@@ -48,7 +48,7 @@ public class XMPContentHandlerFactory implements ContentHandlerFactory {
     /**
      * Local subclass of XMPHandler that implements ObjectSource for FOP integration.
      */
-    private class FOPXMPHandler extends XMPHandler implements ObjectSource {
+    private static class FOPXMPHandler extends XMPHandler implements ObjectSource {
 
         private ObjectBuiltListener obListener;
 
diff --git a/fop-core/src/main/java/org/apache/fop/fo/flow/Character.java b/fop-core/src/main/java/org/apache/fop/fo/flow/Character.java
index c075d8b7e..3a3a0f830 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/flow/Character.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/flow/Character.java
@@ -249,7 +249,7 @@ public class Character extends FObj implements StructureTreeElementHolder {
         return ranges;
     }
 
-    private class FOCharIterator extends CharIterator {
+    private static class FOCharIterator extends CharIterator {
 
         private boolean bFirst = true;
         private Character foChar;
diff --git a/fop-core/src/main/java/org/apache/fop/fo/flow/Marker.java b/fop-core/src/main/java/org/apache/fop/fo/flow/Marker.java
index 1233da615..01e52337e 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/flow/Marker.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/flow/Marker.java
@@ -156,7 +156,7 @@ public class Marker extends FObjMixed {
      * specified properties/attributes as bundles of name-value-namespace
      * strings
      */
-    protected class MarkerPropertyList extends PropertyList
+    protected static class MarkerPropertyList extends PropertyList
             implements Attributes {
 
         /** the array of attributes **/
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 7fc5c09c0..6e9293579 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -581,7 +581,7 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout
                 rect, relDims);
     }
 
-    private class BlockContainerPosition extends NonLeafPosition {
+    private static class BlockContainerPosition extends NonLeafPosition {
 
         private BlockContainerBreaker breaker;
 
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
index ce35a38ee..0c728517c 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
@@ -73,7 +73,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager
     /**
      * Store information about the inline area
      */
-    protected class AreaInfo {
+    protected static class AreaInfo {
         /** letter space count */
         protected short letterSpaces;
         /** ipd of area */
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index 25b68842c..66f92a7f4 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -182,7 +182,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
      * which was the first element in the paragraph
      * returned by each LM.
      */
-    private final class Update {
+    private static final class Update {
         private final InlineLevelLayoutManager inlineLM;
         private final int firstIndex;
 
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
index 75aa3467a..5f0373629 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
@@ -32,7 +32,7 @@ public class LineLayoutPossibilities {
     /** logger instance */
     private static final Log LOG = LogFactory.getLog(LineLayoutPossibilities.class);
 
-    private final class Possibility {
+    private static final class Possibility {
         private int lineCount;
         private double demerits;
         private List<LineLayoutManager.LineBreakPosition> breakPositions;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index a96e5706e..6fdc69749 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -69,7 +69,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
     /**
      * this class stores information about changes in vecAreaInfo which are not yet applied
      */
-    private final class PendingChange {
+    private static final class PendingChange {
 
         private final GlyphMapping mapping;
         private final int index;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index bc54fa1da..49e2d7562 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -85,7 +85,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
     private Keep keepWithNextPendingOnLabel;
     private Keep keepWithNextPendingOnBody;
 
-    public class ListItemPosition extends Position {
+    public static class ListItemPosition extends Position {
         private int labelFirstIndex;
         private int labelLastIndex;
         private int bodyFirstIndex;
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFEncoding.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFEncoding.java
index 64fd6f866..4bd1ac57e 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFEncoding.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFEncoding.java
@@ -146,7 +146,7 @@ public class PDFEncoding extends PDFDictionary {
     /**
      * Builder class for constructing the Differences array.
      */
-    public class DifferencesBuilder {
+    public static class DifferencesBuilder {
 
         private int currentCode = -1;
 
diff --git a/fop-core/src/main/java/org/apache/fop/render/awt/viewer/PreviewPanel.java b/fop-core/src/main/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
index 93cc29e4f..97abb9565 100644
--- a/fop-core/src/main/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
+++ b/fop-core/src/main/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
@@ -279,7 +279,7 @@ public class PreviewPanel extends JPanel {
     /**
      * Allows any mouse drag on the page area to scroll the display window.
      */
-    private class ViewportScroller implements MouseListener, MouseMotionListener {
+    private static class ViewportScroller implements MouseListener, MouseMotionListener {
         /** The viewport to be scrolled */
         private final JViewport viewport;
         /** Starting position of a mouse drag - X co-ordinate */
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
index a09f55bec..41467a975 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
@@ -64,7 +64,7 @@ public class PSBatikFlowTextElementBridge extends BatikFlowTextElementBridge {
         return this.textPainter;
     }
 
-    private class PSFlowExtTextPainter extends PSTextPainter {
+    private static class PSFlowExtTextPainter extends PSTextPainter {
 
         /**
          * Main constructor
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
index df9e22053..3e33183a0 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
@@ -64,7 +64,7 @@ public class PSSVGFlowRootElementBridge extends SVGFlowRootElementBridge {
         return this.textPainter;
     }
 
-    private class PSFlowTextPainter extends PSTextPainter {
+    private static class PSFlowTextPainter extends PSTextPainter {
 
         /**
          * Main constructor
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java b/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
index 911c0d871..08960172a 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -1003,7 +1003,7 @@ public class RTFHandler extends FOEventHandler {
             RtfListItem item
                 = (RtfListItem)builderContext.getContainer(RtfListItem.class, true, this);
 
-            RtfListItemLabel label = item.new RtfListItemLabel(item);
+            RtfListItemLabel label = new RtfListItem.RtfListItemLabel(item);
             builderContext.pushContainer(label);
         } catch (IOException ioe) {
             handleIOTrouble(ioe);
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
index 0b365bb15..23f9f4a1f 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
@@ -64,7 +64,7 @@ public class RtfListItem extends RtfContainer
     /**
      * special RtfTextrun that is used as list item label
      */
-    public class RtfListItemLabel extends RtfTextrun implements IRtfTextrunContainer {
+    public static class RtfListItemLabel extends RtfTextrun implements IRtfTextrunContainer {
 
         private RtfListItem rtfListItem;
 
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
index 9758ab0b4..d034cabd8 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
@@ -61,7 +61,7 @@ public class RtfTextrun extends RtfContainer {
     private RtfSpaceManager rtfSpaceManager = new RtfSpaceManager();
 
     /**  Class which represents the opening of a RTF group mark.*/
-    private class RtfOpenGroupMark extends RtfElement {
+    private static class RtfOpenGroupMark extends RtfElement {
 
         RtfOpenGroupMark(RtfContainer parent, Writer w, RtfAttributes attr)
                 throws IOException {
@@ -86,7 +86,7 @@ public class RtfTextrun extends RtfContainer {
     }
 
     /**  Class which represents the closing of a RTF group mark.*/
-    private class RtfCloseGroupMark extends RtfElement {
+    private static class RtfCloseGroupMark extends RtfElement {
         private int breakType = BREAK_NONE;
 
         RtfCloseGroupMark(RtfContainer parent, Writer w, int breakType)
diff --git a/fop-core/src/main/java/org/apache/fop/util/AbstractPaintingState.java b/fop-core/src/main/java/org/apache/fop/util/AbstractPaintingState.java
index 8368383ba..b2d9f92de 100644
--- a/fop-core/src/main/java/org/apache/fop/util/AbstractPaintingState.java
+++ b/fop-core/src/main/java/org/apache/fop/util/AbstractPaintingState.java
@@ -385,7 +385,7 @@ public abstract class AbstractPaintingState implements Cloneable, Serializable {
      * A stack implementation which holds state objects
      */
     // @SuppressFBWarnings("SE_INNER_CLASS")
-    public class StateStack<E> extends java.util.Stack<E> {
+    public static class StateStack<E> extends java.util.Stack<E> {
 
         private static final long serialVersionUID = 4897178211223823041L;
 
diff --git a/fop-core/src/tools/resources/findbugs/exclusions.xml b/fop-core/src/tools/resources/findbugs/exclusions.xml
index 910aaf4a4..de9a86d52 100644
--- a/fop-core/src/tools/resources/findbugs/exclusions.xml
+++ b/fop-core/src/tools/resources/findbugs/exclusions.xml
@@ -383,10 +383,6 @@
     <!-- 33 warnings -->
     <Bug pattern="SE_BAD_FIELD"/>
   </Match>
-  <Match>
-    <!-- 21 warnings -->
-    <Bug pattern="SIC_INNER_SHOULD_BE_STATIC"/>
-  </Match>
   <Match>
     <!-- 20 warnings -->
     <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org