You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ac...@apache.org on 2007/12/05 18:43:47 UTC
svn commit: r601444 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageSegment.java
Author: acumiskey
Date: Wed Dec 5 09:43:46 2007
New Revision: 601444
URL: http://svn.apache.org/viewvc?rev=601444&view=rev
Log:
Checkstyle fixes
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageSegment.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageSegment.java?rev=601444&r1=601443&r2=601444&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageSegment.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageSegment.java Wed Dec 5 09:43:46 2007
@@ -42,25 +42,23 @@
/**
* The name of the image segment
*/
- private String _name;
+ private String name;
/**
* The name of the image segment as EBCIDIC bytes
*/
- private byte[] _nameBytes;
+ private byte[] nameBytes;
/**
* The ImageContent for the image segment
*/
- private ImageContent _imageContent = null;
+ private ImageContent imageContent = null;
/**
* Default constructor for the ImageSegment.
*/
public ImageSegment() {
-
this(DEFAULT_NAME);
-
}
/**
@@ -76,21 +74,16 @@
throw new IllegalArgumentException(msg);
}
- _name = name;
+ this.name = name;
try {
-
- _nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
-
+ this.nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
} catch (UnsupportedEncodingException usee) {
-
- _nameBytes = name.getBytes();
+ this.nameBytes = name.getBytes();
log.warn(
"Constructor:: UnsupportedEncodingException translating the name "
+ name);
-
}
-
}
/**
@@ -102,10 +95,10 @@
* @param vsize The vertival size of the image.
*/
public void setImageSize(int hresol, int vresol, int hsize, int vsize) {
- if (_imageContent == null) {
- _imageContent = new ImageContent();
+ if (imageContent == null) {
+ imageContent = new ImageContent();
}
- _imageContent.setImageSize(hresol, vresol, hsize, vsize);
+ imageContent.setImageSize(hresol, vresol, hsize, vsize);
}
/**
@@ -113,10 +106,10 @@
* @param encoding The image encoding.
*/
public void setImageEncoding(byte encoding) {
- if (_imageContent == null) {
- _imageContent = new ImageContent();
+ if (imageContent == null) {
+ imageContent = new ImageContent();
}
- _imageContent.setImageEncoding(encoding);
+ imageContent.setImageEncoding(encoding);
}
/**
@@ -124,10 +117,10 @@
* @param compression The image compression.
*/
public void setImageCompression(byte compression) {
- if (_imageContent == null) {
- _imageContent = new ImageContent();
+ if (imageContent == null) {
+ imageContent = new ImageContent();
}
- _imageContent.setImageCompression(compression);
+ imageContent.setImageCompression(compression);
}
/**
@@ -135,10 +128,10 @@
* @param size The IDE size.
*/
public void setImageIDESize(byte size) {
- if (_imageContent == null) {
- _imageContent = new ImageContent();
+ if (imageContent == null) {
+ imageContent = new ImageContent();
}
- _imageContent.setImageIDESize(size);
+ imageContent.setImageIDESize(size);
}
/**
@@ -146,35 +139,34 @@
* @param colorModel the IDE color model.
*/
public void setImageIDEColorModel(byte colorModel) {
- if (_imageContent == null) {
- _imageContent = new ImageContent();
+ if (imageContent == null) {
+ imageContent = new ImageContent();
}
- _imageContent.setImageIDEColorModel(colorModel);
+ imageContent.setImageIDEColorModel(colorModel);
}
/**
* Set the data of the image.
* @param data the image data
*/
- public void setImageData(byte data[]) {
- if (_imageContent == null) {
- _imageContent = new ImageContent();
+ public void setImageData(byte[] data) {
+ if (imageContent == null) {
+ imageContent = new ImageContent();
}
- _imageContent.setImageData(data);
+ imageContent.setImageData(data);
}
/**
* Accessor method to write the AFP datastream for the Image Segment
* @param os The stream to write to
- * @throws java.io.IOException
+ * @throws java.io.IOException if an I/O exception occurred
*/
- public void writeDataStream(OutputStream os)
- throws IOException {
+ public void writeDataStream(OutputStream os) throws IOException {
writeStart(os);
- if (_imageContent != null) {
- _imageContent.writeDataStream(os);
+ if (imageContent != null) {
+ imageContent.writeDataStream(os);
}
writeEnd(os);
@@ -197,9 +189,9 @@
0x00, // Name byte 4
};
- for (int i = 0; i < _nameBytes.length; i++) {
+ for (int i = 0; i < nameBytes.length; i++) {
- data[2 + i] = _nameBytes[i];
+ data[2 + i] = nameBytes[i];
}
@@ -211,16 +203,12 @@
* Helper method to write the end of the Image Segment.
* @param os The stream to write to
*/
- private void writeEnd(OutputStream os)
- throws IOException {
+ private void writeEnd(OutputStream os) throws IOException {
byte[] data = new byte[] {
0x71, // ID
0x00, // Length
};
-
os.write(data);
-
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org