Make methods internal to preferences protected

Author: James Hagborg

build.gradle

@@ -53,6 +53,10 @@ test {
     }
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 task sourcesJar(type: Jar, dependsOn: classes) {
     description 'Builds a jar file full of sources.'
     classifier = 'sources'

src/main/java/org/hyperonline/hyperlib/pref/BooleanPreference.java

@@ -32,7 +32,7 @@ public BooleanPreference(String name, boolean value) {
      * {@inheritDoc}
      */
     @Override
-    public synchronized boolean hasChanged() {
+    protected synchronized boolean hasChanged() {
         boolean newValue = get();
         boolean changed = newValue != m_lastValue;
         m_lastValue = newValue;
@@ -43,7 +43,7 @@ public synchronized boolean hasChanged() {
      * {@inheritDoc}
      */
     @Override
-    public void putDefaultValue() {
+    protected void putDefaultValue() {
         Preferences.getInstance().putBoolean(getName(), m_default);
     }
 

src/main/java/org/hyperonline/hyperlib/pref/DoublePreference.java

@@ -32,7 +32,7 @@ public DoublePreference(String name, double value) {
      * {@inheritDoc}
      */
     @Override
-    public synchronized boolean hasChanged() {
+    protected synchronized boolean hasChanged() {
         double newValue = get();
         boolean changed = newValue != m_lastValue;
         m_lastValue = newValue;
@@ -43,7 +43,7 @@ public synchronized boolean hasChanged() {
      * {@inheritDoc}
      */
     @Override
-    public void putDefaultValue() {
+    protected void putDefaultValue() {
         Preferences.getInstance().putDouble(getName(), m_default);
     }
 

src/main/java/org/hyperonline/hyperlib/pref/IntPreference.java

@@ -32,7 +32,7 @@ public IntPreference(String name, int value) {
      * {@inheritDoc}
      */
     @Override
-    public synchronized boolean hasChanged() {
+    protected synchronized boolean hasChanged() {
         int newValue = get();
         boolean changed = newValue != m_lastValue;
         m_lastValue = newValue;
@@ -43,7 +43,7 @@ public synchronized boolean hasChanged() {
      * {@inheritDoc}
      */
     @Override
-    public void putDefaultValue() {
+    protected void putDefaultValue() {
         Preferences.getInstance().putInt(getName(), m_default);
     }
 

src/main/java/org/hyperonline/hyperlib/pref/Preference.java

@@ -62,10 +62,10 @@ public synchronized void putDefaultIfEmpty() {
      * 
      * @return true if the value has changed, false otherwise
      */
-    abstract boolean hasChanged();
+    protected abstract boolean hasChanged();
 
     /**
      * Put an entry with the default value.
      */
-    abstract void putDefaultValue();
+    protected abstract void putDefaultValue();
 }

src/main/java/org/hyperonline/hyperlib/pref/ScalarPreference.java

@@ -13,52 +13,52 @@
  */
 public class ScalarPreference {
 
-	private List<DoublePreference> m_prefs = new ArrayList<>();
+    private List<DoublePreference> m_prefs = new ArrayList<>();
 
-	/**
-	 * Construct a scalar preference with the given name and components.
-	 * 
-	 * @param name
-	 *            The name of the preferences object.
-	 * @param components
-	 *            A sequence of letters indicating the components. For example,
-	 *            "RGB", "HSV", "XYZ", etc. It may be any length.
-	 * @param defaults
-	 * 			 Default settings for components
-	 */
-	public ScalarPreference(String name, String components, double... defaults) {
-		if (defaults.length != components.length()) {
-			throw new IllegalArgumentException("Components and defaults have different lengths");
-		}
+    /**
+     * Construct a scalar preference with the given name and components.
+     * 
+     * @param name
+     *            The name of the preferences object.
+     * @param components
+     *            A sequence of letters indicating the components. For example,
+     *            "RGB", "HSV", "XYZ", etc. It may be any length.
+     * @param defaults
+     *            Default settings for components
+     */
+    public ScalarPreference(String name, String components, double... defaults) {
+        if (defaults.length != components.length()) {
+            throw new IllegalArgumentException("Components and defaults have different lengths");
+        }
 
-		for (int i = 0; i < defaults.length; i++) {
-			String childName = name + PreferencesSet.SEPARATOR + components.charAt(i);
-			m_prefs.add(new DoublePreference(childName, defaults[i]));
-		}
-	}
+        for (int i = 0; i < defaults.length; i++) {
+            String childName = name + PreferencesSet.SEPARATOR + components.charAt(i);
+            m_prefs.add(new DoublePreference(childName, defaults[i]));
+        }
+    }
 
-	/**
-	 * Construct a scalar preference, while also updating the right info inside the
-	 * parent set.
-	 */
-	ScalarPreference(PreferencesSet parent, String name, String components, double[] defaults) {
-		if (defaults.length != components.length()) {
-			throw new IllegalArgumentException("Components and defaults have different lengths");
-		}
+    /**
+     * Construct a scalar preference, while also updating the right info inside
+     * the parent set.
+     */
+    ScalarPreference(PreferencesSet parent, String name, String components, double[] defaults) {
+        if (defaults.length != components.length()) {
+            throw new IllegalArgumentException("Components and defaults have different lengths");
+        }
 
-		for (int i = 0; i < defaults.length; i++) {
-			String childName = name + PreferencesSet.SEPARATOR + components.charAt(i);
-			m_prefs.add(parent.addDouble(childName, defaults[i]));
-		}
-	}
+        for (int i = 0; i < defaults.length; i++) {
+            String childName = name + PreferencesSet.SEPARATOR + components.charAt(i);
+            m_prefs.add(parent.addDouble(childName, defaults[i]));
+        }
+    }
 
-	/**
-	 * Get the current value of the preference.
-	 * 
-	 * @return The current value of the preference.
-	 */
-	public Scalar get() {
-		return new Scalar(m_prefs.stream().mapToDouble(DoublePreference::get).toArray());
-	}
+    /**
+     * Get the current value of the preference.
+     * 
+     * @return The current value of the preference.
+     */
+    public Scalar get() {
+        return new Scalar(m_prefs.stream().mapToDouble(DoublePreference::get).toArray());
+    }
 
 }