Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2017-11-14 09:02:48 -0500
committerLars Vogel2017-11-21 11:38:51 -0500
commitb3b9006b1a0f94086ab1779ab14d8b5ae950b741 (patch)
treec6647b806a2eeb75650d38ed159afb56b085daa6
parent10309832835db0363c75027e116d47c7028459c3 (diff)
downloadeclipse.platform.text-b3b9006b1a0f94086ab1779ab14d8b5ae950b741.tar.gz
eclipse.platform.text-b3b9006b1a0f94086ab1779ab14d8b5ae950b741.tar.xz
eclipse.platform.text-b3b9006b1a0f94086ab1779ab14d8b5ae950b741.zip
Bug 527257 - Remove trailing whitespace from org.eclipse.jface.textI20171121-2000
Also activates the save actions to prevent that additional whitespace is created Change-Id: I57e56c08089601072116992032ab5199373a2e4c Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--org.eclipse.jface.text/.settings/org.eclipse.jdt.core.prefs20
-rw-r--r--org.eclipse.jface.text/.settings/org.eclipse.jdt.ui.prefs60
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java6
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java8
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java12
9 files changed, 96 insertions, 18 deletions
diff --git a/org.eclipse.jface.text/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jface.text/.settings/org.eclipse.jdt.core.prefs
index 88a5e89b7..c4aa28d97 100644
--- a/org.eclipse.jface.text/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jface.text/.settings/org.eclipse.jdt.core.prefs
@@ -133,6 +133,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -146,8 +147,11 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -157,6 +161,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -183,6 +189,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=false
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
@@ -215,6 +222,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -409,12 +417,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/org.eclipse.jface.text/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.jface.text/.settings/org.eclipse.jdt.ui.prefs
index b73bfac6f..27b19cc72 100644
--- a/org.eclipse.jface.text/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.jface.text/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,7 @@
eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_JDT UI Code Style Conventions
-formatter_settings_version=12
+formatter_settings_version=13
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
@@ -9,3 +10,60 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=false
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=false
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=false
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=false
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=false
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=false
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=false
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=false
+sp_cleanup.remove_unused_private_types=false
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
index 73dec0d26..fa52290e6 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
@@ -153,7 +153,7 @@ public class HTML2TextReader extends SubstitutionTextReader {
fCurrentStyleRange.strikeout= false;
}
}
-
+
private void finishAndReinitializeCurrentStyle(int offset) {
if (fTextPresentation != null && offset != fCurrentStyleRange.start && !isDefaultStyleRange(fCurrentStyleRange)) {
fCurrentStyleRange.length= offset - fCurrentStyleRange.start;
@@ -219,12 +219,12 @@ public class HTML2TextReader extends SubstitutionTextReader {
startItalic();
return EMPTY_STRING;
}
-
+
if ("/i".equals(html) || "/em".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
stopItalic();
return EMPTY_STRING;
}
-
+
if ("b".equals(html) || "strong".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
startBold();
return EMPTY_STRING;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java
index 46ab4afc0..8b5c1041a 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java
@@ -664,7 +664,7 @@ public final class RevisionPainter {
/**
* Sets the zoom level for the current painting operation. Workaround for bug 516293.
- *
+ *
* @param zoom the zoom to set
* @since 3.12
*/
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
index 317084573..3df975523 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
@@ -647,7 +647,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
setStatusLabelColors(fStatusLabel.getForeground(), background);
}
}
-
+
private void setStatusLabelColors(Color foreground, Color background) {
if (foreground == null || background == null) return;
if (fStatusLabelForeground != null) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java
index a9da8dd51..ad666cbc0 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java
@@ -46,7 +46,7 @@ public class MarginPainter implements IPainter, PaintListener {
/** The line width of the line to be painted, default value <code>1</code> */
private int fLineWidth= 0; // NOTE: 0 means width is 1 but with optimized performance
/** The cached x-offset of the <code>fMarginWidth</code> for the current font */
- private int fCachedWidgetX= -1;
+ private int fCachedWidgetX= -1;
private Font fFontForCachedWidgetX;
/** The active state of this painter */
private boolean fIsActive= false;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
index 6d15992a7..d2cae78bb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
@@ -54,7 +54,7 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup {
private final int fOffset;
private final int fSize;
private int fRemaining;
-
+
public ComputingProposal(int offset, int size) {
fSize= size;
fRemaining = size;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
index db44bf42c..b03712c29 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
@@ -89,7 +89,7 @@ import org.eclipse.jface.text.TextUtilities;
/**
* The standard implementation of the {@link IContentAssistant} interface. Usually, clients
* instantiate this class and configure it before using it.
- *
+ *
* Since 3.12, it can compute and display the proposals asynchronously when invoking
* {@link #ContentAssistant(boolean)} with <code>true</code>.
*/
@@ -1054,7 +1054,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
/**
* Tells whether this content assistant allows to run asynchronous
- *
+ *
* @since 3.12
*/
private boolean fAsynchronous;
@@ -1076,7 +1076,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
* context information above the location at which it was activated. If auto activation will be
* enabled, without further configuration steps, this content assistant is activated after a 500
* milliseconds delay. It uses the default partitioning.
- *
+ *
* @param asynchronous <true> if this content assistant should present the proposals
* asynchronously, <code>false</code> otherwise
* @since 3.12
@@ -1122,7 +1122,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
else
fProcessors.put(contentType, Collections.singleton(processor));
}
-
+
/**
* Registers a given content assist processor for a particular content type. If there is already
* a processor registered for this type, it is kept and the new processor is appended to the list
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
index 750d18a2a..ee71644cd 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
@@ -767,7 +767,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
gcImage.dispose();
return imageData;
});
-
+
} else {
if (fBuffer == null)
fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);
@@ -795,9 +795,9 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
* This method is not API and it is expected to disappear in Eclipse 4.8.
* Subclasses that want to take advantage of the unsupported workaround for bug 516258
* can re-implement this method and return true.
- *
+ *
* @return true iff this class supports the workaround for bug 516258
- *
+ *
* @nooverride This method is not intended to be re-implemented or extended by clients.
* @noreference This method is not intended to be referenced by clients.
* @since 3.12
@@ -810,9 +810,9 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
* This method is not API and it is expected to disappear in Eclipse 4.8.
* Subclasses that want to take advantage of the unsupported workaround for bug 516258
* can override this method and store the given zoom level for later use.
- *
+ *
* @param zoom the zoom level to use for drawing operations
- *
+ *
* @nooverride This method is not intended to be re-implemented or extended by clients.
* @noreference This method is not intended to be referenced by clients.
* @since 3.12
@@ -820,7 +820,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
protected void internalSetZoom(int zoom) {
// callback for subclasses
}
-
+
/**
* Returns the view port height in lines.
*

Back to the top