[jbosstools-commits] JBoss Tools SVN: r17252 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
Author: akazakov
Date: 2009-08-25 10:51:16 -0400 (Tue, 25 Aug 2009)
New Revision: 17252
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
Log:
Fixed compiler errors.
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-08-25
13:55:42 UTC (rev 17251)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-08-25
14:51:16 UTC (rev 17252)
@@ -326,7 +326,6 @@
kbQuery.setOffset(offset);
kbQuery.setValue(query);
kbQuery.setStringQuery(query);
- kbQuery.setText(text);
return kbQuery;
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-08-25
13:55:42 UTC (rev 17251)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-08-25
14:51:16 UTC (rev 17252)
@@ -482,6 +482,10 @@
int replacementLength = contentAssistRequest.getReplacementLength();
int cursorPosition = getCursorPositionForProposedText(replacementString);
Image image = textProposal.getImage();
+ if (image == null) {
+ image =
XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
+ }
+
String displayString = textProposal.getLabel() == null ?
replacementString :
textProposal.getLabel();
@@ -517,7 +521,6 @@
String stringQuery = matchString;
KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery);
- kbQuery.setText(contentAssistRequest.getText());
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery,
getContext());
for (int i = 0; proposals != null && i < proposals.length; i++) {