diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-01-15 19:06:42 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-01-15 19:06:42 +0100 |
| commit | cfc4a0da1597d6efebcedb980ed397803db44606 (patch) | |
| tree | 69ee4d649b61589d6e990147066f742010dbc96b | |
| parent | 97fd105d50f1ed55634d13d567c66e281115845e (diff) | |
| download | cgeo-cfc4a0da1597d6efebcedb980ed397803db44606.zip cgeo-cfc4a0da1597d6efebcedb980ed397803db44606.tar.gz cgeo-cfc4a0da1597d6efebcedb980ed397803db44606.tar.bz2 | |
fix #3544: no line break after local variable annotation
Automatic order of annotation and modifiers is not possible in Eclipse.
Feel free to cleanup with IntelliJ, if that can do it.
| -rw-r--r-- | main/.settings/org.eclipse.jdt.core.prefs | 2 | ||||
| -rw-r--r-- | main/.settings/org.eclipse.jdt.ui.prefs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/main/.settings/org.eclipse.jdt.core.prefs b/main/.settings/org.eclipse.jdt.core.prefs index c15d000..2fc1133 100644 --- a/main/.settings/org.eclipse.jdt.core.prefs +++ b/main/.settings/org.eclipse.jdt.core.prefs @@ -192,7 +192,7 @@ 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_field=do not 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_local_variable=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert diff --git a/main/.settings/org.eclipse.jdt.ui.prefs b/main/.settings/org.eclipse.jdt.ui.prefs index 92e2c88..a80d8c1 100644 --- a/main/.settings/org.eclipse.jdt.ui.prefs +++ b/main/.settings/org.eclipse.jdt.ui.prefs @@ -1,11 +1,14 @@ -#Tue Feb 21 06:54:46 CET 2012 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_cgeo formatter_settings_version=12 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=cgeo;com;org;android;java;javax; +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=true sp_cleanup.add_generated_serial_version_id=false |