Merge pull request #10 from garbbraf/rel_1.2.1

garbbraf · web-flow · commit 0ef2a132b662 · 2024-10-30T13:52:15.000+01:00
fix: remove appendages
diff --git a/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse Core Tests
 Bundle-SymbolicName: com.googlecode.cppcheclipse.core.tests
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
 Bundle-Vendor: Konrad Windszus
 Fragment-Host: com.googlecode.cppcheclipse.core;bundle-version="0.9.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.googlecode.cppcheclipse.core.tests/pom.xml b/com.googlecode.cppcheclipse.core.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.core.tests</artifactId>
diff --git a/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse Core
 Bundle-SymbolicName: com.googlecode.cppcheclipse.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
 Bundle-Activator: com.googlecode.cppcheclipse.core.CppcheclipsePlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.ui;bundle-version="3.5.0",
diff --git a/com.googlecode.cppcheclipse.core/pom.xml b/com.googlecode.cppcheclipse.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.core</artifactId>
diff --git a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/Appendages.java b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/Appendages.java
diff --git a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/IPreferenceConstants.java b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/IPreferenceConstants.java
@@ -37,7 +37,6 @@ public interface IPreferenceConstants {
 	public static final String P_USE_AUTOMATIC_UPDATE_CHECK = "automaticUpdateCheck";
 	public static final String P_LAST_UPDATE_CHECK = "lastUpdateCheck";
 	public static final String P_SUPPRESSIONS = "suppressions";
-	public static final String P_APPENDAGES = "appendages";
 	public static final String P_ADVANCED_ARGUMENTS = "advancedArgument";
 	public static final String P_SYMBOLS = "symbols";
 	public static final String P_RESTRICT_CONFIGURATION_CHECK = "restrictConfigurations";
diff --git a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java
@@ -23,7 +23,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
-import com.googlecode.cppcheclipse.core.Appendages;
 import com.googlecode.cppcheclipse.core.Checker;
 import com.googlecode.cppcheclipse.core.CppcheclipsePlugin;
 import com.googlecode.cppcheclipse.core.IConsole;
@@ -229,11 +228,6 @@ public CppcheckCommand(IConsole console, String binaryPath,
 			}
 		}
 
