diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:24:45 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 15:02:45 -0600 |
commit | e4f6ba5e3ced6ff2ef28d71d406b5b6a6cdd90c5 (patch) | |
tree | eced613222e59082d7428c6bffdfce99414fe0ba /embeddedobj/test | |
parent | eb8b76211ee706f42489dbd548c05df6f31b2149 (diff) |
Remove visual noise from embeddedobj
Change-Id: I63ce6896e2f82160ffedb9f6123ca765f49698c5
Reviewed-on: https://gerrit.libreoffice.org/8256
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'embeddedobj/test')
-rw-r--r-- | embeddedobj/test/Container1/BitmapPainter.java | 34 | ||||
-rw-r--r-- | embeddedobj/test/Container1/JavaWindowPeerFake.java | 2 | ||||
-rw-r--r-- | embeddedobj/test/Container1/NativeView.java | 14 | ||||
-rw-r--r-- | embeddedobj/test/Container1/nativelib/nativeview.c | 2 |
4 files changed, 26 insertions, 26 deletions
diff --git a/embeddedobj/test/Container1/BitmapPainter.java b/embeddedobj/test/Container1/BitmapPainter.java index 6f688c8f99bc..75e9c8a07069 100644 --- a/embeddedobj/test/Container1/BitmapPainter.java +++ b/embeddedobj/test/Container1/BitmapPainter.java @@ -69,7 +69,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe private boolean m_bProceedWithPainting = true; // Methods - //------------------------------------------------------ + public BitmapPainter( XJob xJob, XWindow xWindow, XBitmap xBitmap, com.sun.star.awt.Rectangle aDrawRect ) { if ( xJob == null ) @@ -103,7 +103,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe m_xWindow.addMouseMotionListener( this ); } - //------------------------------------------------------ + public void disconnectListener() { m_aPaintThread.disposeThread(); @@ -112,7 +112,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe m_xWindow.removeMouseMotionListener( this ); } - //------------------------------------------------------ + public void setBitmap( XBitmap xBitmap ) { synchronized( m_oImageLock ) @@ -121,7 +121,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe } } - //------------------------------------------------------ + public void setPos( com.sun.star.awt.Point aPoint ) { synchronized( m_oImageLock ) @@ -131,7 +131,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe } } - //------------------------------------------------------ + public void setRect( com.sun.star.awt.Rectangle aRect ) { synchronized( m_oImageLock ) @@ -140,7 +140,7 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe } } - //------------------------------------------------------ + public void setSize( com.sun.star.awt.Size aSize ) { synchronized( m_oImageLock ) @@ -150,20 +150,20 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe } } - //------------------------------------------------------ + public void stopPainting() { m_bProceedWithPainting = false; } - //------------------------------------------------------ + public void startPainting() { m_bProceedWithPainting = true; } // XPaintListener - //------------------------------------------------------ + public void windowPaint( PaintEvent e ) { if ( !m_bProceedWithPainting ) @@ -199,49 +199,49 @@ class BitmapPainter implements XPaintListener, XMouseListener, XMouseMotionListe } // XMouseListener - //------------------------------------------------------ + public void mousePressed( MouseEvent e ) { } - //------------------------------------------------------ + public void mouseReleased( MouseEvent e ) { } - //------------------------------------------------------ + public void mouseEntered( MouseEvent e ) { } - //------------------------------------------------------ + public void mouseExited( MouseEvent e ) { } // XMouseMotionListener - //------------------------------------------------------ + public void mouseDragged( MouseEvent e ) { // TODO: react to resizing of object bitmap // if the object is inplace active the object must control resizing } - //------------------------------------------------------ + public void mouseMoved( MouseEvent e ) { } // XEventListener - //------------------------------------------------------ + public void disposing( com.sun.star.lang.EventObject e ) { // do nothing, the window can die only when the application is closed } // XJob - //------------------------------------------------------ + public Object execute( NamedValue[] pValues ) { /* diff --git a/embeddedobj/test/Container1/JavaWindowPeerFake.java b/embeddedobj/test/Container1/JavaWindowPeerFake.java index 0b3c705b1933..54d1f39df5ea 100644 --- a/embeddedobj/test/Container1/JavaWindowPeerFake.java +++ b/embeddedobj/test/Container1/JavaWindowPeerFake.java @@ -39,7 +39,7 @@ class JavaWindowPeerFake implements XSystemDependentWindowPeer, maView = aNative; } - // ____________________ + /** * Implementation of XSystemDependentWindowPeer ( that's all we really need ). * This method is called back from the Office toolkit to retrieve the system data. diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java index 70d745775ba9..7063072a1a0f 100644 --- a/embeddedobj/test/Container1/NativeView.java +++ b/embeddedobj/test/Container1/NativeView.java @@ -37,7 +37,7 @@ import java.awt.event.*; public class NativeView extends java.awt.Canvas { - // ____________________ + /** * ctor @@ -54,7 +54,7 @@ public class NativeView extends java.awt.Canvas this.setBackground( Color.white ); } - // ____________________ + /** * Overload this method to make necessary initializations here. @@ -71,7 +71,7 @@ public class NativeView extends java.awt.Canvas getHWND(); } - // ____________________ + /** * to guarantee right resize handling inside a swing container @@ -93,7 +93,7 @@ public class NativeView extends java.awt.Canvas return new Dimension( 300, 300 ); } - // ____________________ + /** * overload paint routine to show provide against @@ -112,7 +112,7 @@ public class NativeView extends java.awt.Canvas } } - // ____________________ + /** * JNI interface of this class @@ -143,7 +143,7 @@ public class NativeView extends java.awt.Canvas return maHandle; } - // ____________________ + /** * for using of the JNI methods it's necessary to load @@ -154,7 +154,7 @@ public class NativeView extends java.awt.Canvas System.loadLibrary( "nativeview" ); } - // ____________________ + /** * @member maHandle system window handle diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c index 8f5e4c7ad5e8..2f3ea772c9f3 100644 --- a/embeddedobj/test/Container1/nativelib/nativeview.c +++ b/embeddedobj/test/Container1/nativelib/nativeview.c @@ -72,7 +72,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow #else // FIXME: Where is dsi_x11 defined? // Added below because I'm guessing this test breaks - // + // JAWT_X11DrawingSurfaceInfo*dsi_x11 ; #endif jlong drawable; |