Permalink
Browse files

Change :: to . in FQ class names

  • Loading branch information...
LadyCailin committed Oct 11, 2018
1 parent 51eb6e1 commit ee54b7da28fc46c2ed57518426ddbb899abc9075
Showing with 130 additions and 130 deletions.
  1. +2 −2 src/main/java/com/laytonsmith/core/constructs/CArray.java
  2. +2 −2 src/main/java/com/laytonsmith/core/constructs/CBoolean.java
  3. +6 −6 src/main/java/com/laytonsmith/core/constructs/CByteArray.java
  4. +2 −2 src/main/java/com/laytonsmith/core/constructs/CClassType.java
  5. +2 −2 src/main/java/com/laytonsmith/core/constructs/CClosure.java
  6. +2 −2 src/main/java/com/laytonsmith/core/constructs/CDecimal.java
  7. +2 −2 src/main/java/com/laytonsmith/core/constructs/CDouble.java
  8. +2 −2 src/main/java/com/laytonsmith/core/constructs/CIClosure.java
  9. +2 −2 src/main/java/com/laytonsmith/core/constructs/CInt.java
  10. +2 −2 src/main/java/com/laytonsmith/core/constructs/CMutablePrimitive.java
  11. +2 −2 src/main/java/com/laytonsmith/core/constructs/CNumber.java
  12. +2 −2 src/main/java/com/laytonsmith/core/constructs/CPackage.java
  13. +2 −2 src/main/java/com/laytonsmith/core/constructs/CPrimitive.java
  14. +2 −2 src/main/java/com/laytonsmith/core/constructs/CResource.java
  15. +2 −2 src/main/java/com/laytonsmith/core/constructs/CSecureString.java
  16. +2 −2 src/main/java/com/laytonsmith/core/constructs/CSlice.java
  17. +2 −2 src/main/java/com/laytonsmith/core/constructs/CString.java
  18. +1 −1 src/main/java/com/laytonsmith/core/constructs/NativeTypeList.java
  19. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREBadEntityException.java
  20. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREBadEntityTypeException.java
  21. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREBindException.java
  22. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRECastException.java
  23. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREEnchantmentException.java
  24. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREError.java
  25. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREEventException.java
  26. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREException.java
  27. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREFormatException.java
  28. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIOException.java
  29. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIllegalArgumentException.java
  30. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIncludeException.java
  31. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIndexOverflowException.java
  32. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInsufficientArgumentsException.java
  33. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInsufficientPermissionException.java
  34. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInvalidPluginException.java
  35. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInvalidProcedureException.java
  36. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInvalidWorldException.java
  37. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRELengthException.java
  38. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRENotFoundException.java
  39. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRENullPointerException.java
  40. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREOAuthException.java
  41. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREPlayerOfflineException.java
  42. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREPluginChannelException.java
  43. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREPluginInternalException.java
  44. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRERangeException.java
  45. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREReadOnlyException.java
  46. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRESQLException.java
  47. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREScoreboardException.java
  48. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CRESecurityException.java
  49. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREShellException.java
  50. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREStackOverflowError.java
  51. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREThrowable.java
  52. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREUnageableMobException.java
  53. +2 −2 src/main/java/com/laytonsmith/core/exceptions/CRE/CREUntameableMobException.java
  54. +2 −2 src/main/java/com/laytonsmith/core/natives/interfaces/ArrayAccess.java
  55. +2 −2 src/main/java/com/laytonsmith/core/natives/interfaces/Sizeable.java
  56. +8 −8 src/test/java/com/laytonsmith/core/MethodScriptCompilerTest.java
  57. +6 −6 src/test/java/com/laytonsmith/core/NewExceptionHandlingTest.java
  58. +1 −1 src/test/java/com/laytonsmith/core/OptimizationTest.java
  59. +1 −1 src/test/java/com/laytonsmith/core/functions/BasicLogicTest.java
  60. +1 −1 src/test/java/com/laytonsmith/testing/RandomTests.java
