Author: kiwiwings
Date: Fri Feb 14 01:00:45 2014
New Revision: 1568178
URL: http://svn.apache.org/r1568178
Log:
FindBugs fix
- fixed "Should be a static inner class"
- see
http://findbugs.sourceforge.net/bugDescriptions.html#SIC_INNER_SHOULD_BE_STATIC
Modified:
poi/trunk/src/java/org/apache/poi/hpsf/Section.java
poi/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Section.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Section.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Section.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Section.java Fri Feb 14 01:00:45 2014
@@ -294,7 +294,7 @@ public class Section
* <p>Represents an entry in the property list and holds a property's ID
and
* its offset from the section's beginning.</p>
*/
- class PropertyListEntry implements Comparable<PropertyListEntry>
+ static class PropertyListEntry implements Comparable<PropertyListEntry>
{
int id;
int offset;
Modified: poi/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java Fri Feb 14
01:00:45 2014
@@ -108,7 +108,7 @@ public class CellWalk {
*
* @author Roman Kashitsyn
*/
- private class SimpleCellWalkContext implements CellWalkContext {
+ private static class SimpleCellWalkContext implements CellWalkContext {
public long ordinalNumber = 0;
public int rowNumber = 0;
public int colNumber = 0;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java Fri Feb 14
01:00:45 2014
@@ -167,7 +167,7 @@ public class POIXMLProperties {
/**
* The core document properties
*/
- public class CoreProperties {
+ public static class CoreProperties {
private PackagePropertiesPart part;
private CoreProperties(PackagePropertiesPart part) {
this.part = part;
@@ -273,7 +273,7 @@ public class POIXMLProperties {
/**
* Extended document properties
*/
- public class ExtendedProperties {
+ public static class ExtendedProperties {
private
org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument
props;
private
ExtendedProperties(org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.PropertiesDocument
props) {
this.props = props;
@@ -287,7 +287,7 @@ public class POIXMLProperties {
/**
* Custom document properties
*/
- public class CustomProperties {
+ public static class CustomProperties {
/**
* Each custom property element contains an fmtid attribute
* with the same GUID value
({D5CDD505-2E9C-101B-9397-08002B2CF9AE}).
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
Fri Feb 14 01:00:45 2014
@@ -66,6 +66,7 @@ public class ZipInputStreamZipEntrySourc
}
public InputStream getInputStream(ZipEntry zipEntry) {
+ assert (zipEntry instanceof FakeZipEntry);
FakeZipEntry entry = (FakeZipEntry)zipEntry;
return entry.getInputStream();
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
Fri Feb 14 01:00:45 2014
@@ -187,7 +187,7 @@ public final class ChunkFactory {
* The definition of a Command, which a chunk may hold.
* The Command holds the value, this describes it.
*/
- public class CommandDefinition {
+ public static class CommandDefinition {
private int type;
private int offset;
private String name;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java Fri
Feb 14 01:00:45 2014
@@ -17,10 +17,11 @@
package org.apache.poi.hslf.record;
-import org.apache.poi.util.LittleEndian;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.poi.util.LittleEndian;
+
/**
* A Slide Atom (type 1007). Holds information on the parent Slide, what
* Master Slide it uses, what Notes is attached to it, that sort of thing.
@@ -173,7 +174,7 @@ public final class SlideAtom extends Rec
* usual record header. Since it's a fixed size and tied to
* the SlideAtom, we'll hold it here.)
*/
- public class SSlideLayoutAtom {
+ public static class SSlideLayoutAtom {
// The different kinds of geometry
public static final int TITLE_SLIDE = 0;
public static final int TITLE_BODY_SLIDE = 1;
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java?rev=1568178&r1=1568177&r2=1568178&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
Fri Feb 14 01:00:45 2014
@@ -17,12 +17,12 @@
package org.apache.poi.hslf.record;
-import org.apache.poi.util.LittleEndian;
-
import java.io.IOException;
import java.io.OutputStream;
import java.util.Vector;
+import org.apache.poi.util.LittleEndian;
+
/**
* These are tricky beasts. They contain the text of potentially
* many (normal) slides. They are made up of several sets of
@@ -181,7 +181,7 @@ public final class SlideListWithText ext
* includes sets of TextHeaderAtom and TextBytesAtom/TextCharsAtom,
* along with some others.
*/
- public class SlideAtomsSet {
+ public static class SlideAtomsSet {
private SlidePersistAtom slidePersistAtom;
private Record[] slideRecords;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
