summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-05 09:54:58 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:50 +0200
commit0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 (patch)
tree3d441110176e37c1a6ba2d15a3653d5023863075 /embeddedobj
parentd26540bb05b0443e7988da34372c86f88cbf1f6c (diff)
java: remove commented out code
Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/test/Container1/BitmapPainter.java22
-rw-r--r--embeddedobj/test/Container1/PaintThread.java30
2 files changed, 0 insertions, 52 deletions
diff --git a/embeddedobj/test/Container1/BitmapPainter.java b/embeddedobj/test/Container1/BitmapPainter.java
index 75e9c8a07069..482421bd52ae 100644
--- a/embeddedobj/test/Container1/BitmapPainter.java
+++ b/embeddedobj/test/Container1/BitmapPainter.java
@@ -61,9 +61,6 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
private PaintThread m_aPaintThread;
- // private XJob m_xMainThreadExecutor;
- // private NamedValue[] m_pValuesForExecutor;
-
private boolean m_bFree = true;
private boolean m_bProceedWithPainting = true;
@@ -84,10 +81,6 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
throw new com.sun.star.uno.RuntimeException();
}
- // m_xMainThreadExecutor = xJob;
- // m_pValuesForExecutor = new NamedValue[1];
- // m_pValuesForExecutor[0] = new NamedValue( "JobToExecute", (Object)this );
-
m_xWindow = xWindow;
m_xBitmap = xBitmap;
@@ -171,29 +164,14 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe
XBitmap xBitmap = null;
com.sun.star.awt.Rectangle aRect = null;
- // boolean bFree = false;
synchronized( m_oImageLock )
{
xBitmap = m_xBitmap;
aRect = m_aDrawRect;
- // if ( m_bFree )
- // {
- // bFree = true;
- // m_bFree = false;
- // }
}
m_aPaintThread.setPaintRequest( xBitmap, aRect, e.UpdateRect );
- // if ( bFree )
- // {
- // try {
- // m_xMainThreadExecutor.execute( m_pValuesForExecutor );
- // } catch( Exception ex )
- // {
- // m_bFree = true;
- // }
- // }
System.out.println( "VCL window paint event!" );
}
diff --git a/embeddedobj/test/Container1/PaintThread.java b/embeddedobj/test/Container1/PaintThread.java
index 4e6b166fa94c..f7eb63ef2735 100644
--- a/embeddedobj/test/Container1/PaintThread.java
+++ b/embeddedobj/test/Container1/PaintThread.java
@@ -73,18 +73,6 @@ class PaintThread extends java.lang.Thread
{
synchronized( m_oRequestsLock )
{
- /*
- System.out.println( "Paint request Pos( "
- + aRect.X + ", "
- + aRect.Y + ", "
- + aRect.Width + ", "
- + aRect.Height + " ), Clip ( "
- + aClip.X + ", "
- + aClip.Y + ", "
- + aClip.Width + ", "
- + aClip.Height + " )" );
- */
-
if ( PaintThread.interceptedRects( aRect, aClip ) )
{
m_xBitmap = xBitmap;
@@ -92,8 +80,6 @@ class PaintThread extends java.lang.Thread
m_bToPaint = true;
}
}
-
- // System.out.println( "Paint request to paint thread is done! xBitmap = " + xBitmap );
}
public void disposeThread()
@@ -126,15 +112,12 @@ class PaintThread extends java.lang.Thread
if ( bPaint )
{
- // System.out.println( "The bitmap is going to be painted!" );
XDevice xDevice = (XDevice)UnoRuntime.queryInterface( XDevice.class, m_xWindow );
if ( xDevice != null )
{
- // System.out.println( "Step1" );
XGraphics xGraphics = xDevice.createGraphics();
if ( xBitmap != null )
{
- // System.out.println( "Step2" );
XDisplayBitmap xDisplayBitmap = xDevice.createDisplayBitmap( xBitmap );
com.sun.star.awt.Size aSize = xBitmap.getSize();
@@ -142,8 +125,6 @@ class PaintThread extends java.lang.Thread
aRect.X, aRect.Y, aRect.Width, aRect.Height );
}
- // System.out.println( "Step3" );
- // xGraphics.drawRect( aRect.X - 1, aRect.Y - 1, aRect.Width + 2, aRect.Height + 2 );
xGraphics.drawLine( aRect.X - 1, aRect.Y - 1,
aRect.X + aRect.Width + 1, aRect.Y - 1 );
xGraphics.drawLine( aRect.X + aRect.Width + 1, aRect.Y - 1,
@@ -152,17 +133,6 @@ class PaintThread extends java.lang.Thread
aRect.X - 1, aRect.Y + aRect.Height + 1 );
xGraphics.drawLine( aRect.X - 1, aRect.Y + aRect.Height + 1,
aRect.X - 1, aRect.Y - 1 );
-
- // draw resize squares
- // System.out.println( "Step4" );
- // xGraphics.drawRect( aRect.X - 2, aRect.Y - 2, 4, 4 );
- // xGraphics.drawRect( aRect.X + aRect.Width - 2, aRect.Y - 2, 4, 4 );
- // xGraphics.drawRect( aRect.X - 2, aRect.Y + aRect.Height - 2, 4, 4 );
- // xGraphics.drawRect( aRect.X + aRect.Width - 2, aRect.Y + aRect.Height - 2, 4, 4 );
-
- // System.out.println( "Step5" );
-
- // System.out.println( "The bitmap is painted by paint thread!" );
}
}
}