Add deprecation to all subclass methods as well

Author: LadyCailin

src/main/java/com/laytonsmith/core/constructs/CArray.java

@@ -182,6 +182,7 @@ private static Mixed[] getArray(Collection<Mixed> items) {
 		return c;
 	}
 
+	/** @deprecated Use {@link #asList(Environment)} instead. */
 	@Deprecated
 	public List<Mixed> asList() {
 		return asList(null);
@@ -229,6 +230,7 @@ public static CArray GetAssociativeArray(Target t) {
 		return GetAssociativeArray(t, null, null);
 	}
 
+	/** @deprecated Use {@link #GetAssociativeArray(Target, GenericParameters, Environment, Mixed[])} instead. */
 	@Deprecated
 	public static CArray GetAssociativeArray(Target t, Mixed[] args) {
 		return GetAssociativeArray(t, null, null, args);
@@ -286,6 +288,7 @@ public void reverse(Target t) {
 		}
 	}
 
+	/** @deprecated Use {@link #push(Mixed, Target, Environment)} instead. */
 	@Deprecated
 	public final void push(Mixed c, Target t) {
 		push(c, t, null);
@@ -306,6 +309,7 @@ public final void push(String s) {
 		push(new CString(s, Target.UNKNOWN), Target.UNKNOWN);
 	}
 
+	/** @deprecated Use {@link #push(Mixed, Integer, Target, Environment)} instead. */
 	@Deprecated
 	public void push(Mixed c, Integer index, Target t) throws IllegalArgumentException, IndexOutOfBoundsException {
 		push(c, index, t, null);
@@ -356,6 +360,8 @@ public void push(Mixed c, Integer index, Target t, Environment env) throws Illeg
 		setDirty();
 	}
 
+	/** @deprecated Use {@link #keySet(Environment)} instead. */
+	@Deprecated
 	@Override
 	public Set<Mixed> keySet() {
 		return keySet(null);
@@ -412,6 +418,7 @@ private void setAssociative() {
 		array = null; // null out the original array container so it can be GC'd
 	}
 
+	/** @deprecated Use {@link #set(Mixed, Mixed, Target, Environment)} instead. */
 	@Deprecated
 	public void set(Mixed index, Mixed c, Target t) {
 		set(index, c, t, null);
@@ -457,6 +464,7 @@ public void set(Mixed index, Mixed c, Target t, Environment env) {
 		setDirty();
 	}
 
+	/** @deprecated Use {@link #set(int, Mixed, Target, Environment)} instead. */
 	@Deprecated
 	public final void set(int index, Mixed c, Target t) {
 		this.set(index, c, t, null);
@@ -467,6 +475,7 @@ public final void set(int index, Mixed c, Target t, Environment env) {
 	}
 
 	/* Shortcuts */
+	/** @deprecated Use {@link #set(String, Mixed, Target, Environment)} instead. */
 	@Deprecated
 	public final void set(String index, Mixed c, Target t) {
 		set(index, c, t, null);
@@ -476,6 +485,7 @@ public final void set(String index, Mixed c, Target t, Environment env) {
 		set(new CString(index, t), c, t, env);
 	}
 
+	/** @deprecated Use {@link #set(String, String, Target, Environment)} instead. */
 	@Deprecated
 	public final void set(String index, String value, Target t) {
 		set(index, value, t, null);
@@ -485,6 +495,7 @@ public final void set(String index, String value, Target t, Environment env) {
 		set(index, new CString(value, t), t, env);
 	}
 
+	/** @deprecated Use {@link #set(String, String, Environment)} instead. */
 	@Deprecated
 	public final void set(String index, String value) {
 		set(index, value, (Environment) null);
@@ -502,6 +513,8 @@ public final void set(String index, long value) {
 		set(index, new CInt(value, Target.UNKNOWN), Target.UNKNOWN);
 	}
 
+	/** @deprecated Use {@link #get(Mixed, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed get(Mixed index, Target t) {
 		return get(index, t, null);
@@ -535,6 +548,8 @@ public final Mixed get(long index, Target t) {
 		return this.get(new CInt(index, t), t);
 	}
 
+	/** @deprecated Use {@link #get(int, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public final Mixed get(int index, Target t) {
 		return this.get(new CInt(index, t), t);
@@ -545,6 +560,8 @@ public final Mixed get(int index, Target t, Environment env) {
 		return this.get(new CInt(index, t), t, env);
 	}
 
+	/** @deprecated Use {@link #get(String, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public final Mixed get(String index, Target t) {
 		return this.get(new CString(index, t), t);
@@ -587,6 +604,7 @@ public final boolean contains(int i) {
 		return contains(new CString(Integer.toString(i), Target.UNKNOWN));
 	}
 
+	/** @deprecated Use {@link #indexesOf(Mixed, Environment)} instead. */
 	@Deprecated
 	public CArray indexesOf(Mixed value) {
 		return indexesOf(value, null);
@@ -697,6 +715,8 @@ protected String getString(Stack<CArray> arrays, Target t) {
 		return mutVal;
 	}
 
+	/** @deprecated Use {@link #size(Environment)} instead. */
+	@Deprecated
 	@Override
 	public long size() {
 		return size(null);
@@ -731,6 +751,7 @@ public CArray clone() {
 		return clone;
 	}
 
+	/** @deprecated Use {@link #deepClone(Target, Environment)} instead. */
 	@Deprecated
 	public CArray deepClone(Target t) {
 		return deepClone(t, null);
@@ -740,6 +761,7 @@ public CArray deepClone(Target t, Environment env) {
 		return deepClone(this, t, new ArrayList<>(), env);
 	}
 
+	/** @deprecated Use {@link #deepClone(CArray, Target, ArrayList, Environment)} instead. */
 	@Deprecated
 	protected CArray deepClone(CArray array, Target t, ArrayList<CArray[]> cloneRefs) {
 		return deepClone(array, t, cloneRefs, null);
@@ -790,6 +812,7 @@ private String normalizeConstruct(Mixed c) {
 		}
 	}
 
+	/** @deprecated Use {@link #remove(int, Environment)} instead. */
 	@Deprecated
 	public Mixed remove(int i) {
 		return remove(i, null);
@@ -806,6 +829,7 @@ public Mixed remove(int i, Environment env) {
 		return remove(new CInt(i, Target.UNKNOWN), env);
 	}
 
+	/** @deprecated Use {@link #remove(String, Environment)} instead. */
 	@Deprecated
 	public Mixed remove(String s) {
 		return remove(s, null);
@@ -822,6 +846,7 @@ public Mixed remove(String s, Environment env) {
 		return remove(new CString(s, Target.UNKNOWN), env);
 	}
 
+	/** @deprecated Use {@link #remove(Mixed, Environment)} instead. */
 	@Deprecated
 	public Mixed remove(Mixed construct) {
 		return remove(construct, null);
@@ -884,6 +909,7 @@ public void removeValues(Mixed construct) {
 		setDirty();
 	}
 
+	/** @deprecated Use {@link #createNew(Target, Environment)} instead. */
 	@Deprecated
 	public CArray createNew(Target t) {
 		return createNew(t, null);
@@ -954,6 +980,8 @@ public boolean canBeAssociative() {
 		return true;
 	}
 
+	/** @deprecated Use {@link #slice(int, int, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed slice(int begin, int end, Target t) {
 		return slice(begin, end, t, null);
@@ -1004,6 +1032,7 @@ public enum ArraySortType {
 		STRING_IC
 	}
 
+	/** @deprecated Use {@link #sort(ArraySortType, Environment)} instead. */
 	@Deprecated
 	public void sort(final ArraySortType sort) {
 		sort(sort, null);
@@ -1094,6 +1123,7 @@ public int compareString(String o1, String o2) {
 		this.setDirty();
 	}
 
+	/** @deprecated Use {@link #isEmpty(Environment)} instead. */
 	@Deprecated
 	public boolean isEmpty() {
 		return isEmpty(null);
@@ -1134,9 +1164,11 @@ public CClassType[] getInterfaces() {
 			ArrayAccessSet.TYPE};
 	}
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return size() > 0;
+		return getBooleanValue(null, t);
 	}
 
 	@Override

src/main/java/com/laytonsmith/core/constructs/CBoolean.java

@@ -90,6 +90,8 @@ public boolean getBoolean() {
 		return val;
 	}
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
 		return getBooleanValue(null, t);

src/main/java/com/laytonsmith/core/constructs/CClassType.java

@@ -592,6 +592,8 @@ public CClassType typeof() {
 
 	// TODO: These getters will eventually be re-done to support static methods, but for now that is out of scope,
 	// so we just specifically support enums for now.
+	/** @deprecated Use {@link #get(String, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed get(String index, Target t) throws ConfigRuntimeException {
 		return get(index, t, null);
@@ -609,6 +611,8 @@ public Mixed get(String index, Target t, Environment env) throws ConfigRuntimeEx
 		throw new CREUnsupportedOperationException("Unsupported operation", t);
 	}
 
+	/** @deprecated Use {@link #get(int, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed get(int index, Target t) throws ConfigRuntimeException {
 		return get(index, t, null);
@@ -626,6 +630,8 @@ public Mixed get(int index, Target t, Environment env) throws ConfigRuntimeExcep
 		throw new CREUnsupportedOperationException("Unsupported operation", t);
 	}
 
+	/** @deprecated Use {@link #get(Mixed, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed get(Mixed index, Target t) throws ConfigRuntimeException {
 		return get(index, t, null);
@@ -643,6 +649,8 @@ public Mixed get(Mixed index, Target t, Environment env) throws ConfigRuntimeExc
 		throw new CREUnsupportedOperationException("Unsupported operation", t);
 	}
 
+	/** @deprecated Use {@link #keySet(Environment)} instead. */
+	@Deprecated
 	@Override
 	public Set<Mixed> keySet() {
 		return keySet(null);
@@ -660,6 +668,8 @@ public Set<Mixed> keySet(Environment env) {
 		return new HashSet<>();
 	}
 
+	/** @deprecated Use {@link #size(Environment)} instead. */
+	@Deprecated
 	@Override
 	public long size() {
 		return size(null);
@@ -687,6 +697,8 @@ public boolean canBeAssociative() {
 		return true;
 	}
 
+	/** @deprecated Use {@link #slice(int, int, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed slice(int begin, int end, Target t) {
 		return slice(begin, end, t, null);
@@ -707,6 +719,8 @@ public Class<? extends Mixed> getNativeType() {
 		return nativeClass;
 	}
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
 		return getBooleanValue(null, t);

src/main/java/com/laytonsmith/core/constructs/CClosure.java

@@ -350,6 +350,8 @@ public CClassType[] getInterfaces() {
 		return new CClassType[]{Callable.TYPE, Booleanish.TYPE};
 	}
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
 		return getBooleanValue(null, t);

src/main/java/com/laytonsmith/core/constructs/CDecimal.java

@@ -84,6 +84,8 @@ public CDecimal duplicate() {
 		return new CDecimal(val, getTarget());
 	}
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
 		return getBooleanValue(null, t);

src/main/java/com/laytonsmith/core/constructs/CMutablePrimitive.java

@@ -54,6 +54,8 @@ public void set(Mixed value, Target t) {
 		this.value = value;
 	}
 
+	/** @deprecated Use {@link #set(Mixed, Mixed, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public void set(Mixed index, Mixed c, Target t) {
 		set(index, c, t, null);
@@ -82,6 +84,8 @@ public Mixed get() {
 		return value;
 	}
 
+	/** @deprecated Use {@link #get(Mixed, Target, Environment)} instead. */
+	@Deprecated
 	@Override
 	public Mixed get(Mixed index, Target t) {
 		return get(index, t, null);
@@ -112,6 +116,8 @@ protected String getQuote() {
 		return new CString(value.val(), Target.UNKNOWN).getQuote();
 	}
 
+	/** @deprecated Use {@link #size(Environment)} instead. */
+	@Deprecated
 	@Override
 	public long size() {
 		return size(null);

src/main/java/com/laytonsmith/core/constructs/CNull.java

@@ -107,6 +107,8 @@ public CClassType[] getInterfaces() {
 		throw new RuntimeException("Cannot call getInterfaces on null");
 	}
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
 		return getBooleanValue(null, t);

src/main/java/com/laytonsmith/core/constructs/CNumber.java

@@ -42,6 +42,8 @@ public Version since() {
 
 	public abstract double getNumber();
 
+	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
 		return getBooleanValue(null, t);