Author: vrubezhny Date: 2011-03-11 13:59:22 -0500 (Fri, 11 Mar 2011) New Revision: 29712 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/Messages.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/messages.properties Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java Log: JBIDE-8271 Help text for CDI filed conent assist proposal contains unnecessary text with weird symbols in header and doesn't contains any text in case of missing javadoc "No Javadoc could be found" text is added in case of javadoc is absent Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java 2011-03-11 18:41:16 UTC (rev 29711) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java 2011-03-11 18:59:22 UTC (rev 29712) @@ -82,7 +82,7 @@ if (elements[i] instanceof IMember || elements[i].getElementType() == IJavaElement.LOCAL_VARIABLE || elements[i].getElementType() == IJavaElement.TYPE_PARAMETER) { - buffer.append('�').append(' ').append(getInfoText(elements[i])); + buffer.append('�').append(' ').append(getInfoText(elements[i])); hasContents= true; } buffer.append("<br/>"); //$NON-NLS-1$ @@ -171,6 +171,10 @@ } catch (JavaModelException ex) { JavaPlugin.log(ex); } + + if (reader == null) { + reader = new StringReader(Messages.NO_JAVADOC); + } if (reader != null) { HTMLPrinter.addParagraph(buffer, reader); Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/Messages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/Messages.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/Messages.java 2011-03-11 18:59:22 UTC (rev 29712) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.jsp.contentassist; + +import org.eclipse.osgi.util.NLS; + +/** + * + * @author jeremy + * + */ +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.jboss.tools.jst.jsp.contentassist.messages";//$NON-NLS-1$ + + private Messages() { + // Do not instantiate + } + + static { + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + public static String NO_JAVADOC; +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/Messages.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/messages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/messages.properties (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/messages.properties 2011-03-11 18:59:22 UTC (rev 29712) @@ -0,0 +1 @@ +NO_JAVADOC=No Javadoc could be found<br> \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/messages.properties ___________________________________________________________________ Added: svn:mime-type + text/plain