From 4e112eca7750a4f530c986be55c178c43c16d3ea Mon Sep 17 00:00:00 2001 From: Elliott Baron Date: Sat, 26 Jun 2010 22:27:34 -0400 Subject: Update codan plugins to CDT 7.0. * org.eclipse.cdt.codan.checkers.ui: Updated. * org.eclipse.cdt.codan.checkers: Updated. * org.eclipse.cdt.codan.core: Updated. * org.eclipse.cdt.codan.ui: Updated. * org.eclipse.cdt.codan.core.cxx: Added. * org.eclipse.cdt.codan.extension/META-INF/MANIFEST.MF: Import org.eclipse.cdt.codan.core.cxx.model. * org.eclipse.cdt.codan.extension/src/org/eclipse/cdt/codan/extension/checkers/AbstractPropSimChecker.java: Superclass moved. --- org.eclipse.cdt.codan.checkers.ui/.project | 6 ++ .../.settings/CVS/Entries | 2 +- .../.settings/CVS/Tag | 1 + .../.settings/org.eclipse.jdt.core.prefs | 69 +++++++++++++++- org.eclipse.cdt.codan.checkers.ui/CVS/Entries | 11 ++- org.eclipse.cdt.codan.checkers.ui/CVS/Tag | 1 + .../META-INF/CVS/Entries | 2 +- org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Tag | 1 + .../META-INF/MANIFEST.MF | 18 +++-- .../OSGI-INF/CVS/Entries | 1 + .../OSGI-INF/CVS/Repository | 1 + .../OSGI-INF/CVS/Root | 1 + org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Tag | 1 + .../OSGI-INF/l10n/CVS/Entries | 1 + .../OSGI-INF/l10n/CVS/Repository | 1 + .../OSGI-INF/l10n/CVS/Root | 1 + .../OSGI-INF/l10n/CVS/Tag | 1 + .../OSGI-INF/l10n/bundle.properties | 13 +++ org.eclipse.cdt.codan.checkers.ui/about.html | 24 ++++++ org.eclipse.cdt.codan.checkers.ui/build.properties | 16 +++- org.eclipse.cdt.codan.checkers.ui/plugin.xml | 25 ++++-- org.eclipse.cdt.codan.checkers.ui/src/CVS/Tag | 1 + org.eclipse.cdt.codan.checkers.ui/src/org/CVS/Tag | 1 + .../src/org/eclipse/CVS/Tag | 1 + .../src/org/eclipse/cdt/CVS/Tag | 1 + .../src/org/eclipse/cdt/codan/CVS/Entries | 1 + .../src/org/eclipse/cdt/codan/CVS/Tag | 1 + .../src/org/eclipse/cdt/codan/checkers/CVS/Entries | 1 - .../org/eclipse/cdt/codan/checkers/CVS/Repository | 1 - .../src/org/eclipse/cdt/codan/checkers/CVS/Root | 1 - .../org/eclipse/cdt/codan/checkers/CVS/Template | 0 .../org/eclipse/cdt/codan/checkers/ui/CVS/Entries | 2 - .../eclipse/cdt/codan/checkers/ui/CVS/Repository | 1 - .../src/org/eclipse/cdt/codan/checkers/ui/CVS/Root | 1 - .../org/eclipse/cdt/codan/checkers/ui/CVS/Template | 0 .../cdt/codan/checkers/ui/CheckersUiActivator.java | 50 ------------ .../cdt/codan/checkers/ui/quickfix/CVS/Entries | 2 - .../cdt/codan/checkers/ui/quickfix/CVS/Repository | 1 - .../cdt/codan/checkers/ui/quickfix/CVS/Root | 1 - .../cdt/codan/checkers/ui/quickfix/CVS/Template | 0 .../CodanProblemMarkerResolutionGenerator.java | 30 ------- .../ui/quickfix/QuickFixAssignmentInCondition.java | 82 ------------------- .../src/org/eclipse/cdt/codan/internal/CVS/Entries | 1 + .../org/eclipse/cdt/codan/internal/CVS/Repository | 1 + .../src/org/eclipse/cdt/codan/internal/CVS/Root | 1 + .../src/org/eclipse/cdt/codan/internal/CVS/Tag | 1 + .../org/eclipse/cdt/codan/internal/CVS/Template | 0 .../cdt/codan/internal/checkers/CVS/Entries | 1 + .../cdt/codan/internal/checkers/CVS/Repository | 1 + .../eclipse/cdt/codan/internal/checkers/CVS/Root | 1 + .../eclipse/cdt/codan/internal/checkers/CVS/Tag | 1 + .../cdt/codan/internal/checkers/CVS/Template | 0 .../cdt/codan/internal/checkers/ui/CVS/Entries | 4 + .../cdt/codan/internal/checkers/ui/CVS/Repository | 1 + .../cdt/codan/internal/checkers/ui/CVS/Root | 1 + .../eclipse/cdt/codan/internal/checkers/ui/CVS/Tag | 1 + .../cdt/codan/internal/checkers/ui/CVS/Template | 0 .../internal/checkers/ui/CheckersUiActivator.java | 92 ++++++++++++++++++++++ .../cdt/codan/internal/checkers/ui/Messages.java | 30 +++++++ .../codan/internal/checkers/ui/messages.properties | 13 +++ .../internal/checkers/ui/quickfix/CVS/Entries | 3 + .../internal/checkers/ui/quickfix/CVS/Repository | 1 + .../codan/internal/checkers/ui/quickfix/CVS/Root | 1 + .../codan/internal/checkers/ui/quickfix/CVS/Tag | 1 + .../internal/checkers/ui/quickfix/CVS/Template | 0 .../ui/quickfix/CatchByReferenceQuickFix.java | 42 ++++++++++ .../ui/quickfix/QuickFixAssignmentInCondition.java | 45 +++++++++++ .../ui/quickfix/SuggestedParenthesisQuickFix.java | 47 +++++++++++ 68 files changed, 470 insertions(+), 196 deletions(-) create mode 100644 org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Entries create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Repository create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Root create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Entries create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Repository create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Root create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/bundle.properties create mode 100644 org.eclipse.cdt.codan.checkers.ui/about.html create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Tag delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Entries delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Repository delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Root delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Template delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Entries delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Repository delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Root delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Template delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CheckersUiActivator.java delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Entries delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Repository delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Root delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Template delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java delete mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Entries create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Repository create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Root create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Template create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Entries create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Repository create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Root create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Template create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Entries create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Repository create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Root create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Template create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/Messages.java create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/messages.properties create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Entries create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Repository create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Root create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Tag create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Template create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java create mode 100644 org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java (limited to 'org.eclipse.cdt.codan.checkers.ui') diff --git a/org.eclipse.cdt.codan.checkers.ui/.project b/org.eclipse.cdt.codan.checkers.ui/.project index 4c29868..047b3a3 100644 --- a/org.eclipse.cdt.codan.checkers.ui/.project +++ b/org.eclipse.cdt.codan.checkers.ui/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Entries index 2303ef8..b0dddaa 100644 --- a/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Entries +++ b/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Entries @@ -1 +1 @@ -/org.eclipse.jdt.core.prefs/1.1/Sat Apr 18 02:11:07 2009// +/org.eclipse.jdt.core.prefs/1.2/Wed Mar 24 03:32:01 2010//TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Tag new file mode 100644 index 0000000..49a449a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/.settings/CVS/Tag @@ -0,0 +1 @@ +NCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.cdt.codan.checkers.ui/.settings/org.eclipse.jdt.core.prefs index 5edb6f2..4a6c190 100644 --- a/org.eclipse.cdt.codan.checkers.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.cdt.codan.checkers.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,75 @@ -#Fri Apr 17 21:55:42 EDT 2009 +#Thu Mar 18 10:02:11 EDT 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=error +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.eclipse.cdt.codan.checkers.ui/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/CVS/Entries index 1583ce7..ad0156d 100644 --- a/org.eclipse.cdt.codan.checkers.ui/CVS/Entries +++ b/org.eclipse.cdt.codan.checkers.ui/CVS/Entries @@ -1,7 +1,10 @@ -/.classpath/1.2/Wed Dec 16 21:48:51 2009// -/.project/1.1/Sat Apr 18 02:11:07 2009// +/.classpath/1.2/Wed Dec 16 21:48:51 2009//TCDT_7_0_0 +/.project/1.2/Wed Mar 24 03:32:01 2010//TCDT_7_0_0 D/.settings//// D/META-INF//// -/build.properties/1.1/Sat Apr 18 02:11:07 2009// -/plugin.xml/1.1/Sat Apr 18 02:11:07 2009// +D/OSGI-INF//// +/about.html/1.1/Mon Jun 14 18:35:34 2010//TCDT_7_0_0 +/build.properties/1.8/Sun Jun 27 01:30:38 2010//TCDT_7_0_0 +/plugin.xml/1.7/Sun Jun 27 01:30:38 2010//TCDT_7_0_0 +D/schema//// D/src//// diff --git a/org.eclipse.cdt.codan.checkers.ui/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/CVS/Tag new file mode 100644 index 0000000..49a449a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/CVS/Tag @@ -0,0 +1 @@ +NCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Entries index bb6a97a..dca550e 100644 --- a/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Entries +++ b/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Entries @@ -1 +1 @@ -/MANIFEST.MF/1.1/Sat Apr 18 02:11:07 2009// +/MANIFEST.MF/1.10/Sun Jun 27 01:30:38 2010//TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Tag new file mode 100644 index 0000000..49a449a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/META-INF/CVS/Tag @@ -0,0 +1 @@ +NCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF b/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF index faffd30..1aeed6b 100644 --- a/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF @@ -1,15 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Checkers Ui +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.cdt.codan.checkers.ui;singleton:=true -Bundle-Version: 1.0.0 -Bundle-Activator: org.eclipse.cdt.codan.checkers.ui.CheckersUiActivator +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.eclipse.cdt.codan.internal.checkers.ui.CheckersUiActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.ui.ide;bundle-version="3.5.0", - org.eclipse.jface.text;bundle-version="3.5.0", - org.eclipse.ui.editors;bundle-version="3.5.0", - org.eclipse.core.resources;bundle-version="3.5.0", - org.eclipse.cdt.codan.checkers;bundle-version="1.0.0" + org.eclipse.jface.text, + org.eclipse.core.resources, + org.eclipse.cdt.codan.ui, + org.eclipse.ui.ide Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %Bundle-Vendor +Export-Package: org.eclipse.cdt.codan.internal.checkers.ui;x-internal:=true, + org.eclipse.cdt.codan.internal.checkers.ui.quickfix;x-internal:=true diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Entries new file mode 100644 index 0000000..2928641 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Entries @@ -0,0 +1 @@ +D/l10n//// diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Repository new file mode 100644 index 0000000..f9d3890 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Repository @@ -0,0 +1 @@ +org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/OSGI-INF diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Root new file mode 100644 index 0000000..04efa23 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Entries new file mode 100644 index 0000000..d61d5c4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Entries @@ -0,0 +1 @@ +/bundle.properties/1.2/Thu Jun 3 17:01:30 2010//TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Repository new file mode 100644 index 0000000..d03e881 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Repository @@ -0,0 +1 @@ +org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Root new file mode 100644 index 0000000..04efa23 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Tag new file mode 100644 index 0000000..49a449a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/CVS/Tag @@ -0,0 +1 @@ +NCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/bundle.properties new file mode 100644 index 0000000..e0f2a06 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2010 Alena Laskavaia and others. +# All rights reserved. This program and the accompanying materials +# 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: +# Alena Laskavaia - initial API and implementation +############################################################################### +#Properties file for org.eclipse.cdt.codan.checkers.ui +Bundle-Vendor = Eclipse CDT +Bundle-Name = Codan Checkers Ui \ No newline at end of file diff --git a/org.eclipse.cdt.codan.checkers.ui/about.html b/org.eclipse.cdt.codan.checkers.ui/about.html new file mode 100644 index 0000000..d7c5118 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/about.html @@ -0,0 +1,24 @@ + + +About + + +

