Projects >> jogl >>9efc951e53c41e21a0c8bfed6dcc22762d9b413c

Chunk
Conflicting content 
                        requestFocusImpl(true);
                        display.dispatchMessagesNative(); // status up2date
                    }
<<<<<<< HEAD
                    w = nfs_width;
                    h = nfs_height;
                }
                if(DEBUG_IMPLEMENTATION || DEBUG_WINDOW_EVENT) {
                    System.err.println("Window fs: "+fullscreen+" "+x+"/"+y+" "+w+"x"+h+", "+isUndecorated()+", "+screen);
=======
>>>>>>> 18bf27fa86da1f26fd085565f501736816d2f2e9
                }
            } finally {
                windowLock.unlock();
Solution content 
                }
                        requestFocusImpl(true);
                        display.dispatchMessagesNative(); // status up2date
                    }
            } finally {
                windowLock.unlock();
File
WindowImpl.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
        visibleChanged(visible);
    }

<<<<<<< HEAD
    protected void setSizeImpl(int width, int height) {
        // this width/height will be set by sizeChanged, called by Windows
        setSize0(getParentWindowHandle(), getWindowHandle(), x, y, width, height);
    }

    protected void setPositionImpl(int x, int y) {
        // this x/y will be set by positionChanged, called by Windows
        setPosition0(getParentWindowHandle(), getWindowHandle(), x , y /*, width, height*/);
    }

    protected void reconfigureWindowImpl(int x, int y, int width, int height) {
        reconfigureWindow0(fullscreen?0:getParentWindowHandle(), getWindowHandle(), x, y, width, height, isUndecorated(), isFullscreen());
    }

    protected boolean reparentWindowImpl() {
        reparentWindow0(fullscreen?0:getParentWindowHandle(), getWindowHandle(), x, y, width, height, isUndecorated());
=======
    protected boolean reconfigureWindowImpl(int x, int y, int width, int height, 
                                            boolean parentChange, int fullScreenChange, int decorationChange) {
        reconfigureWindow0( (fullScreenChange>0)?0:getParentWindowHandle(), 
                             getWindowHandle(), x, y, width, height, isVisible(), parentChange, fullScreenChange, decorationChange);
>>>>>>> 18bf27fa86da1f26fd085565f501736816d2f2e9
        return true;
    }
Solution content 
        visibleChanged(visible);
    }

    protected boolean reconfigureWindowImpl(int x, int y, int width, int height, 
                                            boolean parentChange, int fullScreenChange, int decorationChange) {
        reconfigureWindow0( (fullScreenChange>0)?0:getParentWindowHandle(), 
                             getWindowHandle(), x, y, width, height, isVisible(), parentChange, fullScreenChange, decorationChange);
        return true;
    }
File
WindowsWindow.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
                                            long hInstance, long visualID,
                                            boolean isUndecorated,
                                            int x, int y, int width, int height);
<<<<<<< HEAD
    private        native void DestroyWindow0(long windowHandle);
    private        native long GetDC0(long windowHandle);
    private        native void ReleaseDC0(long windowHandle, long hdc);
    private        native long MonitorFromWindow0(long windowHandle);
    private static native void setVisible0(long windowHandle, boolean visible);
    private        native void setSize0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height);
    private static native void setPosition0(long parentWindowHandle, long windowHandle, int x, int y /*, int width, int height*/);
    private        native void reconfigureWindow0(long parentWindowHandle, long windowHandle, 
                                                  int x, int y, int width, int height, boolean isUndecorated, boolean fullscreen);
    private        native void reparentWindow0(long parentWindowHandle, long windowHandle, int x, int y, int width, int height, boolean isUndecorated);
=======
    private native void DestroyWindow0(long windowHandle);
    private native long GetDC0(long windowHandle);
    private native void ReleaseDC0(long windowHandle, long hdc);
    private native long MonitorFromWindow0(long windowHandle);
    private native void setVisible0(long windowHandle, boolean visible, boolean top, int x, int y, int width, int height);
    private native void reconfigureWindow0(long parentWindowHandle, long windowHandle, 
                                                  int x, int y, int width, int height, boolean isVisible,
                                                  boolean parentChange, int fullScreenChange, int decorationChange);
>>>>>>> 18bf27fa86da1f26fd085565f501736816d2f2e9
    private static native void setTitle0(long windowHandle, String title);
    private native void requestFocus0(long windowHandle, boolean force);
    private native Object getRelativeLocation0(long src_win, long dest_win, int src_x, int src_y);
Solution content 
                                            long hInstance, long visualID,
                                            boolean isUndecorated,
                                            int x, int y, int width, int height);
    private native void DestroyWindow0(long windowHandle);
    private native long GetDC0(long windowHandle);
    private native void ReleaseDC0(long windowHandle, long hdc);
    private native long MonitorFromWindow0(long windowHandle);
    private native void setVisible0(long windowHandle, boolean visible, boolean top, int x, int y, int width, int height);
    private native void reconfigureWindow0(long parentWindowHandle, long windowHandle, 
                                                  int x, int y, int width, int height, boolean isVisible,
                                                  boolean parentChange, int fullScreenChange, int decorationChange);
    private static native void setTitle0(long windowHandle, String title);
    private native void requestFocus0(long windowHandle, boolean force);
    private native Object getRelativeLocation0(long src_win, long dest_win, int src_x, int src_y);
