Author: mareshkau Date: 2010-10-13 05:49:07 -0400 (Wed, 13 Oct 2010) New Revision: 25778 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java Log: code refactoring,JBIDE-7295 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java 2010-10-13 09:41:39 UTC (rev 25777) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java 2010-10-13 09:49:07 UTC (rev 25778) @@ -11,57 +11,64 @@ * Class responsible for drawing borders around visual elements. * * @author Yahor Radtsevich (yradtsevich): extracted the code from XulRunnerEditor + * @author mareshkau * */ public class Flasher { private inIFlasher iFlasher; - private nsIDOMElement lastBorderedElement = null; // added by Maksim Areshkau as element for which we // have drowed border. When we draw new border, // we should remove old one; private static final String ELEMENT_BORDER_PATTERN = "border: 2px solid %s !important;";//$NON-NLS-1$ private static final String PREV_STYLE_ATTR_NAME = "oldstyle";//$NON-NLS-1$ - + private DrawOutlineInterface drawOutline; public Flasher() { nsIServiceManager serviceManager = Mozilla.getInstance() .getServiceManager(); iFlasher = (inIFlasher) serviceManager.getServiceByContractID( XPCOM.IN_FLASHER_CONTRACTID, inIFlasher.INIFLASHER_IID); iFlasher.setThickness(2); - } - - public void drawElementOutline(nsIDOMElement domElement) { - // fix for JBIDE-3969 - // if(Platform.OS_MACOSX.equals(Platform.getOS())&&hasSelectInParenNodes(domElement.getParentNode())) - // { - // return; - // } if (Platform.OS_MACOSX.equals(Platform.getOS())) { - // restore style for previously bordered element - if (this.lastBorderedElement != null - && this.lastBorderedElement.getAttribute(XulRunnerEditor.STYLE_ATTR) != null) { - String style = this.lastBorderedElement - .getAttribute(PREV_STYLE_ATTR_NAME); - this.lastBorderedElement.removeAttribute(PREV_STYLE_ATTR_NAME); - this.lastBorderedElement.setAttribute(XulRunnerEditor.STYLE_ATTR, style); - } + drawOutline = new DrawOutlineInterface() { + private nsIDOMElement lastBorderedElement = null; + @Override + public void drawElementOutline(nsIDOMElement domElement) { + if (this.lastBorderedElement != null + && this.lastBorderedElement.getAttribute(XulRunnerEditor.STYLE_ATTR) != null) { + String style = this.lastBorderedElement + .getAttribute(PREV_STYLE_ATTR_NAME); + this.lastBorderedElement.removeAttribute(PREV_STYLE_ATTR_NAME); + this.lastBorderedElement.setAttribute(XulRunnerEditor.STYLE_ATTR, style); + } - // save style for early bordered element - String oldstyle = domElement.getAttribute(XulRunnerEditor.STYLE_ATTR); - domElement.setAttribute(XulRunnerEditor.STYLE_ATTR, - domElement.getAttribute(XulRunnerEditor.STYLE_ATTR) + ';' - + String.format(ELEMENT_BORDER_PATTERN, iFlasher.getColor())); + // save style for early bordered element + String oldstyle = domElement.getAttribute(XulRunnerEditor.STYLE_ATTR); + domElement.setAttribute(XulRunnerEditor.STYLE_ATTR, + domElement.getAttribute(XulRunnerEditor.STYLE_ATTR) + ';' + + String.format(ELEMENT_BORDER_PATTERN, iFlasher.getColor())); - this.lastBorderedElement = domElement; - this.lastBorderedElement.setAttribute(PREV_STYLE_ATTR_NAME, - oldstyle); + this.lastBorderedElement = domElement; + this.lastBorderedElement.setAttribute(PREV_STYLE_ATTR_NAME, + oldstyle); + + } + }; } else { - // under osx function drawElementOutline not works - iFlasher.drawElementOutline(domElement); + drawOutline = new DrawOutlineInterface() { + @Override + public void drawElementOutline(nsIDOMElement domElement) { + iFlasher.drawElementOutline(domElement); + } + }; } } + + public void drawElementOutline(nsIDOMElement domElement) { + drawOutline.drawElementOutline(domElement); + } + public void scrollElementIntoView(nsIDOMElement element) { iFlasher.scrollElementIntoView(element); } @@ -76,6 +83,14 @@ public void dispose() { iFlasher = null; - lastBorderedElement = null; } } +/** + * Interface for draw outline functionality + * @author mareshkau + * + */ +interface DrawOutlineInterface{ + public void drawElementOutline(nsIDOMElement domElement); +}; +