You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jj...@apache.org on 2006/08/21 03:15:17 UTC
svn commit: r433112 - in /cocoon/branches/BRANCH_2_1_X:
src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java
status.xml
Author: jjohnston
Date: Sun Aug 20 18:15:16 2006
New Revision: 433112
URL: http://svn.apache.org/viewvc?rev=433112&view=rev
Log:
<action dev="JJ" type="fix">
ImageOp block: Send info/debug messages to the log rather than
System.out.println
</action>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java?rev=433112&r1=433111&r2=433112&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java Sun Aug 20 18:15:16 2006
@@ -96,7 +96,9 @@
{
super.setup(resolver, objectModel, src, par);
m_Format = par.getParameter("output-format", FORMAT_DEFAULT);
- getLogger().info( src + " --> " + m_Format );
+ if(getLogger().isInfoEnabled()) {
+ getLogger().info( src + " --> " + m_Format );
+ }
setupEffectsStack( par );
}
@@ -190,19 +192,25 @@
{
ImageOperation op = (ImageOperation) list.next();
WritableRaster r = op.apply( src );
- System.out.println( "In Bounds: " + r.getBounds() );
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug( "In Bounds: " + r.getBounds() );
+ }
src = r.createWritableTranslatedChild( 0, 0 );
}
ColorModel cm = image.getColorModel();
- System.out.println( "Out Bounds: " + src.getBounds() );
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug( "Out Bounds: " + src.getBounds() );
+ }
BufferedImage newImage = new BufferedImage( cm, src, true, new Hashtable() );
// Not sure what this should really be --------------^^^^^
int minX = newImage.getMinX();
int minY = newImage.getMinY();
int width = newImage.getWidth();
- int height = newImage.getHeight();
- System.out.println( "Image: " + minX + ", " + minY + ", " + width + ", " + height );
+ int height = newImage.getHeight();
+ if(getLogger().isInfoEnabled()) {
+ getLogger().info( "Image: " + minX + ", " + minY + ", " + width + ", " + height );
+ }
return newImage;
}
@@ -222,7 +230,9 @@
ImageWriterSpi spi = writer.getOriginatingProvider();
String[] mimetypes = spi.getMIMETypes();
- getLogger().info( "Setting content-type: " + mimetypes[0] );
+ if(getLogger().isInfoEnabled()) {
+ getLogger().info( "Setting content-type: " + mimetypes[0] );
+ }
response.setHeader("Content-Type", mimetypes[0] );
ImageOutputStream output = ImageIO.createImageOutputStream( out );
try
@@ -255,11 +265,10 @@
value = value << 16;
value = value + v;
}
- System.out.print( Long.toHexString( value ) );
- System.out.print( " " );
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug( Long.toHexString( value ) );
+ }
}
- System.out.println();
- System.out.println();
}
*/
}
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=433112&r1=433111&r2=433112&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sun Aug 20 18:15:16 2006
@@ -183,6 +183,9 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.10" date="TBD">
+ <action dev="JJ" type="fix">
+ ImageOp block: Send info/debug messages to the log rather than System.out.println
+ </action>
<action dev="AG" type="fix" fixes-bug="COCOON-1815" due-to="Frédéric Glorieux" due-to-email="frederic.glorieux@ajlsm.com">
Core: CopySourceAction generate NPE.
</action>
Re: svn commit: r433112 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java status.xml
Posted by Jean-Baptiste Quenot <jb...@apache.org>.
* Jason Johnston:
> Reinhard Poetz wrote:
>
> > please keep trunk in sync with your changes in the 2.1
> > branch. Thanks!
>
> Yes of course! I tried to do so, however apparently the ImageOp
> block does not exist in trunk?! Unless I'm just not seeing it;
> can someone point me in the right direction?
Indeed trunk was not usable at the time I added the imageop block,
so it ended up in branch 2.1 only.
See https://issues.apache.org/jira/browse/COCOON-1301
--
Jean-Baptiste Quenot
aka John Banana Qwerty
http://caraldi.com/jbq/
Re: svn commit: r433112 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java
status.xml
Posted by Jason Johnston <co...@lojjic.net>.
Reinhard Poetz wrote:
> jjohnston@apache.org wrote:
>> Author: jjohnston
>> Date: Sun Aug 20 18:15:16 2006
>> New Revision: 433112
>>
>> URL: http://svn.apache.org/viewvc?rev=433112&view=rev
>> Log:
>> <action dev="JJ" type="fix">
>> ImageOp block: Send info/debug messages to the log rather than
>> System.out.println
>> </action>
>
> Jason,
>
> please keep trunk in sync with your changes in the 2.1 branch. Thanks!
Yes of course! I tried to do so, however apparently the ImageOp block
does not exist in trunk?! Unless I'm just not seeing it; can someone
point me in the right direction?
Re: svn commit: r433112 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java
status.xml
Posted by Reinhard Poetz <re...@apache.org>.
jjohnston@apache.org wrote:
> Author: jjohnston
> Date: Sun Aug 20 18:15:16 2006
> New Revision: 433112
>
> URL: http://svn.apache.org/viewvc?rev=433112&view=rev
> Log:
> <action dev="JJ" type="fix">
> ImageOp block: Send info/debug messages to the log rather than
> System.out.println
> </action>
Jason,
please keep trunk in sync with your changes in the 2.1 branch. Thanks!
--
Reinhard Pötz Independent Consultant, Trainer & (IT)-Coach
{Software Engineering, Open Source, Web Applications, Apache Cocoon}
web(log): http://www.poetz.cc
--------------------------------------------------------------------
___________________________________________________________
Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de
Re: svn commit: r433112 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/imageop/java/org/apache/cocoon/reading/imageop/ImageOpReader.java
status.xml
Posted by Reinhard Poetz <re...@apache.org>.
jjohnston@apache.org wrote:
> Author: jjohnston
> Date: Sun Aug 20 18:15:16 2006
> New Revision: 433112
>
> URL: http://svn.apache.org/viewvc?rev=433112&view=rev
> Log:
> <action dev="JJ" type="fix">
> ImageOp block: Send info/debug messages to the log rather than
> System.out.println
> </action>
Jason,
please keep trunk in sync with your changes in the 2.1 branch. Thanks!
--
Reinhard Pötz Independent Consultant, Trainer & (IT)-Coach
{Software Engineering, Open Source, Web Applications, Apache Cocoon}
web(log): http://www.poetz.cc
--------------------------------------------------------------------
___________________________________________________________
Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de