#20

CHANGELOG

 1.1:
+	31 Oct 2015
+	Bugfix (Issue #20)
+	An active view has always been reloaded after closing the settings dialog, even if no settings had been modified. Now an active view is only reloaded if at least one of the settings has been modified.
+
 	31 Oct 2015
 	Feature (Issue #19)
 	A switch within the settings allows to enable case sensitivity within the filter masks.

src/main/java/kieker/diagnosis/controller/MainController.java

@@ -58,6 +58,7 @@ import kieker.diagnosis.controller.settings.SettingsDialogViewController;
 import kieker.diagnosis.controller.traces.TracesViewController;
 import kieker.diagnosis.domain.OperationCall;
 import kieker.diagnosis.model.DataModel;
+import kieker.diagnosis.model.PropertiesModel;
 import kieker.diagnosis.util.Context;
 import kieker.diagnosis.util.ContextEntry;
 import kieker.diagnosis.util.ContextKey;
@@ -160,10 +161,14 @@ public final class MainController {
 
 	@ErrorHandling
 	public void showSettings() throws Exception {
+		final long propertiesVersionPre = PropertiesModel.getInstance().getVersion();
 		this.loadDialogPane(SettingsDialogViewController.class);
 
 		if (this.activeController.isPresent()) {
-			this.loadPane(this.activeController.get());
+			final long propertiesVersionPost = PropertiesModel.getInstance().getVersion();
+			if (propertiesVersionPre != propertiesVersionPost) {
+				this.loadPane(this.activeController.get());
+			}
 		}
 	}
 

src/main/java/kieker/diagnosis/model/PropertiesModel.java

@@ -59,6 +59,8 @@ public final class PropertiesModel {
 	private String gitLabURL;
 	private String tracURL;
 
+	private long version = 0L;
+
 	public PropertiesModel() {
 		this.loadSettings();
 	}
@@ -105,6 +107,8 @@ public final class PropertiesModel {
 		} catch (final BackingStoreException e) {
 			PropertiesModel.LOGGER.error(e);
 		}
+
+		version++;
 	}
 
 	public String getGraphvizPath() {
@@ -197,6 +201,10 @@ public final class PropertiesModel {
 		this.caseSensitive = caseSensitive;
 	}
 
+	public long getVersion() {
+		return version;
+	}
+
 	/**
 	 * @author Nils Christian Ehmke
 	 */