From b4aaff683d78ab92b83f3a7257c33b8e27d1affa Mon Sep 17 00:00:00 2001
From: Thog
Date: Tue, 7 Mar 2017 21:24:39 +0100
Subject: Drop unix case style and implement hashCode when equals is overrided

Also update Guava to version 21
---
 src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java | 6 +++---
 src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/test/java/cuchaz/enigma/inputs/inheritanceTree')

diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
index d676ba2..1b1f369 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
@@ -14,16 +14,16 @@ package cuchaz.enigma.inputs.inheritanceTree;
 public abstract class BaseClass {
 	
 	// a
-	private String m_name;
+	private String name;
 	
 	// <init>(Ljava/lang/String;)V
 	protected BaseClass(String name) {
-		m_name = name;
+		this.name = name;
 	}
 	
 	// a()Ljava/lang/String;
 	public String getName() {
-		return m_name;
+		return name;
 	}
 	
 	// a()V
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
index 751fdd1..6d3b0d0 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
+++ b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
@@ -14,7 +14,7 @@ package cuchaz.enigma.inputs.inheritanceTree;
 public class SubclassB extends BaseClass {
 	
 	// a
-	private int m_numThings;
+	private int numThings;
 	
 	// <init>()V
 	protected SubclassB() {
@@ -22,7 +22,7 @@ public class SubclassB extends BaseClass {
 		super("B");
 		
 		// access to a
-		m_numThings = 4;
+		numThings = 4;
 	}
 	
 	@Override
@@ -35,6 +35,6 @@ public class SubclassB extends BaseClass {
 	// b()V
 	public void doBThings() {
 		// access to a
-		System.out.println("" + m_numThings + " B things!");
+		System.out.println("" + numThings + " B things!");
 	}
 }
-- 
cgit v1.2.3