Refactoring

The main refactoring here is removing the type field from the various
classes, but there are a few other smaller ones.

This also contains the grounds for a refactoring on variable use

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java
index 2487c83..154ea68 100644
--- a/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java
+++ b/src/main/java/bjc/rgens/parser/templates/LiveTemplateElement.java
@@ -20,7 +20,7 @@ public class LiveTemplateElement extends TemplateElement {
 	public final List<List<CaseElement>> elements;
 
 	public LiveTemplateElement(String val) {
-		super(ElementType.TEMPLATE);
+		super(true);
 
 		elements = new ArrayList<>();
 
@@ -52,7 +52,7 @@ public class LiveTemplateElement extends TemplateElement {
 			for(CaseElement elm : elmList) {
 				elm.generate(state);
 
-				if(doSpacing && elm.type.spacing)
+				if(doSpacing && elm.spacing)
 					state.contents.append(" ");
 			}
 		}