Author: scabanovich Date: 2009-09-25 08:38:29 -0400 (Fri, 25 Sep 2009) New Revision: 17730 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/FileDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/FileDropCommand.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/FileDropCommand.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/FileDropCommand.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -54,12 +54,12 @@ properties.put(PaletteInsertHelper.PROPOPERTY_START_TEXT, generateStartText()); properties.put(PaletteInsertHelper.PROPOPERTY_END_TEXT, generateEndText()); properties.put(PaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, getReformatBodyProperty()); - properties.put(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI, uri); + properties.put(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI, uri); String version = ((TagProposal)getDefaultModel().getTagProposal()).getLibraryVersion(); - properties.put(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_VERSION, version); - properties.put(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX,getDefaultModel().getTagProposal().getPrefix()); + properties.put(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_VERSION, version); + properties.put(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX,getDefaultModel().getTagProposal().getPrefix()); properties.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER, getDefaultModel().getDropData().getSelectionProvider()); - properties.put(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$ + properties.put(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$ addCustomProperties(properties); JSPPaletteInsertHelper.getInstance().insertIntoEditor( getDefaultModel().getDropData().getSourceViewer(), Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -6,8 +6,14 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; public class JSPPaletteInsertHelper extends PaletteInsertHelper { + public static final String PROPOPERTY_ADD_TAGLIB = TLDToPaletteHelper.ADD_TAGLIB; + public static final String PROPOPERTY_TAGLIBRARY_URI = URIConstants.LIBRARY_URI; + public static final String PROPOPERTY_TAGLIBRARY_VERSION = URIConstants.LIBRARY_VERSION; + public static final String PROPOPERTY_DEFAULT_PREFIX = URIConstants.DEFAULT_PREFIX; static JSPPaletteInsertHelper instance = new JSPPaletteInsertHelper(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -39,9 +39,9 @@ import org.jboss.tools.common.model.ui.views.palette.PaletteInsertManager; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.tld.IWebProject; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; /** * @@ -68,9 +68,9 @@ newLine = properties.getProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE); if (newLine == null) newLine="true"; //$NON-NLS-1$ runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE, newLine); - String addTaglib = properties.getProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB); + String addTaglib = properties.getProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB); if(addTaglib == null) addTaglib = "true"; //$NON-NLS-1$ - runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib); + runningProperties.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib); } public void execute() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -54,12 +54,12 @@ } private boolean checkProperties(Properties p) { - return "true".equalsIgnoreCase(p.getProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB)) && //$NON-NLS-1$ - p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI) != null && - p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).length() > 0 && - !p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).equals(JSP_URI) && - p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX) != null && - p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX).length() > 0 && + return "true".equalsIgnoreCase(p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB)) && //$NON-NLS-1$ + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI) != null && + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).length() > 0 && + !p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).equals(JSP_URI) && + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX) != null && + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX).length() > 0 && p.getProperty(PaletteInsertHelper.PROPOPERTY_START_TEXT) != null; } @@ -81,8 +81,8 @@ if(tl == null) tl = JSPPaletteInsertHelper.getPrefixes(d.get()); Element root = xmlDocument.getDocumentElement(); - String uri_p = p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI); - String defaultPrefix_p = p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX); + String uri_p = p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI); + String defaultPrefix_p = p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX); String lineDelimiter = PaletteInsertHelper.getLineDelimiter(d); StringBuffer tg = new StringBuffer(TAGLIB_START).append(" uri=\"").append(uri_p).append("\"").append(" prefix=\"").append(defaultPrefix_p).append("\"%>").append(lineDelimiter); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ @@ -90,7 +90,7 @@ //If taglib already exist check the prefix if changed if (tl.containsKey(uri_p)) { if (!tl.get(uri_p).equals(defaultPrefix_p)) { - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String)tl.get(uri_p)); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String)tl.get(uri_p)); } } else if(!tl.containsValue(defaultPrefix_p)) { if (checkplace(xmlDocument, d, "jsp:directive.taglib", tg, p, v) == false) { //$NON-NLS-1$ @@ -143,7 +143,7 @@ } private static boolean checkSelectedElement(HashMap<String,String> map, ISourceViewer v, Properties p){ - String taglibUri = p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI); + String taglibUri = p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI); if(taglibUri == null) return false; Node selectedNode = getSelectedNode(v, p); @@ -246,8 +246,8 @@ * with text formatting */ private static Properties checkTL(Element root, ISourceViewer v, Properties p, IDocument d) { - String uri_p = p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI); - String defaultPrefix_p = p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX); + String uri_p = p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI); + String defaultPrefix_p = p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX); HashMap<String,String> map = new HashMap<String,String>(); NamedNodeMap attrs = root.getAttributes(); @@ -262,7 +262,7 @@ if (map.containsKey(uri_p) || checkSelectedElement(map, v, p)) { if (!map.get(uri_p).equals(defaultPrefix_p)) { - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String) map.get(uri_p)); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String) map.get(uri_p)); } } else if(!map.containsValue(defaultPrefix_p)) { StringBuffer attribute = new StringBuffer("xmlns:").append(defaultPrefix_p).append("=\"").append(uri_p).append("\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$