mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-03-28 14:56:28 +01:00
[releng] Cleanup code that has been misformatted and update to SDK 4.13
The check-code-cleanliness CI jobs have not been running recently, so this commit is to the code up to those minor changes Change-Id: I9fb4b0213dec558f58c5ca718b3d2685564ef456
This commit is contained in:
parent
e391b182cb
commit
35338f28a3
16 changed files with 43 additions and 38 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -64,6 +64,8 @@ package-list text
|
|||
*.xml text
|
||||
*.xsd text
|
||||
*.xsl text
|
||||
yarn.lock text
|
||||
*.lock text
|
||||
|
||||
# Images
|
||||
*.gif binary
|
||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name.0
|
||||
Bundle-SymbolicName: org.eclipse.cdt.autotools.ui;singleton:=true
|
||||
Bundle-Version: 2.0.200.qualifier
|
||||
Bundle-Version: 2.0.300.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: %provider
|
||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name
|
||||
Bundle-SymbolicName: org.eclipse.cdt.codan.core;singleton:=true
|
||||
Bundle-Version: 4.0.100.qualifier
|
||||
Bundle-Version: 4.0.200.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.codan.core.CodanCorePlugin
|
||||
Bundle-Vendor: %Bundle-Vendor
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
|
|
|
@ -65,6 +65,7 @@ public interface IProblemPreferenceDescriptor extends Cloneable {
|
|||
* Custom type, represented by string input field by default
|
||||
*/
|
||||
TYPE_CUSTOM("custom"); //$NON-NLS-1$
|
||||
|
||||
private String literal;
|
||||
|
||||
private PreferenceType(String literal) {
|
||||
|
|
|
@ -99,8 +99,7 @@ public class CommentsTabPage extends FormatterTabPage {
|
|||
// createPrefFalseTrue(globalGroup, numColumns, FormatterMessages.CommentsTabPage_do_not_join_lines, DefaultCodeFormatterConstants.FORMATTER_JOIN_LINES_IN_COMMENTS, true);
|
||||
|
||||
// Line comment group
|
||||
final Group commentGroup = createGroup(numColumns, composite,
|
||||
FormatterMessages.CommentsTabPage_group1_title);
|
||||
final Group commentGroup = createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group1_title);
|
||||
// final CheckboxPreference singleLineCommentsOnFirstColumn= createPrefFalseTrue(lineCommentGroup, numColumns, FormatterMessages.CommentsTabPage_format_line_comments_on_first_column, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT_STARTING_ON_FIRST_COLUMN, false);
|
||||
// ((GridData) singleLineCommentsOnFirstColumn.getControl().getLayoutData()).horizontalIndent= indent;
|
||||
createPrefFalseTrue(commentGroup, numColumns, FormatterMessages.CommentsTabPage_block_comment,
|
||||
|
|
|
@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: %Bundle-Name
|
||||
Bundle-Vendor: %Bundle-Vendor
|
||||
Bundle-SymbolicName: org.eclipse.cdt.debug.dap.gdbjtag;singleton:=true
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Version: 1.100.0.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.debug.dap.gdbjtag.Activator
|
||||
Require-Bundle: org.apache.commons.io,
|
||||
org.eclipse.core.runtime,
|
||||
|
|
|
@ -15,7 +15,7 @@ set -e
|
|||
##
|
||||
# Format code
|
||||
##
|
||||
: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.9/eclipse}
|
||||
: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.13/eclipse}
|
||||
test ! -e check_code_cleanliness_workspace
|
||||
${ECLIPSE} \
|
||||
-consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning
|
||||
org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
|
|
@ -19,7 +19,7 @@ compilers.p.missing-version-import-package=2
|
|||
compilers.p.missing-version-require-bundle=2
|
||||
compilers.p.no-required-att=0
|
||||
compilers.p.no.automatic.module=1
|
||||
compilers.p.not-externalized-att=1
|
||||
compilers.p.not-externalized-att=2
|
||||
compilers.p.service.component.without.lazyactivation=1
|
||||
compilers.p.unknown-attribute=1
|
||||
compilers.p.unknown-class=1
|
||||
|
|
Loading…
Add table
Reference in a new issue