Author: mareshkau Date: 2011-02-21 08:32:13 -0500 (Mon, 21 Feb 2011) New Revision: 29254 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java Log: https://issues.jboss.org/browse/JBIDE-7003, code refactoring Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-02-20 22:06:46 UTC (rev 29253) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-02-21 13:32:13 UTC (rev 29254) @@ -80,10 +80,10 @@ "EXTERNALIZE_STRINGS_DIALOG_NEW_FILE_PAGE"; //$NON-NLS-1$ private ITextEditor editor = null; - BundleMap bm = null; - ExternalizeStringsWizardPage page1 = null; - WizardNewFileCreationPage page2 = null; - ExternalizeStringsWizardRegisterBundlePage page3 = null; + private BundleMap bm = null; + private ExternalizeStringsWizardPage page1 = null; + private WizardNewFileCreationPage page2 = null; + private ExternalizeStringsWizardRegisterBundlePage page3 = null; public ExternalizeStringsWizard(ITextEditor editor, BundleMap bm) { super(); @@ -301,47 +301,8 @@ Object selectedElement = structuredSelection.getFirstElement(); if (selectedElement instanceof Node) { Node node = (Node) selectedElement; - List<TaglibData> taglibs = null; + registerMessageTaglib(); String jsfCoreTaglibPrefix = "f"; //$NON-NLS-1$ - boolean isJsfCoreTaglibRegistered = false; - if (editor instanceof JSPMultiPageEditor) { - StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor(); - if (ed instanceof JSPTextEditor) { - IVisualContext context = ((JSPTextEditor) ed).getPageContext(); - if (context instanceof SourceEditorPageContext) { - SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context; - taglibs = sourcePageContext.getTagLibs(); - if (null == taglibs) { - JspEditorPlugin.getDefault().logError( - JstUIMessages.CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT); - } else { - for (TaglibData tl : taglibs) { - if (DropURI.JSF_CORE_URI.equalsIgnoreCase(tl.getUri())) { - isJsfCoreTaglibRegistered = true; - jsfCoreTaglibPrefix = tl.getPrefix(); - break; - } - } - if (!isJsfCoreTaglibRegistered) { - /* - * Register the required taglib - */ - PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter(); - Properties p = new Properties(); - p.put("selectionProvider", getSelectionProvider()); //$NON-NLS-1$ - p.setProperty(URIConstants.LIBRARY_URI, DropURI.JSF_CORE_URI); - p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$ - p.setProperty(URIConstants.DEFAULT_PREFIX, jsfCoreTaglibPrefix); - p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$ - p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, "yes"); //$NON-NLS-1$ - p.setProperty(PaletteInsertHelper.PROPOPERTY_START_TEXT, - "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\\n"); //$NON-NLS-1$ - PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p); - } - } - } - } - } Element loadBundle = node.getOwnerDocument().createElement( jsfCoreTaglibPrefix + Constants.COLON + "loadBundle"); //$NON-NLS-1$ loadBundle.setAttribute("var", var); //$NON-NLS-1$ @@ -377,6 +338,53 @@ page1.replaceText(replacement); return true; } + /** + * Register Message Taglibs on page + */ + protected void registerMessageTaglib(){ + List<TaglibData> taglibs = null; + String jsfCoreTaglibPrefix = "f"; //$NON-NLS-1$ + if (editor instanceof JSPMultiPageEditor) { + StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor(); + if (ed instanceof JSPTextEditor) { + IVisualContext context = ((JSPTextEditor) ed).getPageContext(); + if (context instanceof SourceEditorPageContext) { + SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context; + taglibs = sourcePageContext.getTagLibs(); + if (null == taglibs) { + JspEditorPlugin.getDefault().logError( + JstUIMessages.CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT); + } else { + boolean isJsfCoreTaglibRegistered = false; + for (TaglibData tl : taglibs) { + if (DropURI.JSF_CORE_URI.equalsIgnoreCase(tl.getUri())) { + isJsfCoreTaglibRegistered = true; + jsfCoreTaglibPrefix = tl.getPrefix(); + break; + } + } + if (!isJsfCoreTaglibRegistered) { + /* + * Register the required taglib + */ + PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter(); + Properties p = new Properties(); + p.put("selectionProvider", getSelectionProvider()); //$NON-NLS-1$ + p.setProperty(URIConstants.LIBRARY_URI, DropURI.JSF_CORE_URI); + p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$ + p.setProperty(URIConstants.DEFAULT_PREFIX, jsfCoreTaglibPrefix); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$ + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, "yes"); //$NON-NLS-1$ + p.setProperty(PaletteInsertHelper.PROPOPERTY_START_TEXT, + "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\\n"); //$NON-NLS-1$ + PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p); + } + } + } + } + } + + } /** * Creates new bundle map if no one was specified