/*
 * Copyright (c) 2016, Stein Eldar Johnsen
 *
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package net.morimekta.config.source;

import net.morimekta.config.format.ConfigParser;
import net.morimekta.util.FileWatcher;

import java.io.File;

import static net.morimekta.config.util.ConfigUtil.getParserForName;

/**
 * File source for config objects that is updated with help from a file
 * watcher. If you want to have separate watcher that should react to the same
 * file, but trigger <b>after</b> the config is updated, then you need to
 * register that watcher <b>after</b> the supplier is created.
 *
 * <code>
 *     FileWatcher watcher = new FileWatcher();
 *     WatchedFileConfigSupplier supplier = new WatchedFileConfigSupplier(watcher, file);
 *     watcher.addWatcher(this::onConfigUpdate);
 * </code>
 *
 * Most likely you would want to register the watcher after your entire app has
 * been initialized, but that is another topic.
 */
public class WatchedFileConfigSupplier extends FileConfigSupplier {
    public WatchedFileConfigSupplier(FileWatcher watcher, File configFile) {
        this(watcher, configFile, getParserForName(configFile.getName()));
    }

    public WatchedFileConfigSupplier(FileWatcher watcher, File configFile, ConfigParser format) {
        super(configFile, format);
        watcher.startWatching(configFile);
        watcher.addWatcher(file -> {
            if (configFile.equals(configFile)) {
                reload();
            }
        });
    }
}

@@ -2064,51 +2064,8 @@
 t);%0A
-        watcher.startWatching(configFile);%0A
     
@@ -2131,23 +2131,17 @@
 .equals(
-configF
+f
 ile)) %7B%0A
@@ -2192,16 +2192,59 @@
     %7D);%0A
+        watcher.startWatching(configFile);%0A
     %7D%0A%7D%0A

Fix WatchedFileConfigSupplier.