Attachment 14230 Details for Bug 72167 – patch for o.e.ant.test.ui

[patch] patch for o.e.ant.test.ui

ant.tests.ui.txt (text/plain), 4.40 KB, created by Kevin Barnes

on 2004-08-27 16:46:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Barnes

Created: 2004-08-27 16:46:30 EDT

Size: 4.40 KB

patch

obsolete

>Index: plugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ant.tests.ui/plugin.xml,v
>retrieving revision 1.21
>diff -u -r1.21 plugin.xml
>--- plugin.xml	27 Aug 2004 17:25:18 -0000	1.21
>+++ plugin.xml	27 Aug 2004 20:42:09 -0000
>@@ -25,6 +25,7 @@
>       <import plugin="org.eclipse.ant.ui"/>
>       <import plugin="org.eclipse.core.runtime"/>
>       <import plugin="org.eclipse.test.performance"/>
>+      <import plugin="org.eclipse.ui.console"/>
>    </requires>
>  
> <runtime>
>Index: test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java,v
>retrieving revision 1.13
>diff -u -r1.13 AbstractAntUITest.java
>--- test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java	27 Aug 2004 17:33:34 -0000	1.13
>+++ test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java	27 Aug 2004 20:42:10 -0000
>@@ -27,7 +27,6 @@
> 
> import org.eclipse.ant.internal.ui.editor.outline.AntModel;
> import org.eclipse.ant.internal.ui.editor.outline.XMLCore;
>-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
> import org.eclipse.ant.internal.ui.model.AntUIPlugin;
> import org.eclipse.ant.tests.ui.editor.support.TestLocationProvider;
> import org.eclipse.ant.tests.ui.editor.support.TestProblemRequestor;
>@@ -42,11 +41,6 @@
> import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
> import org.eclipse.debug.core.ILaunchManager;
> import org.eclipse.debug.core.model.IProcess;
>-import org.eclipse.debug.internal.ui.DebugUIPlugin;
>-import org.eclipse.debug.internal.ui.views.console.ConsoleDocumentPartitioner;
>-import org.eclipse.debug.internal.ui.views.console.HyperlinkPosition;
>-import org.eclipse.debug.internal.ui.views.console.StreamPartition;
>-import org.eclipse.debug.ui.console.IConsoleColorProvider;
> import org.eclipse.debug.ui.console.IConsoleHyperlink;
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.JavaCore;
>@@ -54,10 +48,13 @@
> import org.eclipse.jface.text.BadPositionCategoryException;
> import org.eclipse.jface.text.Document;
> import org.eclipse.jface.text.IDocument;
>+import org.eclipse.jface.text.IDocumentPartitioner;
> import org.eclipse.jface.text.ITypedRegion;
> import org.eclipse.jface.text.Position;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
>+import org.eclipse.ui.internal.console.IOConsoleHyperlinkPosition;
>+import org.eclipse.ui.internal.console.IOConsolePartition;
> import org.xml.sax.InputSource;
> import org.xml.sax.SAXException;
> import org.xml.sax.helpers.DefaultHandler;
>@@ -315,7 +312,7 @@
> 		if (offset >= 0 && doc != null) {
> 			Position[] positions = null;
> 			try {
>-				positions = doc.getPositions(HyperlinkPosition.HYPER_LINK_CATEGORY);
>+				positions = doc.getPositions(IOConsoleHyperlinkPosition.HYPER_LINK_CATEGORY);
> 			} catch (BadPositionCategoryException ex) {
> 				// no links have been added
> 				return null;
>@@ -323,7 +320,7 @@
> 			for (int i = 0; i < positions.length; i++) {
> 				Position position = positions[i];
> 				if (offset >= position.getOffset() && offset <= (position.getOffset() + position.getLength())) {
>-					return ((HyperlinkPosition)position).getHyperLink();
>+					return (IConsoleHyperlink)((IOConsoleHyperlinkPosition)position).getHyperLink();
> 				}
> 			}
> 		}
>@@ -332,14 +329,13 @@
> 	
> 	protected Color getColorAtOffset(int offset, IDocument document) throws BadLocationException {
> 		if (document != null) {
>-			ConsoleDocumentPartitioner partitioner = (ConsoleDocumentPartitioner)document.getDocumentPartitioner();
>+			IDocumentPartitioner partitioner = document.getDocumentPartitioner();
> 			if (partitioner != null) {
>-				IConsoleColorProvider colorProvider = DebugUIPlugin.getDefault().getConsoleDocumentManager().getColorProvider(IAntLaunchConfigurationConstants.ID_ANT_PROCESS_TYPE);
> 				ITypedRegion[] regions= partitioner.computePartitioning(offset, document.getLineInformationOfOffset(offset).getLength());
> 				
> 				for (int i = 0; i < regions.length; i++) {
>-					StreamPartition partition = (StreamPartition)regions[i];
>-					return colorProvider.getColor(partition.getStreamIdentifier());
>+					IOConsolePartition partition = (IOConsolePartition)regions[i];
>+					return partition.getColor();
> 				}	
> 			}
> 		}

Actions: View | Diff

Attachments on bug 72167: 14230