[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[jdt-debug-dev] jdt-ui HEAD needs HEAD of jface.text
|
and jdt.debug.ui needs the attached patch to compile.
sorry for the inconvenience, tom
Index: ui/org/eclipse/jdt/internal/debug/ui/BreakpointConditionCompletionProcessor.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointConditionCompletionProcessor.java,v
retrieving revision 1.5
diff -u -r1.5 BreakpointConditionCompletionProcessor.java
--- ui/org/eclipse/jdt/internal/debug/ui/BreakpointConditionCompletionProcessor.java 4 Mar 2004 17:43:38 -0000 1.5
+++ ui/org/eclipse/jdt/internal/debug/ui/BreakpointConditionCompletionProcessor.java 30 Mar 2004 17:27:03 -0000
@@ -54,19 +54,15 @@
// Generate selections from the template engine
TemplateEngine templateEngine= getTemplateEngine();
if (templateEngine != null) {
- try {
- templateEngine.reset();
- templateEngine.complete(viewer, documentOffset, null);
- TemplateProposal[] templateResults= templateEngine.getResults();
+ templateEngine.reset();
+ templateEngine.complete(viewer, documentOffset, null);
+ TemplateProposal[] templateResults= templateEngine.getResults();
- // concatenate arrays
- IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];
- System.arraycopy(templateResults, 0, total, 0, templateResults.length);
- System.arraycopy(results, 0, total, templateResults.length, results.length);
- results= total;
- } catch (JavaModelException x) {
- JDIDebugUIPlugin.log(x);
- }
+ // concatenate arrays
+ IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];
+ System.arraycopy(templateResults, 0, total, 0, templateResults.length);
+ System.arraycopy(results, 0, total, templateResults.length, results.length);
+ results= total;
}
//Order here and not in result collector to make sure that the order
//applies to all proposals and not just those of the compilation unit.
Index: ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterCompletionProcessor.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterCompletionProcessor.java,v
retrieving revision 1.5
diff -u -r1.5 DetailFormatterCompletionProcessor.java
--- ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterCompletionProcessor.java 4 Mar 2004 17:43:38 -0000 1.5
+++ ui/org/eclipse/jdt/internal/debug/ui/DetailFormatterCompletionProcessor.java 30 Mar 2004 17:27:03 -0000
@@ -56,19 +56,15 @@
// Generate selections from the template engine
TemplateEngine templateEngine= getTemplateEngine();
if (templateEngine != null) {
- try {
- templateEngine.reset();
- templateEngine.complete(viewer, documentOffset, null);
- TemplateProposal[] templateResults= templateEngine.getResults();
+ templateEngine.reset();
+ templateEngine.complete(viewer, documentOffset, null);
+ TemplateProposal[] templateResults= templateEngine.getResults();
- // concatenate arrays
- IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];
- System.arraycopy(templateResults, 0, total, 0, templateResults.length);
- System.arraycopy(results, 0, total, templateResults.length, results.length);
- results= total;
- } catch (JavaModelException x) {
- JDIDebugUIPlugin.log(x);
- }
+ // concatenate arrays
+ IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];
+ System.arraycopy(templateResults, 0, total, 0, templateResults.length);
+ System.arraycopy(results, 0, total, templateResults.length, results.length);
+ results= total;
}
//Order here and not in result collector to make sure that the order
//applies to all proposals and not just those of the compilation unit.
Index: ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java,v
retrieving revision 1.26
diff -u -r1.26 DisplayCompletionProcessor.java
--- ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java 5 Mar 2004 16:12:32 -0000 1.26
+++ ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java 30 Mar 2004 17:27:03 -0000
@@ -66,7 +66,7 @@
public DisplayCompletionProcessor() {
fCollector= new ResultCollector();
- ContextType contextType= JavaPlugin.getTemplateContextRegistry().getContextType("java"); //$NON-NLS-1$
+ ContextType contextType= JavaPlugin.getDefault().getTemplateContextRegistry().getContextType("java"); //$NON-NLS-1$
if (contextType != null) {
fTemplateEngine= new TemplateEngine(contextType);
}
@@ -150,19 +150,15 @@
IJavaCompletionProposal[] results= fCollector.getResults();
if (fTemplateEngine != null) {
- try {
- fTemplateEngine.reset();
- fTemplateEngine.complete(viewer, documentOffset, null);
- TemplateProposal[] templateResults= fTemplateEngine.getResults();
+ fTemplateEngine.reset();
+ fTemplateEngine.complete(viewer, documentOffset, null);
+ TemplateProposal[] templateResults= fTemplateEngine.getResults();
- // concatenate arrays
- IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];
- System.arraycopy(templateResults, 0, total, 0, templateResults.length);
- System.arraycopy(results, 0, total, templateResults.length, results.length);
- results= total;
- } catch (JavaModelException x) {
- JDIDebugUIPlugin.log(x);
- }
+ // concatenate arrays
+ IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];
+ System.arraycopy(templateResults, 0, total, 0, templateResults.length);
+ System.arraycopy(results, 0, total, templateResults.length, results.length);
+ results= total;
}
//Order here and not in result collector to make sure that the order
//applies to all proposals and not just those of the compilation unit.
Index: ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java,v
retrieving revision 1.14
diff -u -r1.14 JavaSnippetCompletionProcessor.java
--- ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java 5 Mar 2004 16:12:32 -0000 1.14
+++ ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java 30 Mar 2004 17:27:03 -0000
@@ -47,7 +47,7 @@
public JavaSnippetCompletionProcessor(JavaSnippetEditor editor) {
fCollector= new ResultCollector();
fEditor= editor;
- ContextType contextType= JavaPlugin.getTemplateContextRegistry().getContextType("java"); //$NON-NLS-1$
+ ContextType contextType= JavaPlugin.getDefault().getTemplateContextRegistry().getContextType("java"); //$NON-NLS-1$
if (contextType != null) {
fTemplateEngine= new TemplateEngine(contextType);
}
@@ -102,14 +102,8 @@
IJavaCompletionProposal[] results= fCollector.getResults();
if (fTemplateEngine != null) {
- try {
- fTemplateEngine.reset();
- fTemplateEngine.complete(viewer, position, null);
- } catch (JavaModelException x) {
- JDIDebugUIPlugin.log(x);
- Shell shell= viewer.getTextWidget().getShell();
- ErrorDialog.openError(shell, SnippetMessages.getString("CompletionProcessor.errorTitle"), SnippetMessages.getString("CompletionProcessor.errorMessage"), x.getStatus()); //$NON-NLS-2$ //$NON-NLS-1$
- }
+ fTemplateEngine.reset();
+ fTemplateEngine.complete(viewer, position, null);
TemplateProposal[] templateResults= fTemplateEngine.getResults();