-		Appendages appendages = new Appendages(advancedSettingsStore);
-		for (File appendFile : appendages) {
-			arguments.add("--append=" + appendFile.toString());
-		}
-
 		// the symbols already contain all necessary symbols
 		for (Symbol symbol : symbols) {
 			arguments.add(symbol.toString());
diff --git a/com.googlecode.cppcheclipse.feature/feature.xml b/com.googlecode.cppcheclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.googlecode.cppcheclipse.feature"
       label="cppcheclipse"
-      version="1.2.0.qualifier"
+      version="1.2.1.qualifier"
       provider-name="Konrad Windszus"
       plugin="com.googlecode.cppcheclipse.core">
 
diff --git a/com.googlecode.cppcheclipse.feature/pom.xml b/com.googlecode.cppcheclipse.feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.feature</artifactId>
diff --git a/com.googlecode.cppcheclipse.parent/pom.xml b/com.googlecode.cppcheclipse.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.googlecode.cppcheclipse</groupId>
 	<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- tycho requires maven >= 3.0 -->
diff --git a/com.googlecode.cppcheclipse.repository/category.xml b/com.googlecode.cppcheclipse.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.googlecode.cppcheclipse.feature_1.2.0.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.2.0.qualifier">
+   <feature url="features/com.googlecode.cppcheclipse.feature_1.2.1.qualifier.jar" id="com.googlecode.cppcheclipse.feature" version="1.2.1.qualifier">
       <category name="cppcheclipse"/>
    </feature>
    <category-def name="cppcheclipse" label="cppcheclipse"/>
diff --git a/com.googlecode.cppcheclipse.repository/pom.xml b/com.googlecode.cppcheclipse.repository/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
 		<groupId>com.googlecode.cppcheclipse</groupId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 		<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>com.googlecode.cppcheclipse.repository</artifactId>
diff --git a/com.googlecode.cppcheclipse.target/pom.xml b/com.googlecode.cppcheclipse.target/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>com.googlecode.cppcheclipse.parent</artifactId>
 		<groupId>com.googlecode.cppcheclipse</groupId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 		<relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse UI Tests
 Bundle-SymbolicName: com.googlecode.cppcheclipse.ui.tests
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
 Bundle-Vendor: Konrad Windszus
 Fragment-Host: com.googlecode.cppcheclipse.ui;bundle-version="0.9.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.googlecode.cppcheclipse.ui.tests/pom.xml b/com.googlecode.cppcheclipse.ui.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.ui.tests</artifactId>
diff --git a/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: cppcheclipse UI
 Bundle-SymbolicName: com.googlecode.cppcheclipse.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
 Bundle-Activator: com.googlecode.cppcheclipse.ui.Activator
 Bundle-Vendor: Konrad Windszus
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
diff --git a/com.googlecode.cppcheclipse.ui/plugin.xml b/com.googlecode.cppcheclipse.ui/plugin.xml
@@ -279,24 +279,6 @@
          	<keywordReference
                   id="com.googlecode.cppcheclipse.keywords.Cppcheck">
             </keywordReference>
-      </page>
-       <page
-      		category="com.googlecode.cppcheclipse.ui.SettingsPropertyPage"
-            class="com.googlecode.cppcheclipse.ui.preferences.AppendagePropertyPage"
-            id="com.googlecode.cppcheclipse.ui.AppendagePropertyPage"
-            name="Appendage">
-            <filter
-               name="projectNature"
-               value="org.eclipse.cdt.core.cnature">
-         	</filter>            
-         	<enabledWhen>
-            	<!-- project explorer or package explorer (directly derived from IProject),  
-            	    C/C++ Projects (CView) can adapt to IProject -->
-		    	<adapt type="org.eclipse.core.resources.IProject"/>
-         	</enabledWhen>
-         	<keywordReference
-                  id="com.googlecode.cppcheclipse.keywords.Cppcheck">
-            </keywordReference>
       </page>
        <page
       		category="com.googlecode.cppcheclipse.ui.SettingsPropertyPage"
diff --git a/com.googlecode.cppcheclipse.ui/pom.xml b/com.googlecode.cppcheclipse.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>com.googlecode.cppcheclipse.parent</artifactId>
     <groupId>com.googlecode.cppcheclipse</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../com.googlecode.cppcheclipse.parent/pom.xml</relativePath>
   </parent>
   <artifactId>com.googlecode.cppcheclipse.ui</artifactId>
diff --git a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/Messages.java b/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/Messages.java
@@ -4,12 +4,6 @@
 
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "com.googlecode.cppcheclipse.ui.messages"; //$NON-NLS-1$
-	
-	public static String AppendagePropertyPage_AppendageLabel;
-	public static String AppendagePropertyPage_Description;
-	public static String AppendageTable_ColumnFile;
-	public static String AppendageTable_FileSelection;
-	public static String AppendageTable_FileSelectionMessage;
 	public static String UpdateCheck_Daily, UpdateCheck_JobName,
 			UpdateCheck_Monthly, UpdateCheck_NoUpdateMessage,
 			UpdateCheck_NoUpdateTitle,
@@ -89,6 +83,7 @@ public class Messages extends NLS {
 	public static String SuppressionsTable_FileSelectionMessage;
 	public static String SuppressProblemInLineResolution_Label;
 	public static String SuppressProblemResolution_Label;
+	public static String SymbolsPropertyPage_SymbolLabel;
 	public static String TableEditor_Add;
 	public static String TableEditor_Remove;
 	public static String TableEditor_RemoveAll;
diff --git a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/messages.properties b/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/messages.properties
@@ -107,11 +107,7 @@ SuppressionsTable_ColumnProblem=Problem
 SuppressionsTable_FileSelection=File/Folder Selection
 SuppressionsTable_FileSelectionMessage=Select a file or folder which you want to exclude from future runs of cppcheck:
 
-AppendagePropertyPage_AppendageLabel=Appendage of implementation files
-AppendagePropertyPage_Description=Add all files, which should be appended to each check (--append=<file>).
-AppendageTable_ColumnFile=File
-AppendageTable_FileSelection=File Selection
-AppendageTable_FileSelectionMessage=Select a file which you want to append to each checked file.
+SymbolsPropertyPage_SymbolLabel=Symbols
 
 TableEditor_Add=Add
 TableEditor_AddExternal=Add External
diff --git a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/AppendagePropertyPage.java b/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/AppendagePropertyPage.java
diff --git a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/AppendageTable.java b/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/AppendageTable.java
diff --git a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/SymbolsPropertyPage.java b/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/SymbolsPropertyPage.java
