projection

5 files changed, 94 insertions, 34 deletions

diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java
index 234cb02c9e7..ecf3178b7f6 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java
@@ -1,14 +1,28 @@
+/**********************************************************************

+Copyright (c) 2000, 2002 IBM Corp. and others.

+All rights reserved. This program and the accompanying materials

+are made available under the terms of the Common Public License v1.0

+which accompanies this distribution, and is available at

+http://www.eclipse.org/legal/cpl-v10.html

+

+Contributors:

+    IBM Corporation - Initial implementation

+**********************************************************************/

+

 package org.eclipse.ui.examples.javaeditor;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

-import org.eclipse.jface.action.*;

-import org.eclipse.ui.*;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.Separator;

+

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbenchActionConstants;

 import org.eclipse.ui.editors.text.TextEditorActionContributor;

-import org.eclipse.ui.texteditor.*;

+import org.eclipse.ui.texteditor.ITextEditor;

+import org.eclipse.ui.texteditor.RetargetTextEditorAction;

+import org.eclipse.ui.texteditor.TextEditorAction;

 

 /**

  * Contributes interesting Java actions to the desktop's Edit menu and the toolbar.

diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentProvider.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentProvider.java
index a78662ffcc4..22ab20735d4 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentProvider.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentProvider.java
@@ -1,14 +1,23 @@
+/**********************************************************************

+Copyright (c) 2000, 2002 IBM Corp. and others.

+All rights reserved. This program and the accompanying materials

+are made available under the terms of the Common Public License v1.0

+which accompanies this distribution, and is available at

+http://www.eclipse.org/legal/cpl-v10.html

+

+Contributors:

+    IBM Corporation - Initial implementation

+**********************************************************************/

+

 package org.eclipse.ui.examples.javaeditor;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.CoreException;

+

 import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.text.IDocumentPartitioner;

 import org.eclipse.jface.text.rules.DefaultPartitioner;

+

 import org.eclipse.ui.editors.text.FileDocumentProvider;

 import org.eclipse.ui.examples.javaeditor.java.JavaPartitionScanner;

 

diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
index c097bcd8085..00b0cf7dc30 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
@@ -1,16 +1,25 @@
+/**********************************************************************

+Copyright (c) 2000, 2002 IBM Corp. and others.

+All rights reserved. This program and the accompanying materials

+are made available under the terms of the Common Public License v1.0

+which accompanies this distribution, and is available at

+http://www.eclipse.org/legal/cpl-v10.html

+

+Contributors:

+    IBM Corporation - Initial implementation

+**********************************************************************/

+

 package org.eclipse.ui.examples.javaeditor;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

+

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.text.source.ISourceViewer;

+

 import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.editors.text.TextEditor;

+import org.eclipse.ui.editors.text.ProjectionTextEditor;

 import org.eclipse.ui.texteditor.DefaultRangeIndicator;

 import org.eclipse.ui.texteditor.TextOperationAction;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

@@ -18,7 +27,7 @@ import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 /**

  * Java specific text editor.

  */

-public class JavaEditor extends TextEditor {

+public class JavaEditor extends ProjectionTextEditor {

 

 	/** The outline page */

 	private JavaContentOutlinePage fOutlinePage;

diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java
index 5d770501fb5..4b65f87ae33 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java
@@ -1,19 +1,40 @@
+/**********************************************************************

+Copyright (c) 2000, 2002 IBM Corp. and others.

+All rights reserved. This program and the accompanying materials

+are made available under the terms of the Common Public License v1.0

+which accompanies this distribution, and is available at

+http://www.eclipse.org/legal/cpl-v10.html

+

+Contributors:

+    IBM Corporation - Initial implementation

+**********************************************************************/

+

 package org.eclipse.ui.examples.javaeditor;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

-import org.eclipse.jface.text.*;

+import org.eclipse.swt.graphics.RGB;

+

+import org.eclipse.jface.text.DefaultAutoIndentStrategy;

+import org.eclipse.jface.text.IAutoIndentStrategy;

+import org.eclipse.jface.text.IDocument;

+import org.eclipse.jface.text.ITextDoubleClickStrategy;

+import org.eclipse.jface.text.ITextHover;

+import org.eclipse.jface.text.TextAttribute;

 import org.eclipse.jface.text.contentassist.ContentAssistant;

 import org.eclipse.jface.text.contentassist.IContentAssistant;

 import org.eclipse.jface.text.presentation.IPresentationReconciler;

 import org.eclipse.jface.text.presentation.PresentationReconciler;

-import org.eclipse.jface.text.rules.*;

-import org.eclipse.jface.text.source.*;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.ui.examples.javaeditor.java.*;

+import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;

+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;

+import org.eclipse.jface.text.rules.Token;

+import org.eclipse.jface.text.source.IAnnotationHover;

+import org.eclipse.jface.text.source.ISourceViewer;

+import org.eclipse.jface.text.source.SourceViewerConfiguration;

+

+import org.eclipse.ui.examples.javaeditor.java.JavaAutoIndentStrategy;

+import org.eclipse.ui.examples.javaeditor.java.JavaCompletionProcessor;

+import org.eclipse.ui.examples.javaeditor.java.JavaDoubleClickSelector;

+import org.eclipse.ui.examples.javaeditor.java.JavaPartitionScanner;

 import org.eclipse.ui.examples.javaeditor.javadoc.JavaDocCompletionProcessor;

 import org.eclipse.ui.examples.javaeditor.util.JavaColorProvider;

 

@@ -71,8 +92,8 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration {
 

 		assistant.enableAutoActivation(true);

 		assistant.setAutoActivationDelay(500);

-		assistant.setProposalPopupOrientation(assistant.PROPOSAL_OVERLAY);

-		assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE);

+		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);

+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);

 		assistant.setContextInformationPopupBackground(JavaEditorEnvironment.getJavaColorProvider().getColor(new RGB(150, 150, 0)));

 

 		return assistant;

@@ -111,11 +132,11 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration {
 		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);

 		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);

 		

-		dr= new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.JAVADOC_DEFAULT))));

+		dr= new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(JavaColorProvider.JAVADOC_DEFAULT))));

 		reconciler.setDamager(dr, JavaPartitionScanner.JAVA_DOC);

 		reconciler.setRepairer(dr, JavaPartitionScanner.JAVA_DOC);

 

-		dr= new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.MULTI_LINE_COMMENT))));

+		dr= new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(JavaColorProvider.MULTI_LINE_COMMENT))));

 		reconciler.setDamager(dr, JavaPartitionScanner.JAVA_MULTILINE_COMMENT);

 		reconciler.setRepairer(dr, JavaPartitionScanner.JAVA_MULTILINE_COMMENT);

 

diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java
index 9f9e6b003b4..cc1ad334625 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java
@@ -1,9 +1,16 @@
+/**********************************************************************

+Copyright (c) 2000, 2002 IBM Corp. and others.

+All rights reserved. This program and the accompanying materials

+are made available under the terms of the Common Public License v1.0

+which accompanies this distribution, and is available at

+http://www.eclipse.org/legal/cpl-v10.html

+

+Contributors:

+    IBM Corporation - Initial implementation

+**********************************************************************/

+

 package org.eclipse.ui.examples.javaeditor;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import org.eclipse.ui.texteditor.ITextEditor;

 import org.eclipse.ui.texteditor.TextEditorAction;