About This Content

+ +

June 22, 2007

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file diff --git a/org.eclipse.cdt.codan.checkers.ui/build.properties b/org.eclipse.cdt.codan.checkers.ui/build.properties index 34d2e4d..106258a 100644 --- a/org.eclipse.cdt.codan.checkers.ui/build.properties +++ b/org.eclipse.cdt.codan.checkers.ui/build.properties @@ -1,4 +1,18 @@ +############################################################################### +# Copyright (c) 2009, 2010 Alena Laskavaia and others. +# All rights reserved. This program and the accompanying materials +# 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: +# Alena Laskavaia - initial API and implementation +############################################################################### source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + plugin.xml,\ + OSGI-INF/l10n/bundle.properties,\ + about.html + diff --git a/org.eclipse.cdt.codan.checkers.ui/plugin.xml b/org.eclipse.cdt.codan.checkers.ui/plugin.xml index 783ff1d..7052603 100644 --- a/org.eclipse.cdt.codan.checkers.ui/plugin.xml +++ b/org.eclipse.cdt.codan.checkers.ui/plugin.xml @@ -1,11 +1,22 @@ - - - - + + + + + + + + + + + diff --git a/org.eclipse.cdt.codan.checkers.ui/src/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Entries index 513604d..97de449 100644 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Entries +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Entries @@ -1 +1,2 @@ D/checkers//// +D/internal//// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Entries deleted file mode 100644 index 7f0205c..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D/ui//// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Repository deleted file mode 100644 index 24fc549..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Root deleted file mode 100644 index 04efa23..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/CVS/Template deleted file mode 100644 index e69de29..0000000 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Entries deleted file mode 100644 index fc31844..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/CheckersUiActivator.java/1.1/Sat Apr 18 02:11:07 2009// -D/quickfix//// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Repository deleted file mode 100644 index 25cd7cf..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Root deleted file mode 100644 index 04efa23..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CVS/Template deleted file mode 100644 index e69de29..0000000 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CheckersUiActivator.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CheckersUiActivator.java deleted file mode 100644 index 1635684..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/CheckersUiActivator.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.eclipse.cdt.codan.checkers.ui; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class CheckersUiActivator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.cdt.codan.checkers.ui"; - - // The shared instance - private static CheckersUiActivator plugin; - - /** - * The constructor - */ - public CheckersUiActivator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static CheckersUiActivator getDefault() { - return plugin; - } - -} diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Entries deleted file mode 100644 index 641ef34..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/CodanProblemMarkerResolutionGenerator.java/1.2/Tue Apr 21 00:36:20 2009// -/QuickFixAssignmentInCondition.java/1.1/Sat Apr 18 02:11:07 2009// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Repository deleted file mode 100644 index 3bdd833..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Root deleted file mode 100644 index 04efa23..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CVS/Template deleted file mode 100644 index e69de29..0000000 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java deleted file mode 100644 index 1470e7f..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Andrew Gvozdev - * All rights reserved. This program and the accompanying materials - * 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: - * Andrew Gvozdev - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.codan.checkers.ui.quickfix; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.resources.IMarker; -import org.eclipse.ui.IMarkerResolution; -import org.eclipse.ui.IMarkerResolutionGenerator; - -public class CodanProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator { - public IMarkerResolution[] getResolutions(IMarker marker) { - final Pattern patternBuildDependsAdd = Pattern.compile("Possible assignment in condition.*"); - String description = marker.getAttribute(IMarker.MESSAGE, "no message"); - Matcher matcherBuildDependsAdd = patternBuildDependsAdd.matcher(description); - if (matcherBuildDependsAdd.matches()) { - return new IMarkerResolution[] { new QuickFixAssignmentInCondition() }; - } - return new IMarkerResolution[0]; - } -} \ No newline at end of file diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java deleted file mode 100644 index 5c28d53..0000000 --- a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Andrew Gvozdev - * All rights reserved. This program and the accompanying materials - * 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: - * Andrew Gvozdev - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.codan.checkers.ui.quickfix; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.FindReplaceDocumentAdapter; -import org.eclipse.jface.text.IDocument; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IFileEditorInput; -import org.eclipse.ui.IMarkerResolution; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.texteditor.ITextEditor; - -public class QuickFixAssignmentInCondition implements IMarkerResolution { - public String getLabel() { - return "Change to '=='"; - } - - public void run(IMarker marker) { - // See if there is an open editor on the file containing the marker - IWorkbenchWindow w = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow(); - if (w == null) { - return; - } - IWorkbenchPage page = w.getActivePage(); - if (page == null) { - return; - } - IFileEditorInput input = new FileEditorInput((IFile) marker - .getResource()); - IEditorPart editorPart = page.findEditor(input); - if (editorPart == null) { - // open an editor - try { - editorPart = IDE.openEditor(page, (IFile) marker.getResource(), - true); - } catch (PartInitException e) { - e.printStackTrace(); - } - } - if (editorPart == null) { - return; - } - if (editorPart instanceof ITextEditor) { - ITextEditor editor = (ITextEditor) editorPart; - IDocument doc = editor.getDocumentProvider().getDocument( - editor.getEditorInput()); - int line = marker.getAttribute(IMarker.LINE_NUMBER, -1) - 1; - FindReplaceDocumentAdapter dad = new FindReplaceDocumentAdapter(doc); - try { - dad.find(doc.getLineOffset(line), "=", /* forwardSearch */ - true, /* caseSensitive */false, - /* wholeWord */false, /* regExSearch */false); - dad.replace("==", /* regExReplace */false); - marker.delete(); - } catch (BadLocationException e) { - // TODO: log the error - e.printStackTrace(); - } catch (CoreException e) { - // TODO: log the error - e.printStackTrace(); - } - } - } -} diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Entries new file mode 100644 index 0000000..513604d --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Entries @@ -0,0 +1 @@ +D/checkers//// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Repository new file mode 100644 index 0000000..65b8627 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Repository @@ -0,0 +1 @@ +org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Root new file mode 100644 index 0000000..04efa23 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/CVS/Template new file mode 100644 index 0000000..e69de29 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Entries new file mode 100644 index 0000000..7f0205c --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Entries @@ -0,0 +1 @@ +D/ui//// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Repository new file mode 100644 index 0000000..f36ddb5 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Repository @@ -0,0 +1 @@ +org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Root new file mode 100644 index 0000000..04efa23 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Tag new file mode 100644 index 0000000..3cd1ca4 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Tag @@ -0,0 +1 @@ +TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/CVS/Template new file mode 100644 index 0000000..e69de29 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Entries new file mode 100644 index 0000000..38f32cc --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Entries @@ -0,0 +1,4 @@ +/CheckersUiActivator.java/1.4/Sun Jun 27 01:30:39 2010//TCDT_7_0_0 +/Messages.java/1.2/Sun May 2 02:31:03 2010//TCDT_7_0_0 +/messages.properties/1.3/Thu Jun 3 17:01:30 2010//TCDT_7_0_0 +D/quickfix//// diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Repository new file mode 100644 index 0000000..afa2081 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Repository @@ -0,0 +1 @@ +org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Root new file mode 100644 index 0000000..04efa23 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Tag new file mode 100644 index 0000000..49a449a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Tag @@ -0,0 +1 @@ +NCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CVS/Template new file mode 100644 index 0000000..e69de29 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java new file mode 100644 index 0000000..7a3d418 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2010 Alena Laskavaia and others. + * All rights reserved. This program and the accompanying materials + * 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: + * Alena Laskavaia - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.codan.internal.checkers.ui; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class CheckersUiActivator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.cdt.codan.checkers.ui"; //$NON-NLS-1$ + + // The shared instance + private static CheckersUiActivator plugin; + + /** + * The constructor + */ + public CheckersUiActivator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static CheckersUiActivator getDefault() { + return plugin; + } + + /** + * Logs the specified status with this plug-in's log. + * + * @param status + * status to log + */ + public static void log(IStatus status) { + getDefault().getLog().log(status); + } + + /** + * Logs an internal error with the specified throwable + * + * @param e + * the exception to be logged + */ + public static void log(Throwable e) { + log(new Status(IStatus.ERROR, PLUGIN_ID, 1, "Internal Error", e)); //$NON-NLS-1$ + } + + /** + * Logs an internal error with the specified message. + * + * @param message + * the error message to log + */ + public static void log(String message) { + log(new Status(IStatus.ERROR, PLUGIN_ID, 1, message, null)); + } + +} diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/Messages.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/Messages.java new file mode 100644 index 0000000..525de8a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/Messages.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2009,2010 Alena Laskavaia + * All rights reserved. This program and the accompanying materials + * 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: + * Alena Laskavaia - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.codan.internal.checkers.ui; + +import org.eclipse.osgi.util.NLS; + +/** + * TODO: add description + */ +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.cdt.codan.internal.checkers.ui.messages"; //$NON-NLS-1$ + public static String CatchByReferenceQuickFix_Message; + public static String QuickFixAssignmentInCondition_Message; + public static String SuggestedParenthesisQuickFix_Message; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/messages.properties b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/messages.properties new file mode 100644 index 0000000..da262e0 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/messages.properties @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2010 Alena Laskavaia and others. +# All rights reserved. This program and the accompanying materials +# 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: +# Alena Laskavaia - initial API and implementation +############################################################################### +CatchByReferenceQuickFix_Message=Change to use '&' +QuickFixAssignmentInCondition_Message=Change to '==' +SuggestedParenthesisQuickFix_Message=Surround with '()' diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Entries b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Entries new file mode 100644 index 0000000..e7497b1 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Entries @@ -0,0 +1,3 @@ +/CatchByReferenceQuickFix.java/1.2/Sun May 2 01:47:22 2010//TCDT_7_0_0 +/QuickFixAssignmentInCondition.java/1.5/Sun Jun 27 01:30:39 2010//TCDT_7_0_0 +/SuggestedParenthesisQuickFix.java/1.2/Thu Jun 3 17:01:30 2010//TCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Repository b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Repository new file mode 100644 index 0000000..f74bc94 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Repository @@ -0,0 +1 @@ +org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Root b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Root new file mode 100644 index 0000000..04efa23 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.eclipse.org:/cvsroot/tools diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Tag b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Tag new file mode 100644 index 0000000..49a449a --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Tag @@ -0,0 +1 @@ +NCDT_7_0_0 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Template b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CVS/Template new file mode 100644 index 0000000..e69de29 diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java new file mode 100644 index 0000000..68c3884 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2010 Alena Laskavaia + * All rights reserved. This program and the accompanying materials + * 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: + * Alena Laskavaia - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.codan.internal.checkers.ui.quickfix; + +import org.eclipse.cdt.codan.internal.checkers.ui.CheckersUiActivator; +import org.eclipse.cdt.codan.internal.checkers.ui.Messages; +import org.eclipse.cdt.codan.ui.AbstarctCodanCMarkerResolution; +import org.eclipse.core.resources.IMarker; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; +import org.eclipse.jface.text.IDocument; + +/** + * quick fix for catch by value + */ +public class CatchByReferenceQuickFix extends AbstarctCodanCMarkerResolution { + public String getLabel() { + return Messages.CatchByReferenceQuickFix_Message; + } + + public void apply(IMarker marker, IDocument document) { + FindReplaceDocumentAdapter dad = new FindReplaceDocumentAdapter( + document); + try { + int pos = getOffset(marker, document); + dad.find(pos, " ", /* forwardSearch *///$NON-NLS-1$ + true, /* caseSensitive */false, + /* wholeWord */false, /* regExSearch */false); + dad.replace(" & ", /* regExReplace */false); //$NON-NLS-1$ + } catch (BadLocationException e) { + CheckersUiActivator.log(e); + } + } +} diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java new file mode 100644 index 0000000..4e64cd1 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2009, 2010 Andrew Gvozdev + * All rights reserved. This program and the accompanying materials + * 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: + * Andrew Gvozdev - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.codan.internal.checkers.ui.quickfix; + +import org.eclipse.cdt.codan.internal.checkers.ui.CheckersUiActivator; +import org.eclipse.cdt.codan.internal.checkers.ui.Messages; +import org.eclipse.cdt.codan.ui.AbstarctCodanCMarkerResolution; +import org.eclipse.core.resources.IMarker; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; +import org.eclipse.jface.text.IDocument; + +/** + * quick fix for assignment in condition + */ +public class QuickFixAssignmentInCondition extends + AbstarctCodanCMarkerResolution { + public String getLabel() { + return Messages.QuickFixAssignmentInCondition_Message; + } + + + @Override + public void apply(IMarker marker, IDocument document) { + int pos = getOffset(marker, document); + try { + FindReplaceDocumentAdapter dad = new FindReplaceDocumentAdapter( + document); + dad.find(pos, "=", /* forwardSearch *///$NON-NLS-1$ + true, /* caseSensitive */false, + /* wholeWord */false, /* regExSearch */false); + dad.replace("==", /* regExReplace */false); //$NON-NLS-1$ + } catch (BadLocationException e) { + CheckersUiActivator.log(e); + } + } +} diff --git a/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java new file mode 100644 index 0000000..977d7a7 --- /dev/null +++ b/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java @@ -0,0 +1,47 @@ +/******************************************************************************* + * Copyright (c) 2010 Alena Laskavaia and others. + * All rights reserved. This program and the accompanying materials + * 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: + * Alena Laskavaia - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.codan.internal.checkers.ui.quickfix; + +import org.eclipse.cdt.codan.internal.checkers.ui.CheckersUiActivator; +import org.eclipse.cdt.codan.internal.checkers.ui.Messages; +import org.eclipse.cdt.codan.ui.AbstarctCodanCMarkerResolution; +import org.eclipse.core.resources.IMarker; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; + +public class SuggestedParenthesisQuickFix extends + AbstarctCodanCMarkerResolution { + public String getLabel() { + return Messages.SuggestedParenthesisQuickFix_Message; + } + + @Override + public boolean isApplicable(IMarker marker) { + int charEnd = marker.getAttribute(IMarker.CHAR_END, -1); + if (charEnd == -1) + return false; + return true; + } + + @Override + public void apply(IMarker marker, IDocument document) { + int charStart = marker.getAttribute(IMarker.CHAR_START, -1); + int charEnd = marker.getAttribute(IMarker.CHAR_END, -1); + if (charEnd == -1) + return; + try { + document.replace(charStart, 0, "("); //$NON-NLS-1$ + document.replace(charEnd+1, 0, ")"); //$NON-NLS-1$ + } catch (BadLocationException e) { + CheckersUiActivator.log(e); + } + } +} -- cgit