Author: yradtsevich
Date: 2010-03-12 03:13:29 -0500 (Fri, 12 Mar 2010)
New Revision: 20792
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerEditor2.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerPreview.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5042
Enhance DnD support in VPE
VPE Refactoring in progress.
- double initialization of VpeController has been replaced by single initialization.
- MozillaEditor tooltip- and resize- listeners have been separated.
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-03-12
02:24:37 UTC (rev 20791)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-03-12
08:13:29 UTC (rev 20792)
@@ -874,11 +874,11 @@
visualEditor.setEditorLoadWindowListener(new EditorLoadWindowListener() {
public void load() {
visualEditor.setEditorLoadWindowListener(null);
- visualEditor.setController(new VpeController(
- VpeEditorPart.this));
- selectionBar.setVpeController(visualEditor.getController());
- visualEditor.getController().setSelectionBarController(selectionBar);
- visualEditor.getController().init(sourceEditor, visualEditor);
+ VpeController vpeController = new VpeController(
+ VpeEditorPart.this);
+ selectionBar.setVpeController(vpeController);
+ vpeController.setSelectionBarController(selectionBar);
+ vpeController.init(sourceEditor, visualEditor);
}
});
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-03-12
02:24:37 UTC (rev 20791)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-03-12
08:13:29 UTC (rev 20792)
@@ -63,6 +63,8 @@
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mozilla.listener.MozillaEventListener;
import org.jboss.tools.vpe.editor.mozilla.listener.EditorLoadWindowListener;
+import org.jboss.tools.vpe.editor.mozilla.listener.MozillaResizeListener;
+import org.jboss.tools.vpe.editor.mozilla.listener.MozillaTooltipListener;
import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage;
import org.jboss.tools.vpe.editor.toolbar.IVpeToolBarManager;
import org.jboss.tools.vpe.editor.toolbar.VpeDropDownMenu;
@@ -1097,7 +1099,11 @@
showSelectionBarAction.setChecked(checked);
}
- public MozillaEventListener getEditorDomEventListener() {
+ public MozillaResizeListener getResizeListener() {
return mozillaEventListener;
}
+
+ public MozillaTooltipListener getTooltipListener() {
+ return mozillaEventListener;
+ }
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerEditor2.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerEditor2.java 2010-03-12
02:24:37 UTC (rev 20791)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerEditor2.java 2010-03-12
08:13:29 UTC (rev 20792)
@@ -41,18 +41,18 @@
}
public void onElementResize(nsIDOMElement element, int constrains, int top, int left,
int width, int height) {
- if (mozillaEditor != null && mozillaEditor.getEditorDomEventListener() != null)
{
- mozillaEditor.getEditorDomEventListener().elementResized(element, constrains, top,
left, width, height);
+ if (mozillaEditor != null && mozillaEditor.getResizeListener() != null) {
+ mozillaEditor.getResizeListener().elementResized(element, constrains, top, left,
width, height);
}
}
public void onShowTooltip(int x, int y, String text) {
- if (mozillaEditor != null && mozillaEditor.getEditorDomEventListener() != null)
{
- mozillaEditor.getEditorDomEventListener().onShowTooltip(x, y, text);
+ if (mozillaEditor != null && mozillaEditor.getTooltipListener() != null) {
+ mozillaEditor.getTooltipListener().onShowTooltip(x, y, text);
}
}
public void onHideTooltip() {
- if (mozillaEditor != null && mozillaEditor.getEditorDomEventListener() != null)
{
- mozillaEditor.getEditorDomEventListener().onHideTooltip();
+ if (mozillaEditor != null && mozillaEditor.getTooltipListener() != null) {
+ mozillaEditor.getTooltipListener().onHideTooltip();
}
}
public void onDispose() {
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerPreview.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerPreview.java 2010-03-12
02:24:37 UTC (rev 20791)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/XulRunnerPreview.java 2010-03-12
08:13:29 UTC (rev 20792)
@@ -29,13 +29,13 @@
}
public void onShowTooltip(int x, int y, String text) {
- if (mozillaPreview != null && mozillaPreview.getEditorDomEventListener() !=
null) {
- mozillaPreview.getEditorDomEventListener().onShowTooltip(x, y, text);
+ if (mozillaPreview != null && mozillaPreview.getTooltipListener() != null) {
+ mozillaPreview.getTooltipListener().onShowTooltip(x, y, text);
}
}
public void onHideTooltip() {
- if (mozillaPreview != null && mozillaPreview.getEditorDomEventListener() !=
null) {
- mozillaPreview.getEditorDomEventListener().onHideTooltip();
+ if (mozillaPreview != null && mozillaPreview.getTooltipListener() != null) {
+ mozillaPreview.getTooltipListener().onHideTooltip();
}
}