notify onLoad and onApply separately

g3force · Oct 30, 2015 · 5b4b8c1 · 5b4b8c1
1 parent 49cc81e
commit 5b4b8c1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.g3force</groupId>
   <artifactId>configurable</artifactId>
-  <version>v1.4</version>
+  <version>v1.5</version>
   <name>configurable</name>
 
   <properties>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.github.g3force</groupId>
       <artifactId>String2ValueConverter</artifactId>
-      <version>v1.5</version>
+      <version>v1.6</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/com/github/g3force/configurable/AConfigClient.java b/src/main/java/com/github/g3force/configurable/AConfigClient.java
@@ -140,7 +140,19 @@ public void notifyLoadConfig()
 	{
 		for (IConfigObserver o : observers)
 		{
-			o.onLoad(config);
+			o.onLoad(this);
+		}
+	}
+
+
+	/**
+	 * @author Nicolai Ommer <nicolai.ommer@gmail.com>
+	 */
+	public void notifyAppliedConfig()
+	{
+		for (IConfigObserver o : observers)
+		{
+			o.afterApply(this);
 		}
 	}
 

diff --git a/src/main/java/com/github/g3force/configurable/ConfigClient.java b/src/main/java/com/github/g3force/configurable/ConfigClient.java
@@ -97,5 +97,6 @@ public void applyConfig()
 	{
 		cap.loadConfiguration(getCurrentConfig());
 		cap.applyAll();
+		notifyAppliedConfig();
 	}
 }
diff --git a/src/main/java/com/github/g3force/configurable/IConfigObserver.java b/src/main/java/com/github/g3force/configurable/IConfigObserver.java
@@ -8,9 +8,6 @@
  */
 package com.github.g3force.configurable;
 
-import org.apache.commons.configuration.HierarchicalConfiguration;
-
-
 /**
  * Used to observe a config client
  * 
@@ -19,7 +16,17 @@
 public interface IConfigObserver
 {
 	/**
-	 * @param newConfig
+	 * @param configClient
+	 */
+	default void afterApply(final IConfigClient configClient)
+	{
+	}
+
+
+	/**
+	 * @param configClient
 	 */
-	void onLoad(HierarchicalConfiguration newConfig);
+	default void onLoad(final IConfigClient configClient)
+	{
+	}
 }