Author: mareshkau Date: 2008-10-30 12:57:18 -0400 (Thu, 30 Oct 2008) New Revision: 11350 Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java Log: JBIDE-3061 Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-10-30 16:54:31 UTC (rev 11349) +++ branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-10-30 16:57:18 UTC (rev 11350) @@ -28,10 +28,7 @@ import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -58,8 +55,8 @@ import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage; -import org.jboss.tools.vpe.editor.toolbar.VpeDropDownMenu; import org.jboss.tools.vpe.editor.toolbar.IVpeToolBarManager; +import org.jboss.tools.vpe.editor.toolbar.VpeDropDownMenu; import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager; import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager; import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar; @@ -90,7 +87,6 @@ static String SELECT_BAR = "SELECT_LBAR"; //$NON-NLS-1$ private XulRunnerEditor xulRunnerEditor; - private nsIDOMDocument domDocument; private nsIDOMEventTarget documentEventTarget; private nsIDOMElement contentArea; private nsIDOMNode headNode; @@ -454,19 +450,8 @@ } public nsIDOMDocument getDomDocument() { - if (domDocument == null) { - domDocument = xulRunnerEditor.getDOMDocument(); - } - return domDocument; + return xulRunnerEditor.getDOMDocument(); } - - /** - * @param domDocument the domDocument to set - */ - protected void setDomDocument(nsIDOMDocument domDocument) { - - this.domDocument = domDocument; - } public nsIDOMElement getContentArea() { return contentArea; @@ -604,7 +589,7 @@ getContentAreaEventTarget().removeEventListener(MozillaDomEventListener.DRAGOVEREVENT, getContentAreaEventListener(), false); getContentAreaEventTarget().removeEventListener(MozillaDomEventListener.DBLCLICK, getContentAreaEventListener(), false); - if (domDocument != null && documentEventTarget != null) { + if (getDomDocument() != null && documentEventTarget != null) { documentEventTarget.removeEventListener(MozillaDomEventListener.KEYPRESS, getContentAreaEventListener(), false); } getContentAreaEventListener().setVisualEditor(null);