Author: scabanovich Date: 2009-09-21 08:31:32 -0400 (Mon, 21 Sep 2009) New Revision: 17677 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/menu/MenuCreationHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. 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-09-21 12:30:56 UTC (rev 17676) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-09-21 12:31:32 UTC (rev 17677) @@ -90,6 +90,7 @@ import org.jboss.tools.common.resref.core.ResourceReferenceListListener; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; +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.VpePreference; import org.jboss.tools.jst.web.tld.TLDUtil; @@ -2233,7 +2234,7 @@ String defaultPrefix = (parent == null) ? "" : parent.getAttributeValue(URIConstants.DEFAULT_PREFIX); //$NON-NLS-1$ String[] texts = new String[] { "<" + tagname + ">" }; //$NON-NLS-1$ //$NON-NLS-2$ - PaletteInsertHelper.applyPrefix(texts, sourceEditor, tagname, uri, + JSPPaletteInsertHelper.applyPrefix(texts, sourceEditor, tagname, uri, defaultPrefix); tagname = texts[0].substring(1, texts[0].length() - 1); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-09-21 12:30:56 UTC (rev 17676) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-09-21 12:31:32 UTC (rev 17677) @@ -32,6 +32,7 @@ import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; import org.jboss.tools.common.model.util.ModelFeatureFactory; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; @@ -509,7 +510,7 @@ String tagName = item.getAttributeValue("name"); //$NON-NLS-1$ String[] texts = new String[] { "<" + tagName + ">" }; //$NON-NLS-1$ //$NON-NLS-2$ if (tagName.indexOf("taglib") < 0) { //$NON-NLS-1$ - PaletteInsertHelper.applyPrefix(texts, sourceEditor, tagName, uri, defaultPrefix); + JSPPaletteInsertHelper.applyPrefix(texts, sourceEditor, tagName, uri, defaultPrefix); } tagName = texts[0];