Removed trailing whitespace and organized the importsv20080909-ascu

15 files changed, 68 insertions, 43 deletions

diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java
index e230b9f96..611b39815 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.editors;
 
+import org.eclipse.swt.custom.StyleRange;
+
+import org.eclipse.core.runtime.Assert;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocument;
@@ -20,9 +24,6 @@ import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.TextPresentation;
 import org.eclipse.jface.text.presentation.IPresentationDamager;
 import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.swt.custom.StyleRange;
-
-import org.eclipse.core.runtime.Assert;
 
 public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
 
@@ -30,10 +31,10 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese
 	protected IDocument fDocument;
 	/** The default text attribute if non is returned as data by the current token */
 	protected TextAttribute fDefaultTextAttribute;
-	
+
 	/**
 	 * Creates a new damager/repairer.
-	 * 
+	 *
 	 * @param defaultTextAttribute the default text attribute for all detected regions
 	 */
 	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
@@ -52,7 +53,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese
 	 * Returns the end offset of the line that contains the specified offset or
 	 * if the offset is inside a line delimiter, the end offset of the next
 	 * line.
-	 * 
+	 *
 	 * @param offset the offset whose line end offset must be computed
 	 * @return the line end offset for the given offset
 	 * @exception BadLocationException if offset is invalid in the current document
