JBoss Tools SVN: r5938 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-01-24 09:42:15 -0500 (Thu, 24 Jan 2008)
New Revision: 5938
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1624
roll back
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 14:36:25 UTC (rev 5937)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 14:42:15 UTC (rev 5938)
@@ -49,7 +49,6 @@
}
HibernateResultCollector rc = new HibernateResultCollector(javaProject);
- rc.setFilterPackage(packageName);
rc.acceptContext(new CompletionContext());
//rc.reset(offset, javaProject, null);
rc.setAccepts(settings);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 2008-01-24 14:36:25 UTC (rev 5937)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 2008-01-24 14:42:15 UTC (rev 5938)
@@ -24,7 +24,6 @@
import org.eclipse.jdt.core.CompletionProposal;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.ui.text.java.CompletionProposalCollector;
/**
@@ -216,25 +215,4 @@
public void accept(CompletionProposal proposal) {
super.accept(proposal);
}
-
- protected String filterPackage = null;
-
- public void setFilterPackage(String filterPackage) {
- this.filterPackage = filterPackage;
- }
-
- protected char[] getProposalPackage(CompletionProposal proposal) {
- //return proposal.getPackageName();
- return proposal.getDeclarationSignature();
- }
-
- protected boolean isFiltered(CompletionProposal proposal) {
- boolean res = super.isFiltered(proposal);
- if (!res && null != filterPackage) {
- if (!CharOperation.equals(getProposalPackage(proposal), filterPackage.toCharArray())) {
- res = true;
- }
- }
- return res;
- }
}
18 years, 2 months
JBoss Tools SVN: r5937 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-01-24 09:36:25 -0500 (Thu, 24 Jan 2008)
New Revision: 5937
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
Log:
http://jira.jboss.com/jira/browse/JBIDE-1679
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2008-01-24 14:26:54 UTC (rev 5936)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2008-01-24 14:36:25 UTC (rev 5937)
@@ -155,7 +155,15 @@
FacesConfig12_Properties.WindowTitle=Properties
FacesConfig12_Properties.Title=Faces Config 1.2
+JSFValidators12_AddValidator.WindowTitle=Add Validator
+JSFValidators12_AddValidator.Title=Validator
+JSFValidator12_CreateAttribute.WindowTitle=Add Attribute
+JSFValidator12_CreateAttribute.Title=Attribute
+
+JSFValidator12_CreateProperty.WindowTitle=Add Property
+JSFValidator12_CreateProperty.Title=Property
+
JSFApplication=/jsf/noHelpYet.html
JSFApplication_AddMessageBundle=/jsf/noHelpYet.html
18 years, 2 months
JBoss Tools SVN: r5936 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-01-24 09:26:54 -0500 (Thu, 24 Jan 2008)
New Revision: 5936
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java
Log:
Changes are performed because of JSPTextEditor's getSVConfiguration() method is renamed to getSourceViewerConfiguratinForTest().
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-01-24 14:23:41 UTC (rev 5935)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-01-24 14:26:54 UTC (rev 5936)
@@ -108,7 +108,7 @@
JSPTextEditor jspTextEditor = jspEditor.getJspEditor();
StructuredTextViewer viewer = jspTextEditor.getTextViewer();
IDocument document = viewer.getDocument();
- IContentAssistant contentAssistant = jspTextEditor.getSVConfiguration().getContentAssistant(viewer);
+ IContentAssistant contentAssistant = jspTextEditor.getSourceViewerConfigurationForTest().getContentAssistant(viewer);
// Find start of <ui:define> tag
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-01-24 14:23:41 UTC (rev 5935)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-01-24 14:26:54 UTC (rev 5936)
@@ -105,7 +105,7 @@
JSPTextEditor jspTextEditor = jspEditor.getJspEditor();
StructuredTextViewer viewer = jspTextEditor.getTextViewer();
IDocument document = viewer.getDocument();
- IContentAssistant contentAssistant = jspTextEditor.getSVConfiguration().getContentAssistant(viewer);
+ IContentAssistant contentAssistant = jspTextEditor.getSourceViewerConfigurationForTest().getContentAssistant(viewer);
ICompletionProposal[] result= null;
String errorMessage = null;
18 years, 2 months
JBoss Tools SVN: r5935 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-01-24 09:23:41 -0500 (Thu, 24 Jan 2008)
New Revision: 5935
Modified:
trunk/jsf/docs/userguide/en/modules/palette.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-232 mistakes correction
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2008-01-24 14:18:52 UTC (rev 5934)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2008-01-24 14:23:41 UTC (rev 5935)
@@ -93,7 +93,7 @@
<para>It's very simple to do this. Open your JSP file and place the cursor in a place where you'd
like to add a tag and then click that tag in the palette.
- In <property>Insert Tag</property> window, that will appeared after that action, you can set the
+ In the <property>Insert Tag</property> window, that will appeared after that action, you can set the
<emphasis><property>value</property></emphasis> of general and advanced <emphasis><property>attributes</property></emphasis> of the tag that you chose.</para>
<figure>
18 years, 2 months
JBoss Tools SVN: r5934 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-01-24 09:18:52 -0500 (Thu, 24 Jan 2008)
New Revision: 5934
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta
Log:
JBIDE-1677
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta 2008-01-24 13:22:32 UTC (rev 5933)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta 2008-01-24 14:18:52 UTC (rev 5934)
@@ -768,7 +768,7 @@
</XActionItem>
<XActionItem HandlerClassName="%WizardInvoker%"
ICON="main.tld.taglib"
- PROPERTIES="plugin=org.jboss.tools.jst.web.ui;wizard=org.jboss.tools.jst.web.ui.wizard.newfile.NewTLDFileWizard"
+ PROPERTIES="plugin=org.jboss.tools.jst.web.ui;wizard=org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard"
displayName="Tag Library..." kind="action" name="CreateFileTLDV"/>
</XActionItem>
</XActionItem>
@@ -803,7 +803,7 @@
</XActionItem>
<XActionItem HandlerClassName="%WizardInvoker%"
ICON="main.tld.taglib"
- PROPERTIES="plugin=org.jboss.tools.jst.web.ui;wizard=org.jboss.tools.jst.web.ui.wizard.newfile.NewTLDFileWizard"
+ PROPERTIES="plugin=org.jboss.tools.jst.web.ui;wizard=org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard"
displayName="Tag Library..." kind="action" name="CreateFileTLDV"/>
</XActionItem>
</XActionItem>
18 years, 2 months
JBoss Tools SVN: r5933 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-01-24 08:22:32 -0500 (Thu, 24 Jan 2008)
New Revision: 5933
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1676 Seam completion seem to assume it is always used within XML documents
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-01-24 13:21:15 UTC (rev 5932)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-01-24 13:22:32 UTC (rev 5933)
@@ -43,6 +43,7 @@
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
@@ -427,7 +428,14 @@
* @throws BadLocationException
*/
private boolean checkStartPositionInEL(ITextViewer viewer, int offset) throws BadLocationException {
- IStructuredDocumentRegion sdRegion = ContentAssistUtils.getStructuredDocumentRegion(viewer, offset);
+
+ // JBIDE-1676: Do not even try to get IStructuredDocument in case of not-a-structured document
+ // This will prevent class cast exceptions while using the editors other than StructuredEditor
+ // (CompilationUnitEditor, for example).
+ IStructuredDocumentRegion sdRegion =
+ (viewer.getDocument() instanceof IStructuredDocument ?
+ ContentAssistUtils.getStructuredDocumentRegion(viewer, offset) :
+ null);
ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(offset));
int startIndex = (region == null ? 0 : sdRegion.getStartOffset() + region.getStart());
18 years, 2 months
JBoss Tools SVN: r5932 - trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/xpl.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-01-24 08:21:15 -0500 (Thu, 24 Jan 2008)
New Revision: 5932
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/xpl/BaseXMLContentAssistProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1624
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/xpl/BaseXMLContentAssistProcessor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/xpl/BaseXMLContentAssistProcessor.java 2008-01-24 13:18:07 UTC (rev 5931)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/xpl/BaseXMLContentAssistProcessor.java 2008-01-24 13:21:15 UTC (rev 5932)
@@ -12,6 +12,7 @@
*******************************************************************************/
package org.hibernate.eclipse.mapper.editors.xpl;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -57,7 +58,16 @@
if (nameRegion != null) {
String attributeName = open.getText(nameRegion);
- List attributeValueProposals = getAttributeValueProposals(attributeName, matchString, offset, contentAssistRequest);
+ List attributeValueProposals = new ArrayList();
+ if (0 == matchString.length()) {
+ for (char ch = 'a'; ch <= 'z'; ch++) {
+ String matchStrTmp = String.valueOf(ch);
+ attributeValueProposals.addAll(getAttributeValueProposals(attributeName, matchStrTmp, offset, contentAssistRequest));
+ }
+ }
+ else {
+ attributeValueProposals.addAll(getAttributeValueProposals(attributeName, matchString, offset, contentAssistRequest));
+ }
if(attributeValueProposals!=null) {
for (Iterator iter = attributeValueProposals.iterator(); iter.hasNext();) {
ICompletionProposal element = (ICompletionProposal) iter.next();
18 years, 2 months
JBoss Tools SVN: r5931 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-01-24 08:18:07 -0500 (Thu, 24 Jan 2008)
New Revision: 5931
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1624
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 13:14:47 UTC (rev 5930)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 13:18:07 UTC (rev 5931)
@@ -49,6 +49,7 @@
}
HibernateResultCollector rc = new HibernateResultCollector(javaProject);
+ rc.setFilterPackage(packageName);
rc.acceptContext(new CompletionContext());
//rc.reset(offset, javaProject, null);
rc.setAccepts(settings);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 2008-01-24 13:14:47 UTC (rev 5930)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 2008-01-24 13:18:07 UTC (rev 5931)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.core.CompletionProposal;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.ui.text.java.CompletionProposalCollector;
/**
@@ -215,4 +216,25 @@
public void accept(CompletionProposal proposal) {
super.accept(proposal);
}
+
+ protected String filterPackage = null;
+
+ public void setFilterPackage(String filterPackage) {
+ this.filterPackage = filterPackage;
+ }
+
+ protected char[] getProposalPackage(CompletionProposal proposal) {
+ //return proposal.getPackageName();
+ return proposal.getDeclarationSignature();
+ }
+
+ protected boolean isFiltered(CompletionProposal proposal) {
+ boolean res = super.isFiltered(proposal);
+ if (!res && null != filterPackage) {
+ if (!CharOperation.equals(getProposalPackage(proposal), filterPackage.toCharArray())) {
+ res = true;
+ }
+ }
+ return res;
+ }
}
18 years, 2 months
JBoss Tools SVN: r5930 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-01-24 08:14:47 -0500 (Thu, 24 Jan 2008)
New Revision: 5930
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1580
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-01-24 13:09:08 UTC (rev 5929)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-01-24 13:14:47 UTC (rev 5930)
@@ -406,7 +406,7 @@
nsIDOMElement sourceBox = createBox(visualDocument, creationData,
getChildren(sourceNode), "source");
sourceBox.setAttribute(HTML.ATTR_STYLE, "width:" + sourceListsWidth
- + ";height:" + listsHeight + ";" );
+ + ";height:" + listsHeight + ";");
sourceBoxTd.appendChild(sourceBox);
// create source buttons
@@ -425,7 +425,7 @@
nsIDOMElement targetBox = createBox(visualDocument, creationData,
getChildren(sourceNode), "target");
targetBox.setAttribute(HTML.ATTR_STYLE, "width:" + targetListsWidth
- + ";height:" + listsHeight + ";");
+ + ";height:" + listsHeight + ";");
targetBoxTd.appendChild(targetBox);
// create target buttons
@@ -547,7 +547,7 @@
box.setAttribute("cellspacing", "0");
box.setAttribute("cellpadding", "0");
box.setAttribute("width", "100%");
-// box.setAttribute("height", listsHeight);
+ // box.setAttribute("height", listsHeight);
nsIDOMElement header = createHeader(visualDocument, creationData,
children);
@@ -570,7 +570,7 @@
nsIDOMElement column = visualDocument
.createElement(HTML.TAG_TD);
-
+
tr.appendChild(column);
if (columnClasses.size() > 0) {
@@ -662,8 +662,9 @@
metaButton.setAttribute(HTML.ATTR_STYLE, ComponentUtil
.getBackgoundImgStyle(BUTTON_IMG_PATH));
- metaButton.setAttribute(HTML.ATTR_CLASS, "rich-shuttle-meta-button");
-
+ metaButton
+ .setAttribute(HTML.ATTR_CLASS, "rich-shuttle-meta-button");
+
// button represent "div" element
nsIDOMElement button = visualDocument.createElement(HTML.TAG_DIV);
@@ -910,8 +911,9 @@
nsIDOMElement headerCell = visualDocument
.createElement(HTML.TAG_TH);
- headerCell.setAttribute("background", ComponentUtil
- .getAbsoluteResourcePath(HEADER_IMG_PATH));
+ headerCell.setAttribute("background", "file:///"
+ + ComponentUtil
+ .getAbsoluteResourcePath(HEADER_IMG_PATH));
// get header classes
String headerClass = styleClasses.get("headerCell");
18 years, 2 months
JBoss Tools SVN: r5929 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-01-24 08:09:08 -0500 (Thu, 24 Jan 2008)
New Revision: 5929
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java
Log:
simpler fix for http://jira.jboss.com/jira/browse/JBIDE-1672
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 11:37:07 UTC (rev 5928)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 2008-01-24 13:09:08 UTC (rev 5929)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.eval.IEvaluationContext;
+import org.eclipse.jdt.internal.ui.text.java.AbstractJavaCompletionProposal;
import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal;
import org.eclipse.jdt.internal.ui.text.java.LazyJavaCompletionProposal;
import org.eclipse.jdt.ui.text.java.CompletionProposalComparator;
@@ -47,7 +48,6 @@
context.setPackageName(packageName);
}
-
HibernateResultCollector rc = new HibernateResultCollector(javaProject);
rc.acceptContext(new CompletionContext());
//rc.reset(offset, javaProject, null);
@@ -73,30 +73,24 @@
// we move the replacementoffset on every proposol to fit nicely
// into our non-java code
for (int i = 0; i < results.length; i++) {
- if(results[i] instanceof JavaCompletionProposal) {
- JavaCompletionProposal proposal = (JavaCompletionProposal) results[i]; // TODO: eclipse bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84998
- int wanted = proposal.getReplacementOffset() + (offset /*- start.length()*/);
- if(wanted==proposal.getReplacementOffset() ) {
- //System.out.println("NO TRANSPOSE!");
- }
- if(wanted<0) {
- wanted = 0;
- }
- proposal.setReplacementOffset(wanted);
- } else if (results[i] instanceof LazyJavaCompletionProposal) {
- LazyJavaCompletionProposal proposal = (LazyJavaCompletionProposal) results[i]; // TODO: eclipse bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84998
- int wanted = proposal.getReplacementOffset() + (offset /*- start.length()*/);
- if(wanted==proposal.getReplacementOffset() ) {
- //System.out.println("NO TRANSPOSE!");
- }
- if(wanted<0) {
- wanted = 0;
- }
- proposal.setReplacementOffset(proposal.getReplacementOffset() + (offset /*- start.length()*/) );
+ if(results[i] instanceof AbstractJavaCompletionProposal) {
+ AbstractJavaCompletionProposal proposal = (AbstractJavaCompletionProposal) results[i]; // TODO: eclipse bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84998
+ transpose(offset, proposal);
} else {
HibernateConsolePlugin.getDefault().log("ERROR: unknown CompletionProposal class.");
}
}
Arrays.sort(results, new CompletionProposalComparator() );
}
+
+ private static void transpose(int offset, AbstractJavaCompletionProposal proposal) {
+ int wanted = proposal.getReplacementOffset() + (offset /*- start.length()*/);
+ if(wanted==proposal.getReplacementOffset() ) {
+ //System.out.println("NO TRANSPOSE!");
+ }
+ if(wanted<0) {
+ wanted = 0;
+ }
+ proposal.setReplacementOffset(wanted);
+ }
}
18 years, 2 months