@@ -37,10 +37,10 @@
* For subclasses, the ArrayAccess methods are the most commonly overridden methods. There are several overloaded
* methods in this class, you need only to override the non-final ones for the same effect.
*/
@typeof("ms::lang::array")
@typeof("ms.lang.array")
public class CArray extends Construct implements ArrayAccess {
public static final CClassType TYPE = CClassType.get("ms::lang::array");
public static final CClassType TYPE = CClassType.get("ms.lang.array");
private boolean associativeMode = false;
private long nextIndex = 0;
private List<Construct> array;
@@ -10,11 +10,11 @@
/**
* Represents a MethodScript boolean.
*/
@typeof("ms::lang::boolean")
@typeof("ms.lang.boolean")
public final class CBoolean extends CPrimitive implements Cloneable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::boolean");
public static final CClassType TYPE = CClassType.get("ms.lang.boolean");
public static final long serialVersionUID = 1L;
@@ -23,11 +23,11 @@
*
*
*/
@typeof("ms::lang::byte_array")
@typeof("ms.lang.byte_array")
public class CByteArray extends CArray implements Sizeable, ArrayAccess {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::byte_array");
public static final CClassType TYPE = CClassType.get("ms.lang.byte_array");
/**
* Initial size of the ByteBuffer
@@ -524,11 +524,11 @@ public Version since() {
/**
* This is a more efficient implementation of CArray for the backing byte arrays.
*/
@typeof("ms::lang::ByteBackingArray")
@typeof("ms.lang.ByteBackingArray")
private static class CArrayByteBacking extends CArray {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::ByteBackingArray");
public static final CClassType TYPE = CClassType.get("ms.lang.ByteBackingArray");
private final byte[] backing;
private String value = null;
@@ -626,11 +626,11 @@ public CClassType getContainingClass() {
return CByteArray.TYPE;
}
@typeof("ms::lang::ByteArrayReadOnlyException")
@typeof("ms.lang.ByteArrayReadOnlyException")
public static class CREByteArrayReadOnlyException extends CREReadOnlyException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::ByteArrayReadOnlyException");
public static final CClassType TYPE = CClassType.get("ms.lang.ByteArrayReadOnlyException");
public CREByteArrayReadOnlyException(java.lang.String msg, com.laytonsmith.core.constructs.Target t) {
super(msg, t);
@@ -21,14 +21,14 @@
/**
*
*/
@typeof("ms::lang::ClassType")
@typeof("ms.lang.ClassType")
public final class CClassType extends Construct {
public static final String PATH_SEPARATOR = "::";
private static final Map<String, CClassType> CACHE = new HashMap<>();
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = new CClassType("ms::lang::ClassType", Target.UNKNOWN);
public static final CClassType TYPE = new CClassType("ms.lang.ClassType", Target.UNKNOWN);
public static final CClassType AUTO = new CClassType("auto", Target.UNKNOWN);
public static final CClassType VOID = new CClassType("void", Target.UNKNOWN);
@@ -27,7 +27,7 @@
*
*
*/
@typeof("ms::lang::closure")
@typeof("ms.lang.closure")
public class CClosure extends Construct {
public static final long serialVersionUID = 1L;
@@ -39,7 +39,7 @@
protected final CClassType returnType;
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::closure");
public static final CClassType TYPE = CClassType.get("ms.lang.closure");
public CClosure(ParseTree node, Environment env, CClassType returnType, String[] names, Construct[] defaults, CClassType[] types, Target t) {
super(node != null ? node.toString() : "", ConstructType.CLOSURE, t);
@@ -10,11 +10,11 @@
*
* @author cailin
*/
@typeof("ms::lang::decimal")
@typeof("ms.lang.decimal")
public class CDecimal extends CPrimitive implements Cloneable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::decimal");
public static final CClassType TYPE = CClassType.get("ms.lang.decimal");
private final BigDecimal val;
@@ -9,11 +9,11 @@
*
*
*/
@typeof("ms::lang::double")
@typeof("ms.lang.double")
public class CDouble extends CNumber implements Cloneable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::double");
public static final CClassType TYPE = CClassType.get("ms.lang.double");
public static final long serialVersionUID = 1L;
final double val;
@@ -23,11 +23,11 @@
/**
*
*/
@typeof("ms::lang::iclosure")
@typeof("ms.lang.iclosure")
public class CIClosure extends CClosure {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::iclosure");
public static final CClassType TYPE = CClassType.get("ms.lang.iclosure");
public CIClosure(ParseTree node, Environment env, CClassType returnType, String[] names, Construct[] defaults, CClassType[] types, Target t) {
super(node, env, returnType, names, defaults, types, t);
@@ -9,11 +9,11 @@
*
*
*/
@typeof("ms::lang::int")
@typeof("ms.lang.int")
public class CInt extends CNumber implements Cloneable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::int");
public static final CClassType TYPE = CClassType.get("ms.lang.int");
public static final long serialVersionUID = 1L;
final long val;
@@ -13,11 +13,11 @@
/**
*
*/
@typeof("ms::lang::mutable_primitive")
@typeof("ms.lang.mutable_primitive")
public class CMutablePrimitive extends CArray implements Sizeable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::mutable_primitive");
public static final CClassType TYPE = CClassType.get("ms.lang.mutable_primitive");
private Construct value = CNull.NULL;
@@ -7,11 +7,11 @@
/**
*
*/
@typeof("ms::lang::number")
@typeof("ms.lang.number")
public abstract class CNumber extends CPrimitive {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::number");
public static final CClassType TYPE = CClassType.get("ms.lang.number");
public CNumber(String value, ConstructType type, Target t) {
super(value, type, t);
@@ -14,11 +14,11 @@
*
* @author Cailin
*/
@typeof("ms::lang::Package")
@typeof("ms.lang.Package")
public class CPackage extends Construct {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::Package");
public static final CClassType TYPE = CClassType.get("ms.lang.Package");
public CPackage(Target t, String... parts) {
super(StringUtils.Join(parts, CClassType.PATH_SEPARATOR), Construct.ConstructType.IDENTIFIER, t);
@@ -7,11 +7,11 @@
/**
*
*/
@typeof("ms::lang::primitive")
@typeof("ms.lang.primitive")
public abstract class CPrimitive extends Construct {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::primitive");
public static final CClassType TYPE = CClassType.get("ms.lang.primitive");
public CPrimitive(String value, ConstructType type, Target t) {
super(value, type, t);
@@ -12,11 +12,11 @@
* slightly more complicated. Therefore, this is a stopgap measure that WILL be removed at some point, once Objects are
* created.
*/
@typeof("ms::lang::resource")
@typeof("ms.lang.resource")
public class CResource<T> extends Construct {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::resource");
public static final CClassType TYPE = CClassType.get("ms.lang.resource");
private static final AtomicLong RESOURCE_POOL = new AtomicLong(0);
@@ -28,11 +28,11 @@
*
* @author cailin
*/
@typeof("ms::lang::secure_string")
@typeof("ms.lang.secure_string")
public class CSecureString extends CString {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::secure_string");
public static final CClassType TYPE = CClassType.get("ms.lang.secure_string");
private byte[] encrypted;
private Cipher decrypter;
@@ -19,11 +19,11 @@
*
*
*/
@typeof("ms::lang::slice")
@typeof("ms.lang.slice")
public class CSlice extends CArray {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::slice");
public static final CClassType TYPE = CClassType.get("ms.lang.slice");
private long start;
private long finish;
@@ -16,11 +16,11 @@
*
*
*/
@typeof("ms::lang::string")
@typeof("ms.lang.string")
public class CString extends CPrimitive implements Cloneable, ArrayAccess {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::string");
public static final CClassType TYPE = CClassType.get("ms.lang.string");
public CString(String value, Target t) {
super(value == null ? "" : value, ConstructType.STRING, t);
@@ -36,7 +36,7 @@ public static String resolveType(String simpleName) {
// namespaces, then it would only find the first one, rather than causing an error, which is
// the correct behavior when it's ambiguous. This is the same thing for user classes as well,
// once those are added.
Set<String> defaultPackages = new HashSet<>(Arrays.asList("", "ms::lang::", "com::commandhelper::"));
Set<String> defaultPackages = new HashSet<>(Arrays.asList("", "ms.lang.", "com.commandhelper."));
for(String pack : defaultPackages) {
for(String type : nativeTypes) {
if((pack + simpleName).equals(type)) {
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("com::commandhelper::BadEntityException")
@typeof("com.commandhelper.BadEntityException")
public class CREBadEntityException extends CREException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("com::commandhelper::BadEntityException");
public static final CClassType TYPE = CClassType.get("com.commandhelper.BadEntityException");
public CREBadEntityException(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("com::commandhelper::BadEntityTypeException")
@typeof("com.commandhelper.BadEntityTypeException")
public class CREBadEntityTypeException extends CREException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("com::commandhelper::BadEntityTypeException");
public static final CClassType TYPE = CClassType.get("com.commandhelper.BadEntityTypeException");
public CREBadEntityTypeException(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("ms::lang::BindException")
@typeof("ms.lang.BindException")
public class CREBindException extends CREException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::BindException");
public static final CClassType TYPE = CClassType.get("ms.lang.BindException");
public CREBindException(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("ms::lang::CastException")
@typeof("ms.lang.CastException")
public class CRECastException extends CREException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::CastException");
public static final CClassType TYPE = CClassType.get("ms.lang.CastException");
public CRECastException(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("com::commandhelper::EnchantmentException")
@typeof("com.commandhelper.EnchantmentException")
public class CREEnchantmentException extends CREException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("com::commandhelper::EnchantmentException");
public static final CClassType TYPE = CClassType.get("com.commandhelper.EnchantmentException");
public CREEnchantmentException(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("ms::lang::Error")
@typeof("ms.lang.Error")
public class CREError extends CREThrowable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::Error");
public static final CClassType TYPE = CClassType.get("ms.lang.Error");
public CREError(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("ms::lang::EventException")
@typeof("ms.lang.EventException")
public class CREEventException extends CREException {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::EventException");
public static final CClassType TYPE = CClassType.get("ms.lang.EventException");
public CREEventException(String msg, Target t) {
super(msg, t);
@@ -9,11 +9,11 @@
/**
*
*/
@typeof("ms::lang::Exception")
@typeof("ms.lang.Exception")
public class CREException extends CREThrowable {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
public static final CClassType TYPE = CClassType.get("ms::lang::Exception");
public static final CClassType TYPE = CClassType.get("ms.lang.Exception");
public CREException(String msg, Target t) {
super(msg, t);
Oops, something went wrong.

0 comments on commit ee54b7d

Please sign in to comment.