Removed trailing whitespace and organized the importsv20080909-ascu

5 files changed, 53 insertions, 51 deletions

diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java
index a484c9b254e..62efc825156 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/ChainedPreferenceStoreTest.java
@@ -36,7 +36,7 @@ public class ChainedPreferenceStoreTest extends TestCase {
 
 	private List fEvents= new ArrayList();
 	private PropertyChangeListener fPropertyChangeListener= new PropertyChangeListener();
-	
+
 	private static final String PROPERTY= "some.property";
 	private static final String VALUE= "8";
 	private static final String DEFAULT_VALUE= "4";
@@ -45,7 +45,7 @@ public class ChainedPreferenceStoreTest extends TestCase {
 	public static Test suite() {
 		return new TestSuite(ChainedPreferenceStoreTest.class);
 	}
-	
+
 	/**
 	 * [implementation] ChainedPreferenceStore
 	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=69419
@@ -55,11 +55,11 @@ public class ChainedPreferenceStoreTest extends TestCase {
 		IPreferenceStore store2= new PreferenceStore();
 		IPreferenceStore chainedStore= new ChainedPreferenceStore(new IPreferenceStore[] { store1, store2 });
 		store2.setDefault(PROPERTY, DEFAULT_VALUE);
-		
+
 		chainedStore.addPropertyChangeListener(fPropertyChangeListener);
 		store1.firePropertyChangeEvent(PROPERTY, VALUE, DEFAULT_DEFAULT_VALUE); // simulated removal with newValue != null
 		chainedStore.removePropertyChangeListener(fPropertyChangeListener);
-		
+
 		assertEquals(1, fEvents.size());
 		PropertyChangeEvent event= (PropertyChangeEvent) fEvents.get(0);
 		assertEquals(chainedStore, event.getSource());
@@ -67,7 +67,7 @@ public class ChainedPreferenceStoreTest extends TestCase {
 		assertEquals(VALUE, event.getOldValue());
 		assertEquals(DEFAULT_VALUE, event.getNewValue());
 	}
-	
+
 	/**
 	 * Assertion failed in ChainedPreferenceStore.handlePropertyChangeEvent(..)
 	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=52827
@@ -76,11 +76,11 @@ public class ChainedPreferenceStoreTest extends TestCase {
 		IPreferenceStore store1= new PreferenceStore();
 		IPreferenceStore store2= new PreferenceStore();
 		IPreferenceStore chainedStore= new ChainedPreferenceStore(new IPreferenceStore[] { store1, store2 });
-		
+
 		chainedStore.addPropertyChangeListener(fPropertyChangeListener);
 		store1.firePropertyChangeEvent(PROPERTY, VALUE, DEFAULT_DEFAULT_VALUE); // simulated removal with newValue != null
 		chainedStore.removePropertyChangeListener(fPropertyChangeListener);
-		
+
 		assertEquals(1, fEvents.size());
 		PropertyChangeEvent event= (PropertyChangeEvent) fEvents.get(0);
 		assertEquals(store1, event.getSource());
@@ -97,11 +97,11 @@ public class ChainedPreferenceStoreTest extends TestCase {
 		IPreferenceStore store2= new PreferenceStore();
 		IPreferenceStore chainedStore= new ChainedPreferenceStore(new IPreferenceStore[] { store1, store2 });
 		store1.setValue(PROPERTY, VALUE);
-		
+
 		chainedStore.addPropertyChangeListener(fPropertyChangeListener);
 		store1.firePropertyChangeEvent(PROPERTY, DEFAULT_VALUE, null); // simulated change with newValue == null
 		chainedStore.removePropertyChangeListener(fPropertyChangeListener);
-		
+
 		assertEquals(1, fEvents.size());
 		PropertyChangeEvent event= (PropertyChangeEvent) fEvents.get(0);
 		assertEquals(store1, event.getSource());
@@ -118,11 +118,11 @@ public class ChainedPreferenceStoreTest extends TestCase {
 		IPreferenceStore store2= new PreferenceStore();
 		IPreferenceStore chainedStore= new ChainedPreferenceStore(new IPreferenceStore[] { store1, store2 });
 		store2.setDefault(PROPERTY, DEFAULT_VALUE);
-		
+
 		chainedStore.addPropertyChangeListener(fPropertyChangeListener);
 		store1.firePropertyChangeEvent(PROPERTY, null, null); // simulated removal with oldValue == null
 		chainedStore.removePropertyChangeListener(fPropertyChangeListener);
-		
+
 		assertEquals(1, fEvents.size());
 		PropertyChangeEvent event= (PropertyChangeEvent) fEvents.get(0);
 		assertEquals(chainedStore, event.getSource());
@@ -130,7 +130,7 @@ public class ChainedPreferenceStoreTest extends TestCase {
 		assertEquals(null, event.getOldValue());
 		assertEquals(DEFAULT_VALUE, event.getNewValue());
 	}
-	
+
 //	/**
 //	 * Case where the old value cannot be determined. (Not handled by the current implementation.)
 //	 */
@@ -139,11 +139,11 @@ public class ChainedPreferenceStoreTest extends TestCase {
 //		IPreferenceStore store2= new PreferenceStore();
 //		IPreferenceStore chainedStore= new ChainedPreferenceStore(new IPreferenceStore[] { store1, store2 });
 //		store2.setDefault(PROPERTY, DEFAULT_VALUE);
-//		
+//
 //		chainedStore.addPropertyChangeListener(fPropertyChangeListener);
 //		store1.setValue(PROPERTY, VALUE);
 //		chainedStore.removePropertyChangeListener(fPropertyChangeListener);
-//		
+//
 //		assertEquals(1, fEvents.size());
 //		PropertyChangeEvent event= (PropertyChangeEvent) fEvents.get(0);
 //		assertEquals(PROPERTY, event.getProperty());
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java
index 9aeed58a696..f0c3b73046c 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java
@@ -15,7 +15,7 @@ import junit.framework.TestSuite;
 
 /**
  * Test Suite for org.eclipse.ui.editors.
- * 
+ *
  * @since 3.0
  */
 public class EditorsTestSuite extends TestSuite {
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java
index 33a534676b9..70d13ddf986 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EncodingChangeTests.java
@@ -48,29 +48,29 @@ import org.eclipse.ui.editors.text.TextEditor;
 
 /**
  * Tests changing of encoding via IFile and via encoding support.
- * 
+ *
  * @since 3.1
  */
 public class EncodingChangeTests extends TestCase {
-	
+
 	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3";
-	
+
 	public static Test suite() {
 		return new TestSuite(EncodingChangeTests.class);
 	}
-	
+
 	public static void closeEditor(IEditorPart editor) {
 		IWorkbenchPartSite site;
 		IWorkbenchPage page;
 		if (editor != null && (site= editor.getSite()) != null && (page= site.getPage()) != null)
 			page.closeEditor(editor, false);
 	}
-	
-	
+
+
 	private IFile fFile;
 	private IEditorPart fEditor;
 	private int fCount;
-	
+
 	private String getOriginalContent() {
 		return ORIGINAL_CONTENT;
 	}
@@ -84,7 +84,7 @@ public class EncodingChangeTests extends TestCase {
 		fFile.setCharset(null, null);
 		fCount++;
 	}
-	
+
 	/*
 	 * @see junit.framework.TestCase#tearDown()
 	 */
@@ -94,7 +94,7 @@ public class EncodingChangeTests extends TestCase {
 		fFile= null;
 		ResourceHelper.deleteProject("EncodingChangeTestProject");
 	}
-	
+
 	public void testChangeEncodingViaFile() {
 		IWorkbench workbench= PlatformUI.getWorkbench();
 		IWorkbenchPage page= workbench.getActiveWorkbenchWindow().getActivePage();
@@ -114,14 +114,14 @@ public class EncodingChangeTests extends TestCase {
 				assertNull(composite);
 				DefaultEncodingSupport encodingSupport= (DefaultEncodingSupport)editor.getAdapter(IEncodingSupport.class);
 				assertEquals("US-ASCII", encodingSupport.getEncoding());
-				
+
 			} else
 				fail();
 		} catch (PartInitException e) {
 			fail();
 		}
 	}
-	
+
 	public void testChangeEncodingViaEncodingSupport() {
 		IWorkbench workbench= PlatformUI.getWorkbench();
 		IWorkbenchPage page= workbench.getActiveWorkbenchWindow().getActivePage();
@@ -151,7 +151,7 @@ public class EncodingChangeTests extends TestCase {
 			fail();
 		}
 	}
-	
+
 	public void testAInvalidEncoding() {
 		IWorkbench workbench= PlatformUI.getWorkbench();
 		IWorkbenchPage page= workbench.getActiveWorkbenchWindow().getActivePage();
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
index fe4b08c0148..832fa54cb3d 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/GotoLineTest.java
@@ -35,25 +35,26 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
+
 import org.eclipse.ui.texteditor.GotoLineAction;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 
 /**
  * Tests the GotoLineAction.
- * 
+ *
  * @since 3.1
  */
 public class GotoLineTest extends TestCase {
-	
-	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3"; 
-	
+
+	private static final String ORIGINAL_CONTENT= "line1\nline2\nline3";
+
 	public static Test suite() {
 		return new TestSuite(GotoLineTest.class);
 	}
-	
+
 	private IFile fFile;
-	
+
 	private String getOriginalContent() {
 		return ORIGINAL_CONTENT;
 	}
@@ -65,7 +66,7 @@ public class GotoLineTest extends TestCase {
 		IFolder folder= ResourceHelper.createFolder("GoToLineTestProject/goToLineTests/");
 		fFile= ResourceHelper.createFile(folder, "file.txt", getOriginalContent());
 	}
-	
+
 	/*
 	 * @see junit.framework.TestCase#tearDown()
 	 */
@@ -73,27 +74,27 @@ public class GotoLineTest extends TestCase {
 		ResourceHelper.deleteProject("GoToLineTestProject");
 		fFile= null;
 	}
-	
+
 	public void testGoToFirstLine() {
 		goToLine(0, 0);
 	}
-	
+
 	public void testGoToLastLine() {
 		goToLine(2, 2);
 	}
-	
+
 	public void testGoToInvalidLine() {
 		goToLine(1, 1);
 		goToLine(-1, 1);
 		goToLine(3, 1);
 	}
-	
+
 	private void goToLine(int line, int expectedResult) {
 		IWorkbench workbench= PlatformUI.getWorkbench();
 		IWorkbenchPage page= workbench.getActiveWorkbenchWindow().getActivePage();
 		try {
 			IEditorPart part= IDE.openEditor(page, fFile);
-			
+
 			if (part instanceof ITextEditor) {
 				ITextEditor editor= (ITextEditor) part;
 				IAction action= editor.getAction(ITextEditorActionConstants.GOTO_LINE);
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java
index 6fa7e992fca..aaddbf1866e 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/SegmentedModeTest.java
@@ -30,19 +30,20 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
+
 import org.eclipse.ui.texteditor.ITextEditor;
 
 
 public class SegmentedModeTest extends TestCase {
-	
-	private static final String ORIGINAL_CONTENT= "this\nis\nthe\ncontent\nof\nthe\nfile"; 
-	
+
+	private static final String ORIGINAL_CONTENT= "this\nis\nthe\ncontent\nof\nthe\nfile";
+
 	public static Test suite() {
 		return new TestSuite(SegmentedModeTest.class);
 	}
-	
+
 	private IFile fFile;
-	
+
 	private String getOriginalContent() {
 		return ORIGINAL_CONTENT;
 	}
@@ -54,14 +55,14 @@ public class SegmentedModeTest extends TestCase {
 		IFolder folder= ResourceHelper.createFolder("project/folderA/folderB/");
 		fFile= ResourceHelper.createFile(folder, "file.txt", getOriginalContent());
 	}
-	
+
 	/*
 	 * @see junit.framework.TestCase#tearDown()
 	 */
 	protected void tearDown() throws Exception {
 		ResourceHelper.deleteProject("project");
 	}
-	
+
 	/*
 	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=70934
 	 */
@@ -70,20 +71,20 @@ public class SegmentedModeTest extends TestCase {
 		IWorkbenchPage page= workbench.getActiveWorkbenchWindow().getActivePage();
 		try {
 			IEditorPart part= IDE.openEditor(page, fFile);
-			
+
 			try {
 				if (part instanceof ITextEditor) {
 					ITextEditor editor= (ITextEditor) part;
-					
+
 					editor.showHighlightRangeOnly(true);
 					editor.setHighlightRange(5, 0, true);
-					
+
 					Control control= (Control) part.getAdapter(Control.class);
 					if (control instanceof StyledText) {
 						StyledText styledText= (StyledText) control;
 						int caret= styledText.getCaretOffset();
 						styledText.replaceTextRange(caret, 0, "really ");
-						
+
 						StringBuffer buffer= new StringBuffer(getOriginalContent());
 						buffer.insert(5, "really ");
 						IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput());
@@ -93,7 +94,7 @@ public class SegmentedModeTest extends TestCase {
 			} finally {
 				page.saveEditor(part, false);
 			}
-			
+
 		} catch (PartInitException e) {
 			assertTrue(false);
 		}