diff --git a/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core.tests/META-INF/MANIFEST.MF index 47c6985..e7386fe 100644 --- 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 index 4af556f..d209a5d 100644 --- a/com.googlecode.cppcheclipse.core.tests/pom.xml +++ b/com.googlecode.cppcheclipse.core.tests/pom.xml @@ -6,7 +6,7 @@ com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml com.googlecode.cppcheclipse.core.tests diff --git a/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.core/META-INF/MANIFEST.MF index 7459d30..473f103 100644 --- 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 index 444fc68..ce0a206 100644 --- a/com.googlecode.cppcheclipse.core/pom.xml +++ b/com.googlecode.cppcheclipse.core/pom.xml @@ -6,7 +6,7 @@ com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml com.googlecode.cppcheclipse.core 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 deleted file mode 100644 index f4189cc..0000000 --- a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/Appendages.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.googlecode.cppcheclipse.core; - -import java.io.File; -import java.io.IOException; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -import org.eclipse.jface.preference.IPreferenceStore; - -import com.google.common.base.Joiner; -import com.google.common.base.Splitter; -import com.googlecode.cppcheclipse.core.utils.SerializeHelper; - -public class Appendages implements TableModel { - private final IPreferenceStore preferenceStore; - private static final String DELIMITER = ";"; // something which does not - // occur within base64 - // encoding - private final List files; - - public Appendages(IPreferenceStore preferenceStore) { - this.preferenceStore = preferenceStore; - files = new LinkedList(); - load(); - } - - private void load() { - Iterable values = Splitter - .on(DELIMITER) - .omitEmptyStrings() - .split(preferenceStore - .getString(IPreferenceConstants.P_APPENDAGES)); - for (String file : values) { - try { - files.add((File) SerializeHelper.fromString(file)); - } catch (Exception e) { - CppcheclipsePlugin.logWarning( - "Error reading filename of appendages. Stored appendage file '" - + file + "'", e); - } - } - } - - public void save() throws IOException { - List values = new LinkedList(); - // serialize files - for (File file : files) { - values.add(SerializeHelper.toString(file)); - } - preferenceStore.setValue(IPreferenceConstants.P_APPENDAGES, - Joiner.on(DELIMITER).join(values)); - } - - public void removeAll() { - files.clear(); - } - - public void add(File file) { - files.add(file); - } - - public void remove(File file) { - files.remove(file); - } - - public Iterator iterator() { - return files.iterator(); - } - - public boolean isEmpty() { - return files.isEmpty(); - } - - public File[] toArray() { - return files.toArray(new File[files.size()]); - } -} 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 index da9df16..93a777b 100644 --- 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 index b796134..205b4ce 100644 --- 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 index 25b879a..468c3d4 100644 --- a/com.googlecode.cppcheclipse.feature/feature.xml +++ b/com.googlecode.cppcheclipse.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/com.googlecode.cppcheclipse.feature/pom.xml b/com.googlecode.cppcheclipse.feature/pom.xml index f805622..275e6c3 100644 --- a/com.googlecode.cppcheclipse.feature/pom.xml +++ b/com.googlecode.cppcheclipse.feature/pom.xml @@ -6,7 +6,7 @@ com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml com.googlecode.cppcheclipse.feature diff --git a/com.googlecode.cppcheclipse.parent/pom.xml b/com.googlecode.cppcheclipse.parent/pom.xml index 89b44e0..b99230f 100644 --- a/com.googlecode.cppcheclipse.parent/pom.xml +++ b/com.googlecode.cppcheclipse.parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.googlecode.cppcheclipse com.googlecode.cppcheclipse.parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT pom diff --git a/com.googlecode.cppcheclipse.repository/category.xml b/com.googlecode.cppcheclipse.repository/category.xml index a59cf72..49e0e76 100644 --- a/com.googlecode.cppcheclipse.repository/category.xml +++ b/com.googlecode.cppcheclipse.repository/category.xml @@ -1,6 +1,6 @@ - + diff --git a/com.googlecode.cppcheclipse.repository/pom.xml b/com.googlecode.cppcheclipse.repository/pom.xml index 6578417..d1b9cc0 100644 --- a/com.googlecode.cppcheclipse.repository/pom.xml +++ b/com.googlecode.cppcheclipse.repository/pom.xml @@ -6,7 +6,7 @@ com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml com.googlecode.cppcheclipse.repository diff --git a/com.googlecode.cppcheclipse.target/pom.xml b/com.googlecode.cppcheclipse.target/pom.xml index cd40bde..45a1767 100644 --- a/com.googlecode.cppcheclipse.target/pom.xml +++ b/com.googlecode.cppcheclipse.target/pom.xml @@ -5,7 +5,7 @@ com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml diff --git a/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui.tests/META-INF/MANIFEST.MF index 6d9d66a..aa96fba 100644 --- 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 index d10370a..b70b526 100644 --- a/com.googlecode.cppcheclipse.ui.tests/pom.xml +++ b/com.googlecode.cppcheclipse.ui.tests/pom.xml @@ -6,7 +6,7 @@ com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml com.googlecode.cppcheclipse.ui.tests diff --git a/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF b/com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF index 44960bd..3215e25 100644 --- 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 index 7721ff0..036fedb 100644 --- a/com.googlecode.cppcheclipse.ui/plugin.xml +++ b/com.googlecode.cppcheclipse.ui/plugin.xml @@ -279,24 +279,6 @@ - - - - - - - - - - com.googlecode.cppcheclipse.parent com.googlecode.cppcheclipse - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT ../com.googlecode.cppcheclipse.parent/pom.xml com.googlecode.cppcheclipse.ui 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 index 45b0cae..fca8771 100644 --- 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 index d05edd4..225f5f5 100644 --- 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=). -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 deleted file mode 100644 index c7ef63b..0000000 --- a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/AppendagePropertyPage.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.googlecode.cppcheclipse.ui.preferences; - -import org.eclipse.ui.IWorkbenchPropertyPage; - -import com.googlecode.cppcheclipse.core.IPreferenceConstants; -import com.googlecode.cppcheclipse.ui.Messages; - -public class AppendagePropertyPage extends FieldEditorOverlayPage - implements IWorkbenchPropertyPage { - public AppendagePropertyPage() { - super(FLAT, false); - setDescription(Messages.AppendagePropertyPage_Description); - } - - @Override - protected void createFieldEditors() { - AppendageTable list = new AppendageTable(IPreferenceConstants.P_APPENDAGES, Messages.AppendagePropertyPage_AppendageLabel, getFieldEditorParent(), getProject()); - addField(list); - } - - @Override - protected String getPageId() { - return null; - } - -} 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 deleted file mode 100644 index cc30b61..0000000 --- a/com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/AppendageTable.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.googlecode.cppcheclipse.ui.preferences; - -import java.io.File; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; - -import com.googlecode.cppcheclipse.core.Appendages; -import com.googlecode.cppcheclipse.ui.Messages; - -public class AppendageTable extends TableEditor { - - private final IProject project; - - static enum TableColumn { - Filename - }; - - public AppendageTable(String name, String labelText, Composite parent, - IProject project) { - super(name, labelText, parent); - - getTableViewer(parent).getTable().setHeaderVisible(true); - getTableViewer(parent).getTable().setLinesVisible(true); - addColumn(new ExtendedTableColumn(Messages.AppendageTable_ColumnFile, SWT.LEFT, 150)); - - getTableViewer(parent).setLabelProvider(new LabelProvider()); - this.project = project; - } - - private static class LabelProvider implements ITableLabelProvider { - - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - public String getColumnText(Object element, int columnIndex) { - String text = ""; //$NON-NLS-1$ - TableColumn column = TableColumn.values()[columnIndex]; - switch (column) { - case Filename: - text = ((File) element).toString(); - break; - } - return text; - } - - public void addListener(ILabelProviderListener listener) { - } - - public void dispose() { - } - - public boolean isLabelProperty(Object element, String property) { - return false; - } - - public void removeListener(ILabelProviderListener listener) { - } - - } - - @Override - protected void createButtons(Composite box) { - createPushButton(box, Messages.TableEditor_Add, new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - addPressed(); - } - }); - createPushButton(box, Messages.TableEditor_AddExternal, - new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - addExternalPressed(); - } - }); - createPushButton(box, Messages.TableEditor_Remove, - new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - removePressed(); - } - }); - createPushButton(box, Messages.TableEditor_RemoveAll, - new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - removeAllPressed(); - } - }); - } - - protected void addPressed() { - IResource resource = openProjectFile(Messages.AppendageTable_FileSelection, Messages.AppendageTable_FileSelectionMessage, project, false); - if (resource != null) { - File file = resource.getProjectRelativePath().toFile(); - getModel().add(file); - getTableViewer().add(file); - } - } - - protected void addExternalPressed() { - File file = openExternalFile(Messages.AppendageTable_FileSelection); - if (file != null) { - getModel().add(file); - getTableViewer().add(file); - } - } - - @Override - protected Appendages createModel() { - return new Appendages(getPreferenceStore()); - } -} 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 index 9d45d4c..58acca5 100644 --- 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 @@ -97,7 +97,7 @@ protected void valueChanged(boolean oldValue, table = new SymbolsTable( IPreferenceConstants.P_SYMBOLS, - Messages.AppendagePropertyPage_AppendageLabel, + Messages.SymbolsPropertyPage_SymbolLabel, group, settings); restrictedSymbolEditors.add(table); addField(table, group);