[jbosstools-commits] JBoss Tools SVN: r18056 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directory.
Author: dmaliarevich
Date: 2009-10-13 04:20:18 -0400 (Tue, 13 Oct 2009)
New Revision: 18056
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4982, AttributeDescriptorValueProvider was added
to drop data in VpeController.
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-10-13
02:08:30 UTC (rev 18055)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-10-13
08:20:18 UTC (rev 18056)
@@ -743,7 +743,7 @@
DropData dropData = new DropData(flavor, data,
getEditorInput(), getSourceViewer(),
getSelectionProvider());
- dropData.setValueProvider(new AttributeDescriptorValueProviderImpl());
+ dropData.setValueProvider(createAttributeDescriptorValueProvider());
dropData.setAttributeName(dropContext.getAttributeName());
IDropCommand dropCommand = DropCommandFactory.getInstance()
@@ -752,6 +752,7 @@
boolean promptAttributes =
JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT);
+
dropCommand
.getDefaultModel()
.setPromptForTagAttributesRequired(promptAttributes);
@@ -763,6 +764,10 @@
});
}
+ public AttributeDescriptorValueProvider createAttributeDescriptorValueProvider() {
+ return new AttributeDescriptorValueProviderImpl();
+ }
+
class AttributeDescriptorValueProviderImpl implements AttributeDescriptorValueProvider
{
TagProposal proposal;
KbQuery query;
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-13
02:08:30 UTC (rev 18055)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-13
08:20:18 UTC (rev 18056)
@@ -89,10 +89,13 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
import org.jboss.tools.common.resref.core.ResourceReferenceListListener;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.editor.IJSPTextEditor;
import org.jboss.tools.jst.jsp.editor.IVisualController;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper;
import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory;
+import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.jst.web.tld.URIConstants;
import org.jboss.tools.jst.web.tld.model.TLDUtil;
@@ -2226,15 +2229,23 @@
IDropCommand dropCommand = DropCommandFactory.getInstance()
.getDropCommand(flavor, JSPTagProposalFactory.getInstance());
- boolean promptAttributes = "yes" //$NON-NLS-1$
- .equals(VpePreference.ALWAYS_REQUEST_FOR_ATTRIBUTE.getValue());
+ boolean promptAttributes =
JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+ IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT);
dropCommand.getDefaultModel().setPromptForTagAttributesRequired(
promptAttributes);
-
- dropCommand.execute(new DropData(flavor, data, sourceEditor
+ DropData dropData = new DropData(flavor, data, sourceEditor
.getEditorInput(), (ISourceViewer) sourceEditor
.getAdapter(ISourceViewer.class), new VpeSelectionProvider(
- range.x, range.y), container));
+ range.x, range.y), container);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4982
+ * Setting the value provider to create tag insert dialog.
+ */
+ if (sourceEditor instanceof JSPTextEditor) {
+ dropData.setValueProvider(((JSPTextEditor)
sourceEditor).createAttributeDescriptorValueProvider());
+ }
+
+ dropCommand.execute(dropData);
}
private String getTagName(XModelObject object) {