Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Thienel2015-09-09 16:00:48 -0400
committerFlorian Thienel2015-09-09 16:00:48 -0400
commitff9a15d41968462976516f1cf5bbc3fb37a0fc90 (patch)
tree2b4ca41a9203213811b76eb0da7e31cc578afd7a /org.eclipse.vex.xhtml
parenta44276000440b9096aabaabd862e1d01addda23a (diff)
downloadorg.eclipse.mylyn.docs.vex-ff9a15d41968462976516f1cf5bbc3fb37a0fc90.tar.gz
org.eclipse.mylyn.docs.vex-ff9a15d41968462976516f1cf5bbc3fb37a0fc90.tar.xz
org.eclipse.mylyn.docs.vex-ff9a15d41968462976516f1cf5bbc3fb37a0fc90.zip
update the formatting and clean-up settings to Eclipse Mars
Change-Id: Ia232196ade96416e8a8114111c2a91e8088f5f8a Signed-off-by: Florian Thienel <florian@thienel.org>
Diffstat (limited to 'org.eclipse.vex.xhtml')
-rw-r--r--org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs20
-rw-r--r--org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.ui.prefs8
-rw-r--r--org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java14
3 files changed, 31 insertions, 11 deletions
diff --git a/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs
index 89996df2..61dd02f9 100644
--- a/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.core.prefs
@@ -24,15 +24,15 @@ 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_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-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
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-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_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=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
@@ -53,6 +53,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
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
@@ -98,6 +99,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
@@ -145,6 +147,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -222,6 +225,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -271,7 +275,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
diff --git a/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.ui.prefs
index cf62e3f3..f4d9a17a 100644
--- a/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.vex.xhtml/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@ cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=true
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
cleanup.correct_indentation=true
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=true
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@ cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=tru
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@ cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_Vex
cleanup_settings_version=2
eclipse.preferences.version=1
diff --git a/org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java b/org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java
index fb11d151..ba61d60d 100644
--- a/org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java
+++ b/org.eclipse.vex.xhtml/src/org/eclipse/vex/xhtml/XhtmlOutlineProvider.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* John Krasnay - initial API and implementation
*******************************************************************************/
@@ -29,17 +29,21 @@ import org.eclipse.vex.ui.internal.outline.IOutlineProvider;
*/
public class XhtmlOutlineProvider implements IOutlineProvider {
+ @Override
public void init(final VexEditor editor) {
}
+ @Override
public ITreeContentProvider getContentProvider() {
return contentProvider;
}
+ @Override
public IBaseLabelProvider getLabelProvider() {
return labelProvider;
}
+ @Override
public IElement getOutlineElement(final IElement child) {
IElement element = child;
while (element.getParentElement() != null) {
@@ -60,16 +64,20 @@ public class XhtmlOutlineProvider implements IOutlineProvider {
private final ITreeContentProvider contentProvider = new ITreeContentProvider() {
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
}
+ @Override
public Object[] getChildren(final Object parentElement) {
return getOutlineChildren((IElement) parentElement);
}
+ @Override
public Object getParent(final Object element) {
final IElement parent = ((IElement) element).getParentElement();
if (parent == null) {
@@ -79,10 +87,12 @@ public class XhtmlOutlineProvider implements IOutlineProvider {
}
}
+ @Override
public boolean hasChildren(final Object element) {
return getOutlineChildren((IElement) element).length > 0;
}
+ @Override
public Object[] getElements(final Object inputElement) {
final IDocument document = (IDocument) inputElement;
return new Object[] { document.getRootElement() };
@@ -93,7 +103,7 @@ public class XhtmlOutlineProvider implements IOutlineProvider {
/**
* Returns an array of the children of the given element that represent nodes in the outline. These are structural
* elements such as "section".
- *
+ *
* @param element
* @return
*/

Back to the top