| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/CompletionProposalCategory.java
|
| ===================================================================
|
| --- editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/CompletionProposalCategory.java (revision 7347)
|
| +++ editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/CompletionProposalCategory.java (working copy)
|
| @@ -1,16 +1,14 @@
|
| /*
|
| - * Copyright (c) 2011, the Dart project authors.
|
| - *
|
| - * Licensed under the Eclipse Public License v1.0 (the "License"); you may not
|
| - * use this file except in compliance with the License. You may obtain a copy of
|
| - * the License at
|
| - *
|
| + * Copyright (c) 2012, the Dart project authors.
|
| + *
|
| + * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
|
| + * in compliance with the License. You may obtain a copy of the License at
|
| + *
|
| * http://www.eclipse.org/legal/epl-v10.html
|
| - *
|
| - * Unless required by applicable law or agreed to in writing, software
|
| - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
| - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
| - * License for the specific language governing permissions and limitations under
|
| + *
|
| + * Unless required by applicable law or agreed to in writing, software distributed under the License
|
| + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
|
| + * or implied. See the License for the specific language governing permissions and limitations under
|
| * the License.
|
| */
|
| package com.google.dart.tools.ui.internal.text.dart;
|
| @@ -30,6 +28,8 @@
|
| import org.eclipse.core.runtime.SubProgressMonitor;
|
| import org.eclipse.jface.action.LegacyActionTools;
|
| import org.eclipse.jface.resource.ImageDescriptor;
|
| +import org.eclipse.jface.text.contentassist.ICompletionProposal;
|
| +import org.eclipse.jface.text.contentassist.IContextInformation;
|
| import org.osgi.framework.Bundle;
|
|
|
| import java.net.URL;
|
| @@ -108,10 +108,10 @@
|
| * @return the list of computed completion proposals (element type:
|
| * {@link org.eclipse.jface.text.contentassist.ICompletionProposal})
|
| */
|
| - public List computeCompletionProposals(ContentAssistInvocationContext context, String partition,
|
| - SubProgressMonitor monitor) {
|
| + public List<ICompletionProposal> computeCompletionProposals(
|
| + ContentAssistInvocationContext context, String partition, SubProgressMonitor monitor) {
|
| fLastError = null;
|
| - List result = new ArrayList();
|
| + List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
|
| List descriptors = new ArrayList(fRegistry.getProposalComputerDescriptors(partition));
|
| for (Iterator it = descriptors.iterator(); it.hasNext();) {
|
| CompletionProposalComputerDescriptor desc = (CompletionProposalComputerDescriptor) it.next();
|
| @@ -137,10 +137,10 @@
|
| * @return the list of computed context information objects (element type:
|
| * {@link org.eclipse.jface.text.contentassist.IContextInformation})
|
| */
|
| - public List computeContextInformation(ContentAssistInvocationContext context, String partition,
|
| - SubProgressMonitor monitor) {
|
| + public List<IContextInformation> computeContextInformation(
|
| + ContentAssistInvocationContext context, String partition, SubProgressMonitor monitor) {
|
| fLastError = null;
|
| - List result = new ArrayList();
|
| + List<IContextInformation> result = new ArrayList<IContextInformation>();
|
| List descriptors = new ArrayList(fRegistry.getProposalComputerDescriptors(partition));
|
| for (Iterator it = descriptors.iterator(); it.hasNext();) {
|
| CompletionProposalComputerDescriptor desc = (CompletionProposalComputerDescriptor) it.next();
|
|
|