@@ -108,7 +109,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese
 
 	/**
 	 * Adds style information to the given text presentation.
-	 * 
+	 *
 	 * @param presentation the text presentation to be extended
 	 * @param offset the offset of the range to be styled
 	 * @param length the length of the range to be styled
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java
index a99f94751..71d37dabb 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java
@@ -10,7 +10,9 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.editors;
 
-import org.eclipse.jface.text.rules.*;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
 
 public class TagRule extends MultiLineRule {
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java
index 21f442a3a..3dd22ce26 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java
@@ -35,12 +35,12 @@ public class TemplateEditor extends AbstractDecoratedTextEditor {
 		setSourceViewerConfiguration(new XMLConfiguration(colorManager));
 		setDocumentProvider(new XMLDocumentProvider());
 	}
-	
+
 	public void dispose() {
 		colorManager.dispose();
 		super.dispose();
 	}
-	
+
 	protected void createActions() {
 		super.createActions();
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java
index 4c57bad00..bfc93fe66 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditorUI.java
@@ -23,33 +23,34 @@ import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.text.templates.ContextTypeRegistry;
 import org.eclipse.jface.text.templates.persistence.TemplateStore;
 
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
 import org.eclipse.ui.examples.javaeditor.JavaEditorExamplePlugin;
 import org.eclipse.ui.examples.templateeditor.template.XMLContextType;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
+import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
+import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
+
 /**
  * The main plugin class to be used in the desktop.
  */
 public class TemplateEditorUI  {
 	/** Key to store custom templates. */
 	private static final String CUSTOM_TEMPLATES_KEY= "org.eclipse.ui.examples.templateeditor.customtemplates"; //$NON-NLS-1$
-	
+
 	/** The shared instance. */
 	private static TemplateEditorUI fInstance;
-	
+
 	/** The template store. */
 	private TemplateStore fStore;
 	/** The context type registry. */
 	private ContributionContextTypeRegistry fRegistry;
-	
+
 	private TemplateEditorUI() {
 	}
 
 	/**
 	 * Returns the shared instance.
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static TemplateEditorUI getDefault() {
@@ -60,7 +61,7 @@ public class TemplateEditorUI  {
 
 	/**
 	 * Returns this plug-in's template store.
-	 * 
+	 *
 	 * @return the template store of this plug-in instance
 	 */
 	public TemplateStore getTemplateStore() {
@@ -77,7 +78,7 @@ public class TemplateEditorUI  {
 
 	/**
 	 * Returns this plug-in's context type registry.
-	 * 
+	 *
 	 * @return the context type registry for this plug-in instance
 	 */
 	public ContextTypeRegistry getContextTypeRegistry() {
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateMessages.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateMessages.java
index 8518478f4..ddec60614 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateMessages.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateMessages.java
@@ -29,7 +29,7 @@ class TemplateMessages {
 			return '!' + key + '!';
 		}
 	}
-	
+
 	public static String getFormattedString(String key, Object arg) {
 		return MessageFormat.format(getString(key), new Object[] { arg });
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java
index caffd1fea..7412ae6e3 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java
@@ -22,9 +22,10 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.rules.Token;
 import org.eclipse.jface.text.source.ISourceViewer;
 
-import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
 import org.eclipse.ui.examples.templateeditor.template.XMLCompletionProcessor;
 
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+
 public class XMLConfiguration extends TextSourceViewerConfiguration {
 
 	private XMLDoubleClickStrategy doubleClickStrategy;
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java
index d82549485..7da5d25bf 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java
@@ -11,9 +11,11 @@
 package org.eclipse.ui.examples.templateeditor.editors;
 
 import org.eclipse.core.runtime.CoreException;
+
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.rules.FastPartitioner;
+
 import org.eclipse.ui.editors.text.FileDocumentProvider;
 
 public class XMLDocumentProvider extends FileDocumentProvider {
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java
index 181718c42..df908f157 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java
@@ -10,7 +10,10 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.editors;
 
-import org.eclipse.jface.text.*;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.ITextViewer;
 
 public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
 	protected ITextViewer fText;
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLPartitionScanner.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLPartitionScanner.java
index 40a7cbb17..bad178ff7 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLPartitionScanner.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLPartitionScanner.java
@@ -10,7 +10,11 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.editors;
 
-import org.eclipse.jface.text.rules.*;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.Token;
 
 public class XMLPartitionScanner extends RuleBasedPartitionScanner {
 	public final static String XML_DEFAULT = "__xml_default"; //$NON-NLS-1$
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLScanner.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLScanner.java
index 66e861af2..c2cf7f5f6 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLScanner.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLScanner.java
@@ -10,8 +10,13 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.editors;
 
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.*;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
 
 public class XMLScanner extends RuleBasedScanner {
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLTagScanner.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLTagScanner.java
index 904171e3c..d5216b1e4 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLTagScanner.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLTagScanner.java
@@ -10,8 +10,13 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.editors;
 
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
 
 public class XMLTagScanner extends RuleBasedScanner {
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java
index 868c77dce..2f81df98f 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java
@@ -12,13 +12,14 @@ package org.eclipse.ui.examples.templateeditor.preferences;
 
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.examples.templateeditor.editors.TemplateEditorUI;
+
 import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
 
 /**
  * @see org.eclipse.jface.preference.PreferencePage
  */
 public class TemplatesPreferencePage extends TemplatePreferencePage implements IWorkbenchPreferencePage {
-	
+
 	public TemplatesPreferencePage() {
 		setPreferenceStore(TemplateEditorUI.getDefault().getPreferenceStore());
 		setTemplateStore(TemplateEditorUI.getDefault().getTemplateStore());
@@ -28,13 +29,13 @@ public class TemplatesPreferencePage extends TemplatePreferencePage implements I
 	protected boolean isShowFormatterSetting() {
 		return false;
 	}
-	
-	
+
+
 	public boolean performOk() {
 		boolean ok= super.performOk();
-		
+
 		TemplateEditorUI.getDefault().savePluginPreferences();
-		
+
 		return ok;
 	}
 }
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java
index f625d56e5..7213a81bc 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.text.templates.TemplateContext;
 import org.eclipse.jface.text.templates.TemplateVariableResolver;
 
 /**
- * Looks up existing ant variables and proposes them. The proposals are sorted by 
+ * Looks up existing ant variables and proposes them. The proposals are sorted by
  * their prefix-likeness with the variable type.
  */
 public class AntVariableResolver extends TemplateVariableResolver {
@@ -26,7 +26,7 @@ public class AntVariableResolver extends TemplateVariableResolver {
 	 */
 	protected String[] resolveAll(TemplateContext context) {
 		String[] proposals= new String[] { "${srcDir}", "${dstDir}" }; //$NON-NLS-1$ //$NON-NLS-2$
-		
+
 		Arrays.sort(proposals, new Comparator() {
 
 			public int compare(Object o1, Object o2) {
@@ -44,7 +44,7 @@ public class AntVariableResolver extends TemplateVariableResolver {
 				return i;
 			}
 		});
-		
+
 		return proposals;
 	}
 }
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
index b3d9d47d9..bc7de458f 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
@@ -19,9 +19,9 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
+import org.eclipse.jface.text.templates.TemplateContextType;
 
 import org.eclipse.ui.examples.templateeditor.editors.TemplateEditorUI;
 
@@ -35,7 +35,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	/**
 	 * We watch for angular brackets since those are often part of XML
 	 * templates.
-	 * 
+	 *
 	 * @param viewer the viewer
 	 * @param offset the offset left of which the prefix is detected
 	 * @return the detected prefix
@@ -45,7 +45,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 		int i= offset;
 		if (i > document.getLength())
 			return ""; //$NON-NLS-1$
-		
+
 		try {
 			while (i > 0) {
 				char ch= document.getChar(i - 1);
@@ -62,7 +62,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	/**
 	 * Cut out angular brackets for relevance sorting, since the template name
 	 * does not contain the brackets.
-	 * 
+	 *
 	 * @param template the template
 	 * @param prefix the prefix
 	 * @return the relevance of the <code>template</code> for the given <code>prefix</code>
@@ -77,7 +77,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 
 	/**
 	 * Simply return all templates.
-	 * 
+	 *
 	 * @param contextTypeId the context type, ignored in this implementation
 	 * @return all templates
 	 */
@@ -87,7 +87,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 
 	/**
 	 * Return the XML context type that is supported by this plug-in.
-	 * 
+	 *
 	 * @param viewer the viewer, ignored in this implementation
 	 * @param region the region, ignored in this implementation
 	 * @return the supported XML context type
@@ -98,7 +98,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 
 	/**
 	 * Always return the default image.
-	 * 
+	 *
 	 * @param template the template, ignored in this implementation
 	 * @return the default template image
 	 */
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java
index fdef5ec4e..6e19e8e54 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.template;
 
-import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.GlobalTemplateVariables;
+import org.eclipse.jface.text.templates.TemplateContextType;
 
 
 /**
@@ -23,7 +23,7 @@ public class XMLContextType extends TemplateContextType {
 	public static final String XML_CONTEXT_TYPE= "org.eclipse.ui.examples.templateeditor.xml"; //$NON-NLS-1$
 
 	/**
-	 * Creates a new XML context type. 
+	 * Creates a new XML context type.
 	 */
 	public XMLContextType() {
 		addGlobalResolvers();