File
WindowsWindow.java
Developer's decision
Version 2
Kind of conflict
Method interface
Chunk
Conflicting content 
        reparentCount=0;
        long reqNewParentHandle = ( fullScreenChange > 0 ) ? 0 : getParentWindowHandle() ;

<<<<<<< HEAD
    protected void reconfigureWindowImpl(int x, int y, int width, int height) {
        reconfigureWindow0(fullscreen?0:getParentWindowHandle(), getDisplayHandle(), getScreenIndex(), getWindowHandle(),
                            x, y, width, height, isUndecorated(), isVisible(),isFullscreen());

    }
=======
        reconfigureWindow0( getDisplayHandle(), getScreenIndex(), reqNewParentHandle, getWindowHandle(),
                            x, y, width, height, isVisible(), parentChange, fullScreenChange, decorationChange);
>>>>>>> 18bf27fa86da1f26fd085565f501736816d2f2e9

        return true;
    }
Solution content 
        reparentCount=0;
        long reqNewParentHandle = ( fullScreenChange > 0 ) ? 0 : getParentWindowHandle() ;

        reconfigureWindow0( getDisplayHandle(), getScreenIndex(), reqNewParentHandle, getWindowHandle(),
                            x, y, width, height, isVisible(), parentChange, fullScreenChange, decorationChange);
        return true;
    }
File
X11Window.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Method invocation
Chunk
Conflicting content 
    private native long CreateWindow0(long parentWindowHandle, long display, int screen_index, 
                                            long visualID, long javaObjectAtom, long windowDeleteAtom, 
                                            int x, int y, int width, int height, boolean undecorated);
<<<<<<< HEAD
    private        native void CloseWindow0(long display, long windowHandle, long javaObjectAtom, long windowDeleteAtom);
    private        native void setVisible0(long display, long windowHandle, boolean visible);
    private        native void setSize0(long display, long windowHandle, int width, int height);
    private        native void reconfigureWindow0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
                                                  int x, int y, int width, int height, boolean undecorated, boolean isVisible, boolean fullscreen);
    private        native void setTitle0(long display, long windowHandle, String title);
    private        native void requestFocus0(long display, long windowHandle, boolean reparented);
    private        native void setPosition0(long parentWindowHandle, long display, long windowHandle, int x, int y);
    private        native void reparentWindow0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
                                               int x, int y, boolean undecorated, boolean isVisible);
    
    private void windowCreated(long windowHandle) {
        setWindowHandle(windowHandle);
=======
    private native void CloseWindow0(long display, long windowHandle, long javaObjectAtom, long windowDeleteAtom);
    private native void setVisible0(long display, long windowHandle, boolean visible, int x, int y, int width, int height);
    private native void reconfigureWindow0(long display, int screen_index, long parentWindowHandle, long windowHandle, 
                                                  int x, int y, int width, int height, boolean isVisible,
                                                  boolean parentChange, int fullScreenChange, int decorationChange);
    private native void setTitle0(long display, long windowHandle, String title);
    private native void requestFocus0(long display, long windowHandle, boolean force);
    private native Object getRelativeLocation0(long display, int screen_index, long src_win, long dest_win, int src_x, int src_y);

    private void windowReparented(long gotParentHandle) {
        reparentHandle = gotParentHandle;
        reparentCount++;
        if(DEBUG_IMPLEMENTATION) { 
            System.err.println("******** new parent ("+reparentCount+"): " + toHexString(reparentHandle) );
        }
>>>>>>> 18bf27fa86da1f26fd085565f501736816d2f2e9
    }

    private long   windowHandleClose;
Solution content 
    private native long CreateWindow0(long parentWindowHandle, long display, int screen_index, 
                                            long visualID, long javaObjectAtom, long windowDeleteAtom, 
                                            int x, int y, int width, int height, boolean undecorated);
    private native void CloseWindow0(long display, long windowHandle, long javaObjectAtom, long windowDeleteAtom);
    private native void setVisible0(long display, long windowHandle, boolean visible, int x, int y, int width, int height);
    private native void reconfigureWindow0(long display, int screen_index, long parentWindowHandle, long windowHandle, 
                                                  int x, int y, int width, int height, boolean isVisible,
                                                  boolean parentChange, int fullScreenChange, int decorationChange);
    private native void setTitle0(long display, long windowHandle, String title);
    private native void requestFocus0(long display, long windowHandle, boolean force);
    private native Object getRelativeLocation0(long display, int screen_index, long src_win, long dest_win, int src_x, int src_y);

    private void windowReparented(long gotParentHandle) {
        reparentHandle = gotParentHandle;
        reparentCount++;
        if(DEBUG_IMPLEMENTATION) { 
            System.err.println("******** new parent ("+reparentCount+"): " + toHexString(reparentHandle) );
        }
    }

    private long   windowHandleClose;
File
X11Window.java
Developer's decision
Version 2
Kind of conflict
If statement
Method interface
Method invocation
Method signature
Variable