#13: fix issue with saving new preferences of cleanup action

AgileReview-Project · Apr 18, 2015 · a3640f3 · a3640f3
1 parent 609f9ac
commit a3640f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/AgileReview/src/de/tukl/cs/softech/agilereview/preferences/AgileReviewPreferencePage.java b/AgileReview/src/de/tukl/cs/softech/agilereview/preferences/AgileReviewPreferencePage.java
@@ -108,32 +108,33 @@ protected boolean doCheckState() {
 		addField(booleanSmartSuggestionsField);
 
 		BorderedFieldEditor cleanupWrapper = new BorderedFieldEditor(getFieldEditorParent(), "Cleanup Action");
-		Composite container = cleanupWrapper.getContainer();
+		Composite cleanupContainer = cleanupWrapper.getContainer();
 		BooleanFieldEditor booleanCleanupDeleteComments = new BooleanFieldEditor(PropertiesManager.EXTERNAL_KEYS.CLEANUP_DELETE_COMMENTS,
-				"Delete Comments on Cleanup. Uncheck to delete only tags from source code.", container);
+				"Delete Comments on Cleanup. Uncheck to delete only tags from source code.", cleanupContainer);
 		cleanupWrapper.addField(booleanCleanupDeleteComments);
 
 		BooleanFieldEditor booleanIgnoreOpenComments = new BooleanFieldEditor(PropertiesManager.EXTERNAL_KEYS.CLEANUP_IGNORE_OPEN_COMMENTS,
-				"Ignore Comments with status 'open' on Cleanup", container);
+				"Ignore Comments with status 'open' on Cleanup", cleanupContainer);
 		cleanupWrapper.addField(booleanIgnoreOpenComments);
+		addField(cleanupWrapper);
 
 		// Grouping FieldEditor for export defaults
 		BorderedFieldEditor exportWrapper = new BorderedFieldEditor(getFieldEditorParent(), "Export Defaults");
-		container = exportWrapper.getContainer();
+		Composite exportContainer = exportWrapper.getContainer();
 
 		// Directory Browser for export folder
 		DirectoryFieldEditor directoryExportField = new DirectoryFieldEditor(PropertiesManager.EXTERNAL_KEYS.EXPORT_PATH, "Default XLS export location:",
-				container);
+				exportContainer);
 		exportWrapper.addField(directoryExportField);
 
 		// export template file
 		FileFieldEditor fileExportTemplateField = new FileFieldEditor(PropertiesManager.EXTERNAL_KEYS.TEMPLATE_PATH, "Default template for XLS export:",
-				container);
+				exportContainer);
 		fileExportTemplateField.setFileExtensions(new String[] { "*.xls;*.xlsx" });
 		exportWrapper.addField(fileExportTemplateField);
 
 		// export templates link
-		exportWrapper.addField(new LinkField(container, "Follow this <a>link</a> for downloading an example template.", pm
+		exportWrapper.addField(new LinkField(exportContainer, "Follow this <a>link</a> for downloading an example template.", pm
 				.getInternalProperty(PropertiesManager.INTERNAL_KEYS.URL_EXAMPLE_EXPORT_TEMPLATES)));
 
 		addField(exportWrapper);

diff --git a/AgileReview/src/de/tukl/cs/softech/agilereview/tools/PropertiesManager.java b/AgileReview/src/de/tukl/cs/softech/agilereview/tools/PropertiesManager.java
@@ -190,12 +190,12 @@ public static class EXTERNAL_KEYS {
 		/**
 		 * Indicate whether comments should be deleted on cleanup
 		 */
-		public static final String CLEANUP_DELETE_COMMENTS = "cleanupDeleteComments";
+		public static String CLEANUP_DELETE_COMMENTS = "cleanupDeleteComments";
 		/**
 		 * Indicates whether cleanup should only process closed or fixed
 		 * comments
 		 */
-		public static final String CLEANUP_IGNORE_OPEN_COMMENTS = "cleanupClosedCommentsOnly";
+		public static String CLEANUP_IGNORE_OPEN_COMMENTS = "cleanupIgnoreOpenComments";
 		/**
 		 * The color of the annotations
 		 */