5:32 a.m.
Author: scabanovich
Date: 2009-09-18 06:32:52 -0400 (Fri, 18 Sep 2009)
New Revision: 17657
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4913
Direct reference to palette adopt from jst.web removed.
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2009-09-18
10:25:02 UTC (rev 17656)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2009-09-18
10:32:52 UTC (rev 17657)
@@ -10,12 +10,21 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.attribute.adapter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.ListIterator;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.search.IJavaSearchConstants;
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.IContentProposal;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalProvider;
+import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposal;
+import org.eclipse.pde.internal.ui.editor.contentassist.TypePackageCompletionProcessor;
+import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider;
@@ -56,3 +65,174 @@
}
}
+
+
+
+class TypeContentProposalProvider extends TypePackageCompletionProcessor implements
IContentProposalProvider {
+ public static final char F_DOT = '.';
+ private IProject fProject;
+ private int fTypeScope;
+ private ArrayList fInitialContentProposals;
+ private String fInitialContent;
+ private Comparator fComparator;
+
+ /**
+ *
+ */
+ public TypeContentProposalProvider(IProject project, int scope) {
+ fProject = project;
+ fTypeScope = scope;
+ fComparator = new TypeComparator();
+
+ reset();
+ }
+
+ /**
+ * TypeComparator
+ *
+ */
+ private static class TypeComparator implements Comparator {
+ /**
+ *
+ */
+ public TypeComparator() {
+ // NO-OP
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ */
+ public int compare(Object arg0, Object arg1) {
+ String proposalSortKey1 = ((IContentProposal) arg0).getLabel();
+ String proposalSortKey2 = ((IContentProposal) arg1).getLabel();
+ return proposalSortKey1.compareToIgnoreCase(proposalSortKey2);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see
org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String,
int)
+ */
+ public IContentProposal[] getProposals(String contents, int position) {
+ // Generate a list of proposals based on the current contents
+ ArrayList currentContentProposals = null;
+ // Determine method to obtain proposals based on current field contents
+ if (position == 0) {
+ // If the document offset is at the 0 position (i.e. no input entered),
+ // do not perform content assist. The operation is too expensive
+ // because all classes and interfaces (depending on the specified scope)
+ // will need to be resolved as proposals
+ currentContentProposals = null;
+ } else if ((fInitialContentProposals == null) ||
(!contents.startsWith(fInitialContent)) || (endsWithDot(contents))) {
+ // Generate new proposals if the content assist session was just
+ // started
+ // Or generate new proposals if the current contents of the field
+ // is less than the initial contents of the field used to
+ // generate the original proposals; thus, widening the search
+ // scope. This can occur when the user types backspace
+ // Or generate new proposals if the current contents ends with a
+ // dot
+ currentContentProposals = generateContentProposals(contents.substring(0, position));
+ } else {
+ // Filter existing proposals from a prevous search; thus, narrowing
+ // the search scope. This can occur when the user types additional
+ // characters in the field causing new characters to be appended to
+ // the initial field contents
+ currentContentProposals = filterContentProposals(contents);
+ }
+
+ return convertResultsToSortedProposals(currentContentProposals);
+ }
+
+ /**
+ *
+ */
+ public void reset() {
+ fInitialContentProposals = null;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.eclipse.pde.internal.ui.editor.contentassist.TypePackageCompletionProcessor#addProposalToCollection(java.util.Collection,
int, int, java.lang.String, java.lang.String, org.eclipse.swt.graphics.Image)
+ */
+ protected void addProposalToCollection(Collection collection, int startOffset, int
length, String label, String content, Image image) {
+ // Create content proposals for field assist
+ // start offset and length not required
+ IContentProposal proposal = new TypeContentProposal(label, content, null, image);
+ // Add the proposal to the list of proposals
+ collection.add(proposal);
+ }
+
+ /**
+ * @param string
+ * @return
+ */
+ private boolean endsWithDot(String string) {
+ int index = string.lastIndexOf(F_DOT);
+ if ((index + 1) == string.length()) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @param currentContent
+ * @return
+ */
+ private ArrayList generateContentProposals(String currentContent) {
+ fInitialContentProposals = new ArrayList();
+ // Store the initial field contents to determine if we need to
+ // widen the scope later
+ fInitialContent = currentContent;
+ generateTypePackageProposals(currentContent, fProject, fInitialContentProposals, 0,
fTypeScope, true);
+ return fInitialContentProposals;
+ }
+
+ /**
+ * @param list
+ * @return
+ */
+ private IContentProposal[] convertResultsToSortedProposals(ArrayList list) {
+ IContentProposal[] proposals = null;
+ if ((list != null) && (list.size() != 0)) {
+ // Convert the results array list into an array of completion
+ // proposals
+ proposals = (IContentProposal[]) list.toArray(new IContentProposal[list.size()]);
+ // Sort the proposals alphabetically
+ Arrays.sort(proposals, fComparator);
+ } else {
+ proposals = new IContentProposal[0];
+ }
+ return proposals;
+ }
+
+ /**
+ * @param currentContent
+ * @return
+ */
+ private ArrayList filterContentProposals(String currentContent) {
+ String lowerCaseCurrentContent = currentContent.toLowerCase();
+ ListIterator iterator = fInitialContentProposals.listIterator();
+ // Maintain a list of filtered search results
+ ArrayList filteredContentProposals = new ArrayList();
+ // Iterate over the initial search results
+ while (iterator.hasNext()) {
+ Object object = iterator.next();
+ IContentProposal proposal = (IContentProposal) object;
+ String compareString = null;
+ if (lowerCaseCurrentContent.indexOf(F_DOT) == -1) {
+ // Use only the type name
+ compareString = proposal.getLabel().toLowerCase();
+ } else {
+ // Use the fully qualified type name
+ compareString = proposal.getContent().toLowerCase();
+ }
+ // Filter out any proposal not matching the current contents
+ // except for the edge case where the proposal is identical to the
+ // current contents
+ if (compareString.startsWith(lowerCaseCurrentContent, 0)) {
+ filteredContentProposals.add(proposal);
+ }
+ }
+ return filteredContentProposals;
+ }
+
+}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java 2009-09-18
10:25:02 UTC (rev 17656)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java 2009-09-18
10:32:52 UTC (rev 17657)
@@ -14,14 +14,11 @@
import org.jboss.tools.common.model.ui.IValueChangeListener;
import org.jboss.tools.common.model.ui.IValueProvider;
import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter;
-import org.eclipse.jdt.core.*;
-import
org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionProcessor;
import org.eclipse.swt.widgets.*;
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.util.XModelObjectUtil;
-import org.jboss.tools.common.model.ui.templates.ControlContentAssistHelper;
public class JavaHyperlinkCellEditor extends DialogCellEditorEx
implements JavaHyperlinkCueLabelProvider.JavaClassHolder {
@@ -73,15 +70,6 @@
// setChangeButtonText(JFaceResources.getString("openBrowse"));
}
- IPackageFragmentRoot root = (project == null) ? null :
JavaAdapter.getInstance().getPackageFragmentRoot(project);
- if (root != null) {
- JavaTypeCompletionProcessor contentAssistentProcessor = new
JavaTypeCompletionProcessor(false, false);
- IPackageFragment currentPackage = root.getPackageFragment("");
//$NON-NLS-1$
- contentAssistentProcessor.setPackageFragment(currentPackage);
- Text text = getTextField();
- text.setData("JavaHyperlinkLineFieldEditor", this); //$NON-NLS-1$
- ControlContentAssistHelper.createTextContentAssistant(getTextField(),
contentAssistentProcessor, JavaHyperlinkCueLabelProvider.INSTANCE);
- }
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2009-09-18
10:25:02 UTC (rev 17656)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java 2009-09-18
10:32:52 UTC (rev 17657)
@@ -17,6 +17,7 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.*;
+import org.jboss.tools.common.model.options.impl.PaletteAdopt;
import org.jboss.tools.common.model.ui.navigator.TreeViewerDragDropProvider;
import org.jboss.tools.common.meta.XAdoptManager;
@@ -31,12 +32,9 @@
static XAdoptManager paletteAdopt;
static {
- try {
- if(Platform.getBundle("org.jboss.tools.jst.web") != null) { //$NON-NLS-1$
- paletteAdopt =
(XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt");
//$NON-NLS-1$
- }
- } catch (ClassCastException e) {
- ModelUIPlugin.getPluginLog().logError(e);
+ XAdoptManager[] ms = new PaletteAdopt().getManagers();
+ if(ms != null && ms.length > 0) {
+ paletteAdopt = ms[0];
}
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropData.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropData.java 2009-09-18
10:25:02 UTC (rev 17656)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropData.java 2009-09-18
10:32:52 UTC (rev 17657)
@@ -20,7 +20,6 @@
import org.w3c.dom.Node;
import
org.jboss.tools.common.model.ui.editors.dnd.DropUtils.AttributeDescriptorValueProvider;
-import org.jboss.tools.jst.web.tld.VpeTaglibManager;
public class DropData {