Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[eclipse-incubator-e4-dev] Demo in RC1

I just pulled down the ui-e4Set.psf in RC1, and had 3 compile errors
in E4JavaSourceViewerConfiguration.java in
org.eclipse.e4.contentmodel.jdt

Should I just update the file in the incubator, or was
CommentFormattingStrategy there for a reason?

-- 
Paul Webster
Hi floor. Make me a sammich! - GIR
### Eclipse Workspace Patch 1.0
#P org.eclipse.e4.contentmodel.jdt
Index: src/org/eclipse/e4/contentmodel/jdt/text/E4JavaSourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/eclipse/e4-incubator/ui/org.eclipse.e4.contentmodel.jdt/src/org/eclipse/e4/contentmodel/jdt/text/E4JavaSourceViewerConfiguration.java,v
retrieving revision 1.1
diff -u -r1.1 E4JavaSourceViewerConfiguration.java
--- src/org/eclipse/e4/contentmodel/jdt/text/E4JavaSourceViewerConfiguration.java	11 Mar 2008 21:12:56 -0000	1.1
+++ src/org/eclipse/e4/contentmodel/jdt/text/E4JavaSourceViewerConfiguration.java	18 May 2008 17:25:08 -0000
@@ -31,7 +31,6 @@
 import org.eclipse.jdt.internal.ui.text.JavaOutlineInformationControl;
 import org.eclipse.jdt.internal.ui.text.JavaPresentationReconciler;
 import org.eclipse.jdt.internal.ui.text.JavaReconciler;
-import org.eclipse.jdt.internal.ui.text.comment.CommentFormattingStrategy;
 import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionAssistant;
 import org.eclipse.jdt.internal.ui.text.java.ContentAssistProcessor;
 import org.eclipse.jdt.internal.ui.text.java.JavaAutoIndentStrategy;
@@ -232,8 +231,8 @@
 	 */
 	public boolean affectsTextPresentation(PropertyChangeEvent event) {
 		return fCodeScanner.affectsBehavior(event) || fMultilineCommentScanner.affectsBehavior(event)
-				|| fSinglelineCommentScanner.affectsBehavior(event) || fStringScanner.affectsBehavior(event)
-				|| fJavaDocScanner.affectsBehavior(event);
+		|| fSinglelineCommentScanner.affectsBehavior(event) || fStringScanner.affectsBehavior(event)
+		|| fJavaDocScanner.affectsBehavior(event);
 	}
 
 	/*
@@ -384,9 +383,6 @@
 				IDocument.DEFAULT_CONTENT_TYPE);
 
 		formatter.setMasterStrategy(new JavaFormattingStrategy());
-		formatter.setSlaveStrategy(new CommentFormattingStrategy(), IJavaPartitions.JAVA_DOC);
-		formatter.setSlaveStrategy(new CommentFormattingStrategy(), IJavaPartitions.JAVA_SINGLE_LINE_COMMENT);
-		formatter.setSlaveStrategy(new CommentFormattingStrategy(), IJavaPartitions.JAVA_MULTI_LINE_COMMENT);
 
 		return formatter;
 	}

Back to the top