You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/03/01 01:28:56 UTC
svn commit: r632506 -
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/
Author: vsiveton
Date: Fri Feb 29 16:28:55 2008
New Revision: 632506
URL: http://svn.apache.org/viewvc?rev=632506&view=rev
Log:
DOXIA-217: Make default internal classes
o updated also some javadoc
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java Fri Feb 29 16:28:55 2008
@@ -19,14 +19,17 @@
* under the License.
*/
-public class AlphaNumerals
+/**
+ * @version $Id$
+ */
+class AlphaNumerals
{
- public static String toString( int n )
+ static String toString( int n )
{
return toString( n, false );
}
- public static String toString( int n, boolean lowerCase )
+ static String toString( int n, boolean lowerCase )
{
StringBuffer alpha = new StringBuffer();
char zeroLetter = lowerCase ? '`' : '@';
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java Fri Feb 29 16:28:55 2008
@@ -22,17 +22,18 @@
/**
* A basic font descriptor using standard PostScript font metrics to compute
* text extents. All dimensions returned are in twips.
+ *
+ * @version $Id$
*/
-public class Font
+class Font
{
-
private int style;
private int size;
private FontMetrics metrics;
- public Font( int style, int size /*pts*/ )
+ Font( int style, int size /*pts*/ )
throws Exception
{
this.style = style;
@@ -40,17 +41,17 @@
metrics = FontMetrics.find( style );
}
- public int ascent()
+ int ascent()
{
return toTwips( metrics.ascent );
}
- public int descent()
+ int descent()
{
return toTwips( metrics.descent );
}
- public TextExtents textExtents( String text )
+ TextExtents textExtents( String text )
{
int i, n;
int width = 0;
@@ -103,5 +104,4 @@
}
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java Fri Feb 29 16:28:55 2008
@@ -19,9 +19,11 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class FontMetrics
{
-
boolean fixedPitch;
short ascent;
@@ -97,5 +99,4 @@
}
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class Monospace
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 600, 0, 7, -157, 592, 672 ), new CharMetrics( 600, 0, -6, -157, 555, 629 ),
new CharMetrics( 600, 0, 7, -157, 592, 595 )};
- public Monospace()
+ Monospace()
{
super( true, 629, -157, new CharMetrics( 0, 0, -28, -250, 628, 805 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class MonospaceBold
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -153,7 +155,7 @@
new CharMetrics( 600, 0, -4, -142, 601, 661 ), new CharMetrics( 600, 0, -14, -142, 570, 626 ),
new CharMetrics( 600, 0, -4, -142, 601, 625 )};
- public MonospaceBold()
+ MonospaceBold()
{
super( true, 626, -142, new CharMetrics( 0, 0, -113, -250, 749, 801 ), metrics );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class MonospaceBoldItalic
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 600, 0, -20, -142, 694, 661 ), new CharMetrics( 600, 0, -31, -142, 622, 626 ),
new CharMetrics( 600, 0, -20, -142, 694, 625 )};
- public MonospaceBoldItalic()
+ MonospaceBoldItalic()
{
super( true, 626, -142, new CharMetrics( 0, 0, -56, -250, 868, 801 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class MonospaceItalic
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 600, 0, -4, -157, 683, 672 ), new CharMetrics( 600, 0, -24, -157, 605, 629 ),
new CharMetrics( 600, 0, -4, -157, 683, 595 )};
- public MonospaceItalic()
+ MonospaceItalic()
{
super( true, 629, -157, new CharMetrics( 0, 0, -28, -250, 742, 805 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java Fri Feb 29 16:28:55 2008
@@ -28,14 +28,16 @@
import java.io.InputStream;
import java.io.Reader;
-public class PBMReader
+/**
+ * @version $Id$
+ */
+class PBMReader
{
+ static final int TYPE_PBM = 1;
- public static final int TYPE_PBM = 1;
+ static final int TYPE_PGM = 2;
- public static final int TYPE_PGM = 2;
-
- public static final int TYPE_PPM = 3;
+ static final int TYPE_PPM = 3;
private static final boolean TRACE = false;
@@ -61,7 +63,7 @@
private InputStream stream;
- public PBMReader( String fileName )
+ PBMReader( String fileName )
throws Exception
{
HeaderReader header = new HeaderReader();
@@ -105,32 +107,32 @@
skip( length );
}
- public int type()
+ int type()
{
return type;
}
- public int width()
+ int width()
{
return width;
}
- public int height()
+ int height()
{
return height;
}
- public int maxValue()
+ int maxValue()
{
return maxValue;
}
- public int bytesPerLine()
+ int bytesPerLine()
{
return bytesPerLine;
}
- public long skip( long count )
+ long skip( long count )
throws IOException
{
long skipped = stream.skip( count );
@@ -153,7 +155,7 @@
return skipped;
}
- public int read( byte[] b, int off, int len )
+ int read( byte[] b, int off, int len )
throws IOException
{
int count = 0;
@@ -169,7 +171,7 @@
return count;
}
- public static void main( String[] args )
+ static void main( String[] args )
throws Exception
{
PBMReader pbm = new PBMReader( args[0] );
@@ -316,7 +318,5 @@
{
}
}
-
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java Fri Feb 29 16:28:55 2008
@@ -19,7 +19,10 @@
* under the License.
*/
-public class RomanNumerals
+/**
+ * @version $Id$
+ */
+class RomanNumerals
{
private static final int[] NUMBERS = {1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
@@ -31,12 +34,12 @@
// -----------------------------------------------------------------------
- public static String toString( int n )
+ static String toString( int n )
{
return toString( n, false );
}
- public static String toString( int n, boolean lowerCase )
+ static String toString( int n, boolean lowerCase )
{
StringBuffer roman = new StringBuffer();
String[] letters = lowerCase ? LOWER_CASE_LETTERS : UPPER_CASE_LETTERS;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkAdapter;
-import org.apache.maven.doxia.parser.Parser;
-
-import java.awt.*;
+import java.awt.Color;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -35,9 +31,13 @@
import java.util.StringTokenizer;
import java.util.Vector;
+import org.apache.maven.doxia.parser.Parser;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkAdapter;
+
/**
- * @plexus.component role="org.apache.maven.doxia.sink.Sink"
- * role-hint="rtf"
+ * @version $Id$
+ * @plexus.component role="org.apache.maven.doxia.sink.Sink" role-hint="rtf"
*/
public class RtfSink
extends SinkAdapter
@@ -861,12 +861,12 @@
{
tableCell();
}
-
+
public void tableHeaderCell_()
{
tableCell_();
}
-
+
public void tableCell()
{
cell = new Cell();
@@ -1212,52 +1212,63 @@
writer.println( "\\plain\\fs1\\par" );
}
+ /** {@inheritDoc} */
public void pageBreak()
{
writer.println( "\\page" );
}
+ /** {@inheritDoc} */
public void anchor( String name )
{
}
+ /** {@inheritDoc} */
public void anchor_()
{
}
+ /** {@inheritDoc} */
public void link( String name )
{
}
+ /** {@inheritDoc} */
public void link_()
{
}
+ /** {@inheritDoc} */
public void italic()
{
beginStyle( STYLE_ITALIC );
}
+ /** {@inheritDoc} */
public void italic_()
{
endStyle();
}
+ /** {@inheritDoc} */
public void bold()
{
beginStyle( STYLE_BOLD );
}
+ /** {@inheritDoc} */
public void bold_()
{
endStyle();
}
+ /** {@inheritDoc} */
public void monospaced()
{
beginStyle( STYLE_TYPEWRITER );
}
+ /** {@inheritDoc} */
public void monospaced_()
{
endStyle();
@@ -1311,6 +1322,7 @@
}
}
+ /** {@inheritDoc} */
public void lineBreak()
{
switch ( context.get() )
@@ -1325,6 +1337,7 @@
}
}
+ /** {@inheritDoc} */
public void nonBreakingSpace()
{
switch ( context.get() )
@@ -1338,6 +1351,7 @@
}
}
+ /** {@inheritDoc} */
public void text( String text )
{
switch ( context.get() )
@@ -1926,11 +1940,13 @@
}
+ /** {@inheritDoc} */
public void flush()
{
writer.flush();
}
+ /** {@inheritDoc} */
public void close()
{
writer.close();
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SansSerif
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 500, 0, 11, -214, 489, 734 ), new CharMetrics( 556, 0, 58, -207, 517, 718 ),
new CharMetrics( 500, 0, 11, -214, 489, 706 )};
- public SansSerif()
+ SansSerif()
{
super( false, 718, -207, new CharMetrics( 0, 0, -166, -225, 1000, 931 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SansSerifBold
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 556, 0, 10, -214, 539, 750 ), new CharMetrics( 611, 0, 62, -208, 578, 718 ),
new CharMetrics( 556, 0, 10, -214, 539, 729 )};
- public SansSerifBold()
+ SansSerifBold()
{
super( false, 718, -207, new CharMetrics( 0, 0, -170, -228, 1003, 962 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SansSerifBoldItalic
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 556, 0, 42, -214, 652, 750 ), new CharMetrics( 611, 0, 18, -208, 645, 718 ),
new CharMetrics( 556, 0, 42, -214, 652, 729 )};
- public SansSerifBoldItalic()
+ SansSerifBoldItalic()
{
super( false, 718, -207, new CharMetrics( 0, 0, -174, -228, 1114, 962 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SansSerifItalic
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 500, 0, 15, -214, 600, 734 ), new CharMetrics( 556, 0, 14, -207, 584, 718 ),
new CharMetrics( 500, 0, 15, -214, 600, 706 )};
- public SansSerifItalic()
+ SansSerifItalic()
{
super( false, 718, -207, new CharMetrics( 0, 0, -170, -225, 1116, 931 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class Serif
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 500, 0, 14, -218, 475, 678 ), new CharMetrics( 500, 0, 5, -217, 470, 683 ),
new CharMetrics( 500, 0, 14, -218, 475, 623 )};
- public Serif()
+ Serif()
{
super( false, 683, -217, new CharMetrics( 0, 0, -168, -218, 1000, 898 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SerifBold
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 500, 0, 16, -205, 480, 713 ), new CharMetrics( 556, 0, 19, -205, 524, 676 ),
new CharMetrics( 500, 0, 16, -205, 480, 667 )};
- public SerifBold()
+ SerifBold()
{
super( false, 676, -205, new CharMetrics( 0, 0, -168, -218, 1000, 935 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SerifBoldItalic
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 444, 0, -94, -205, 435, 697 ), new CharMetrics( 500, 0, -120, -205, 446, 699 ),
new CharMetrics( 444, 0, -94, -205, 438, 655 )};
- public SerifBoldItalic()
+ SerifBoldItalic()
{
super( false, 699, -205, new CharMetrics( 0, 0, -200, -218, 996, 921 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java Fri Feb 29 16:28:55 2008
@@ -19,11 +19,13 @@
* under the License.
*/
+/**
+ * @version $Id$
+ */
class SerifItalic
extends FontMetrics
{
-
- public static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -153,9 +155,8 @@
new CharMetrics( 444, 0, -24, -206, 459, 664 ), new CharMetrics( 500, 0, -75, -205, 469, 683 ),
new CharMetrics( 444, 0, -24, -206, 441, 606 )};
- public SerifItalic()
+ SerifItalic()
{
super( false, 683, -205, new CharMetrics( 0, 0, -169, -217, 1010, 883 ), metrics );
}
-
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java?rev=632506&r1=632505&r2=632506&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java Fri Feb 29 16:28:55 2008
@@ -28,19 +28,19 @@
/**
* A Windows MetaFile writer.
+ *
+ * @version $Id$
*/
-public class WMFWriter
+class WMFWriter
{
-
- /*
+ /**
* See the libwmf library documentation
* (http://www.wvware.com/wmf_doc_index.html)
* for a description of WMF format.
*/
-
private static Record trailer = new Record( 0, null );
- /*
+ /**
* standard header fields
*/
private short fileType;
@@ -59,7 +59,7 @@
private Vector records;
- public WMFWriter()
+ WMFWriter()
{
fileType = 2;
headerSize = 9;
@@ -72,7 +72,7 @@
records = new Vector();
}
- public void add( Record record )
+ void add( Record record )
{
records.addElement( record );
@@ -84,12 +84,12 @@
}
}
- public int size()
+ int size()
{
return fileSize;
}
- public void write( String fileName )
+ void write( String fileName )
throws IOException
{
BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream( fileName ) );
@@ -98,7 +98,7 @@
out.close();
}
- public void write( OutputStream out )
+ void write( OutputStream out )
throws IOException
{
write16( fileType, out );
@@ -121,7 +121,7 @@
/**
* Writes a 16-bit integer in little-endian format.
*/
- public static void write16( int word, OutputStream out )
+ static void write16( int word, OutputStream out )
throws IOException
{
out.write( word );
@@ -131,7 +131,7 @@
/**
* Writes a 32-bit integer in little-endian format.
*/
- public static void write32( int dword, OutputStream out )
+ static void write32( int dword, OutputStream out )
throws IOException
{
out.write( dword );
@@ -140,7 +140,7 @@
out.write( dword >> 24 );
}
- public void print( Writer out )
+ void print( Writer out )
throws IOException
{
print16( fileType, out );
@@ -161,7 +161,7 @@
trailer.print( out );
}
- public static void print16( int word, Writer out )
+ static void print16( int word, Writer out )
throws IOException
{
byte[] buf = new byte[2];
@@ -170,7 +170,7 @@
print( buf, 0, 2, out );
}
- public static void print32( int dword, Writer out )
+ static void print32( int dword, Writer out )
throws IOException
{
byte[] buf = new byte[4];
@@ -181,7 +181,7 @@
print( buf, 0, 4, out );
}
- public static void print( byte[] buf, int off, int len, Writer out )
+ static void print( byte[] buf, int off, int len, Writer out )
throws IOException
{
char[] cbuf = new char[2 * len];
@@ -211,7 +211,7 @@
out.write( cbuf );
}
- public static void print( byte[] buf, int off, int len, Writer out, int lw )
+ static void print( byte[] buf, int off, int len, Writer out, int lw )
throws IOException
{
String ls = System.getProperty( "line.separator" );
@@ -228,16 +228,15 @@
/**
* Standard data record.
*/
- static public class Record
+ static class Record
{
-
protected int size;
private short function;
private short[] parameters;
- public Record( int function, int[] parameters )
+ Record( int function, int[] parameters )
{
this.function = (short) function;
if ( parameters != null )
@@ -251,12 +250,12 @@
size = 3 + ( parameters == null ? 0 : parameters.length );
}
- public int size()
+ int size()
{
return size;
}
- public void write( OutputStream out )
+ void write( OutputStream out )
throws IOException
{
write32( size, out );
@@ -270,7 +269,7 @@
}
}
- public void print( Writer out )
+ void print( Writer out )
throws IOException
{
print32( size, out );
@@ -289,50 +288,49 @@
/**
* DIB data structure.
*/
- static public class Dib
+ static class Dib
{
-
- /*
+ /**
* compression types
*/
- public static final int BI_RGB = 0;
+ static final int BI_RGB = 0;
- public static final int BI_RLE8 = 1;
+ static final int BI_RLE8 = 1;
- public static final int BI_RLE4 = 2;
+ static final int BI_RLE4 = 2;
- public static final int BI_BITFIELDS = 3;
+ static final int BI_BITFIELDS = 3;
/*
* information header fields
*/
- public final int biSize = 40; // header size
+ final int biSize = 40; // header size
- public int biWidth; // image width
+ int biWidth; // image width
- public int biHeight; // image height
+ int biHeight; // image height
- public final short biPlanes = 1; // number of planes
+ final short biPlanes = 1; // number of planes
- public short biBitCount; // number of bits per pixel
+ short biBitCount; // number of bits per pixel
- public int biCompression; // compression type
+ int biCompression; // compression type
- public int biSizeImage; // image data size
+ int biSizeImage; // image data size
- public int biXPelsPerMeter; // horizontal resolution
+ int biXPelsPerMeter; // horizontal resolution
- public int biYPelsPerMeter; // vertical resolution
+ int biYPelsPerMeter; // vertical resolution
- public int biClrUsed; // number of colors
+ int biClrUsed; // number of colors
- public int biClrImportant; // number of required colors
+ int biClrImportant; // number of required colors
- public byte[] palette; // color palette
+ byte[] palette; // color palette
- public byte[] bitmap; // bitmap data
+ byte[] bitmap; // bitmap data
- public int size()
+ int size()
{
int size = biSize;
if ( palette != null )
@@ -353,7 +351,7 @@
return size / 2;
}
- public void write( OutputStream out )
+ void write( OutputStream out )
throws IOException
{
write32( biSize, out );
@@ -384,7 +382,7 @@
}
}
- public void print( Writer out )
+ void print( Writer out )
throws IOException
{
String ls = System.getProperty( "line.separator" );
@@ -416,7 +414,7 @@
}
}
- public static int rlEncode8( byte[] inBuf, int inOff, int inLen, byte[] outBuf, int outOff )
+ static int rlEncode8( byte[] inBuf, int inOff, int inLen, byte[] outBuf, int outOff )
{
int i1, i2, j, k, n;
int len;
@@ -494,60 +492,58 @@
return j - outOff;
}
-
}
- static public class DibBitBltRecord
+ static class DibBitBltRecord
extends Record
{
-
- /*
+ /**
* parameter count
*/
- public static final int P_COUNT = 8;
+ static final int P_COUNT = 8;
- /*
+ /**
* parameter indexes
*/
- public static final int P_ROP_L = 0;
+ static final int P_ROP_L = 0;
- public static final int P_ROP_H = 1;
+ static final int P_ROP_H = 1;
- public static final int P_YSRC = 2;
+ static final int P_YSRC = 2;
- public static final int P_XSRC = 3;
+ static final int P_XSRC = 3;
- public static final int P_HEIGHT = 4;
+ static final int P_HEIGHT = 4;
- public static final int P_WIDTH = 5;
+ static final int P_WIDTH = 5;
- public static final int P_YDST = 6;
+ static final int P_YDST = 6;
- public static final int P_XDST = 7;
+ static final int P_XDST = 7;
private Dib dib;
- public DibBitBltRecord( int[] parameters, Dib dib )
+ DibBitBltRecord( int[] parameters, Dib dib )
{
super( 0x0940, parameters );
size += dib.size();
this.dib = dib;
}
- public void write( OutputStream out )
+ /** {@inheritDoc} */
+ void write( OutputStream out )
throws IOException
{
super.write( out );
dib.write( out );
}
- public void print( Writer out )
+ /** {@inheritDoc} */
+ void print( Writer out )
throws IOException
{
super.print( out );
dib.print( out );
}
-
}
-
}