Author: ayukhovich Date: 2007-08-22 10:38:06 -0400 (Wed, 22 Aug 2007) New Revision: 3277 Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseListener.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java Log: http://jira.jboss.com/jira/browse/JBIDE-742 add functionality of resizing Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseListener.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseListener.java 2007-08-22 14:34:00 UTC (rev 3276) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseListener.java 2007-08-22 14:38:06 UTC (rev 3277) @@ -54,9 +54,7 @@ mouseDown(mouseEvent); } else if (XulRunnerConstants.EVENT_NAME_MOUSEUP.equals(mouseEvent.getType())) { mouseUp(mouseEvent); - } else if (XulRunnerConstants.EVENT_NAME_MOUSEMOVE.equals(mouseEvent.getType())) { - mouseMove(mouseEvent); - } + } } /* @@ -131,14 +129,4 @@ } } } - - /** - * processing event of mouseMove - * - * @param mouseEvent - * a nsIDOMMouseEvent object - */ - private void mouseMove(nsIDOMMouseEvent mouseEvent) { - vpeResizer.mouseMove(mouseEvent); - } } Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java 2007-08-22 14:34:00 UTC (rev 3276) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java 2007-08-22 14:38:06 UTC (rev 3277) @@ -42,7 +42,7 @@ if ( mouseEvent == null ) { return; } - + System.out.println("VpeResizerMouseMoti: mouseMove"); vpeResizer.mouseMove(mouseEvent); } Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java 2007-08-22 14:34:00 UTC (rev 3276) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java 2007-08-22 14:38:06 UTC (rev 3277) @@ -73,7 +73,8 @@ private int originalX; private int originalY; - private int usedEResizeMarkerHandle; + /** bit-mask of used resize marker */ + private int usedResizeMarker; private int incrementFactorX; private int incrementFactorY; @@ -134,8 +135,7 @@ /* * (non-Javadoc) * - * @see org.jboss.vpe.mozilla.resizer.IVpeResizer#show(org.mozilla.interfaces.nsIDOMElement, - * int) + * @see org.jboss.vpe.mozilla.resizer.IVpeResizer#show(org.mozilla.interfaces.nsIDOMElement, int) */ public void show(nsIDOMElement domElement, int resizers) { resizingObject = domElement; @@ -454,28 +454,28 @@ } if (locationStr.equals(RESIZER_MARKER_STRING_TOPLEFT)) { - usedEResizeMarkerHandle = RESIZER_MARKER_TOPLEFT; + usedResizeMarker = RESIZER_MARKER_TOPLEFT; setResizeIncrements(1, 1, -1, -1, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_TOP)) { - usedEResizeMarkerHandle = RESIZER_MARKER_TOP; + usedResizeMarker = RESIZER_MARKER_TOP; setResizeIncrements(0, 1, 0, -1, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_TOPRIGHT)) { - usedEResizeMarkerHandle = RESIZER_MARKER_TOPRIGHT; + usedResizeMarker = RESIZER_MARKER_TOPRIGHT; setResizeIncrements(0, 1, 1, -1, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_LEFT)) { - usedEResizeMarkerHandle = RESIZER_MARKER_LEFT; + usedResizeMarker = RESIZER_MARKER_LEFT; setResizeIncrements(1, 0, -1, 0, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_RIGHT)) { - usedEResizeMarkerHandle = RESIZER_MARKER_RIGHT; + usedResizeMarker = RESIZER_MARKER_RIGHT; setResizeIncrements(0, 0, 1, 0, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_BOTTOMLEFT)) { - usedEResizeMarkerHandle = RESIZER_MARKER_BOTTOMLEFT; + usedResizeMarker = RESIZER_MARKER_BOTTOMLEFT; setResizeIncrements(1, 0, -1, 1, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_BOTTOM)) { - usedEResizeMarkerHandle = RESIZER_MARKER_BOTTOM; + usedResizeMarker = RESIZER_MARKER_BOTTOM; setResizeIncrements(0, 0, 0, 1, false); } else if (locationStr.equals(RESIZER_MARKER_STRING_BOTTOMRIGHT)) { - usedEResizeMarkerHandle = RESIZER_MARKER_BOTTOMRIGHT; + usedResizeMarker = RESIZER_MARKER_BOTTOMRIGHT; setResizeIncrements(0, 0, 1, 1, false); } @@ -494,7 +494,7 @@ } mouseMotionListener = new VpeResizerMouseMotionListener(this); - if ( mouseMotionListener != null ) { + if ( mouseMotionListener == null ) { return; } @@ -761,8 +761,7 @@ * @param aClientX * @param aClientY */ - private void endResizing(int aClientX, int aClientY) - { + private void endResizing(int aClientX, int aClientY) { if (resizingShadow == null) { return; } @@ -777,17 +776,13 @@ int width = getNewResizingWidth(aClientX, aClientY); int height = getNewResizingHeight(aClientX, aClientY); - int listenersCount = objectResizeEventListeners.size(); - if (listenersCount != 0) { - IVpeResizeListener listener; - int index; - for (index = 0; index < listenersCount; index++) { - listener = objectResizeEventListeners.get(index); - listener.onEndResizing(usedEResizeMarkerHandle,top,left,width,height,resizingObject); + if ( objectResizeEventListeners.size() != 0) { + for ( IVpeResizeListener resizeListener : objectResizeEventListeners ) { + resizeListener.onEndResizing(usedResizeMarker,top,left,width,height,resizingObject); } } - usedEResizeMarkerHandle = 0; + usedResizeMarker = 0; } /**