Fixed two bugs, adding and reading already read results

src/Analyser.java

@@ -6,59 +6,59 @@
 import java.util.Map;
 
 public abstract class Analyser {
-	
+
 	private int minSplit = 0;
 	private int maxSplit = 0;
 	private String text;
 	public static Map<Integer, DataGroup> filteredData = new HashMap<Integer, DataGroup>();
 	private int lineNum = 0;
-	
+
 	public void setMinSplit(int paramMinSplit){
 		minSplit = paramMinSplit;
 	}
-	
+
 	public int getMinSplit(){
 		return minSplit;
 	}
-	
+
 	public void setMaxSplit(int paramMaxSplit){
 		maxSplit = paramMaxSplit;
 	}
-	
+
 	public int getMaxSplit(){
 		return maxSplit;
 	}
-	
+
 	public void setText(String paramText){
 		text = paramText;
 	}
-	
+
 	public String getText(){
 		return text;
 	}
-	
+
 	public void setLineNum(int paramLineNum){
 		lineNum = paramLineNum;
 	}
-	
+
 	public int getLineNum(){
 		return lineNum;
 	}
-	
+
 	public boolean isComment(String paramString){
 		if (paramString.startsWith("#") || paramString.startsWith("//") || paramString.trim().equals("")){
 			return true;
 		}
 		return false;
 	}
-	
+
 	public static DataGroup getDataGroupFromLineNum(int paramLineNum){
 		return filteredData.get(paramLineNum);
 	}
 	public abstract void startAnalysing();
-	
+
 	public abstract void setup();
-	
+
 	public abstract String[] fixNullWithDefault(String[] paramStringArray);
-	
+
 }

src/CanarySyntaxCheckerListener.java

@@ -29,12 +29,21 @@ public CanarySyntaxCheckerListener(CanarySyntaxChecker paramInstance){
 
 	public void actionPerformed(ActionEvent event) {
 		if (event.getSource().equals(instance.menuItem_Add)){
-			currText = JOptionPane.showInputDialog(null, "Enter text:");
-			instance.textArea.append(currText + "\n");
+			if (instance.textArea.isEditable()){
+				currText = JOptionPane.showInputDialog(null, "Enter text:");
+				instance.textArea.append(currText + "\n");
+			} else {
+				JOptionPane.showMessageDialog(null, "You can't add a line to read results! Click Text - Clear Text to start adding text again.");
+			}
+
 		} else if (event.getSource().equals(instance.menuItem_Clear)){
 			instance.textArea.setText("");
 			instance.textArea.setEditable(true);
 		} else if (event.getSource().equals(instance.menuItem_Groups)){
+			if (!instance.textArea.isEditable()){
+				JOptionPane.showMessageDialog(null, "You may not read the results of a read action! Click Text - Clear Text to start adding text again.");
+				return;
+			}
 			if (instance.textArea.getText().trim().equalsIgnoreCase("")){
 				instance.textArea.setText("Please enter data!");
 				return;
@@ -60,6 +69,10 @@ public void actionPerformed(ActionEvent event) {
 			}// end for
 			instance.textArea.setEditable(false);
 		} else if (event.getSource().equals(instance.menuItem_Users)){
+			if (!instance.textArea.isEditable()){
+				JOptionPane.showMessageDialog(null, "You may not read the results of a read action! Click Text - Clear Text to start adding text again.");
+				return;
+			}
 			if (instance.textArea.getText().trim().equalsIgnoreCase("")){
 				instance.textArea.setText("Please enter data!");
 				return;
@@ -90,7 +103,7 @@ public void actionPerformed(ActionEvent event) {
 		} else if (event.getSource().equals(instance.menuItem_About)){
 			JOptionPane.showMessageDialog(null, "CanarySyntaxChecker v:1.1 \n\nAuthor: WWOL (Brian McCarthy) \n");
 		} else if (event.getSource().equals(instance.menuItem_Change)){
-			JOptionPane.showMessageDialog(null, "Changelog:\n1.1 - \nText area editing, \nReading with no text check, \nHelp, About and Change Log menu items, \nFixed spelling, \n\n1.0 - \nInitial release,");
+			JOptionPane.showMessageDialog(null, "Changelog:\n1.2 - \nFixing bugs, \nReading allready read results, \nAdding a line to results,\n1.1 - \nText area editing, \nReading with no text check, \nHelp, About and Change Log menu items, \nFixed spelling, \n\n1.0 - \nInitial release,");
 		}
 	}// end actionPerformed
 }// end CanarySyntaxCheckerListener

src/DataGroup.java

@@ -70,11 +70,11 @@ public void setIP(String paramIP){
 	public String getIP(){
 		return IP;
 	}
-	
+
 	public void setGroup(String paramGroup){
 		group = paramGroup;
 	}
-	
+
 	public String getGroup(){
 		return group;
 	}

src/GroupAnalyser.java

@@ -4,11 +4,11 @@
 
 public class GroupAnalyser extends Analyser{
 	DataGroup currDataGroup = null;
-	
+
 	public GroupAnalyser(String paramText){
 		setText(paramText);
 	}
-	
+
 	public void startAnalysing() {
 		String[] stringArray = getText().split("\n");
 		for (String line : stringArray){
@@ -38,7 +38,7 @@ public void setup() {
 		setMinSplit(2);
 		setMaxSplit(5);
 	}
-	
+
 	public String[] fixNullWithDefault(String[] paramStringArray){
 		String[] toRet = new String[6];
 		if (paramStringArray.length < 1) {
@@ -47,28 +47,28 @@ public String[] fixNullWithDefault(String[] paramStringArray){
 		} else {
 			toRet[0] = paramStringArray[0];
 		}
-		
+
 		if (paramStringArray.length < 2) {
 			toRet[1] = "No Prefix!";
 			currDataGroup.setValidity(Validity.INFO);
 		} else {
 			toRet[1] = paramStringArray[1];
 		}
-		
+
 		if (paramStringArray.length < 3) {
 			toRet[2] = "No Commands!";
 			currDataGroup.setValidity(Validity.INFO);
 		} else {
 			toRet[2] = paramStringArray[2];
 		}
-		
+
 		if (paramStringArray.length < 4) {
 			toRet[3] = "No Inheritance!";
 			currDataGroup.setValidity(Validity.WARNING);
 		} else {
 			toRet[3] = paramStringArray[3];
 		}
-		
+
 		if (paramStringArray.length < 5) {
 			toRet[4] = "No Admin Flag!";
 			currDataGroup.setValidity(Validity.INFO);

src/UserAnalyser.java

@@ -4,11 +4,11 @@
 
 public class UserAnalyser extends Analyser{
 	DataGroup currDataGroup = null;
-	
+
 	public UserAnalyser(String paramText){
 		setText(paramText);
 	}
-	
+
 	public void startAnalysing() {
 		String[] stringArray = getText().split("\n");
 		for (String line : stringArray){
@@ -47,35 +47,35 @@ public String[] fixNullWithDefault(String[] paramStringArray) {
 		} else {
 			toRet[0] = paramStringArray[0];
 		}
-		
+
 		if (paramStringArray.length < 2) {
 			toRet[1] = "No Group!";
 			currDataGroup.setValidity(Validity.ERROR);
 		} else {
 			toRet[1] = paramStringArray[1];
 		}
-		
+
 		if (paramStringArray.length < 3) {
 			toRet[2] = "No Admin Flag!";
 			currDataGroup.setValidity(Validity.OK);
 		} else {
 			toRet[2] = paramStringArray[2];
 		}
-		
+
 		if (paramStringArray.length < 4) {
 			toRet[3] = "No Prefix!";
 			currDataGroup.setValidity(Validity.OK);
 		} else {
 			toRet[3] = paramStringArray[3];
 		}
-		
+
 		if (paramStringArray.length < 5) {
 			toRet[4] = "No Commands!!";
 			currDataGroup.setValidity(Validity.OK);
 		} else {
 			toRet[4] = paramStringArray[4];
 		}
-		
+
 		if (paramStringArray.length < 6) {
 			toRet[5] = "No IP!";
 			currDataGroup.setValidity(Validity.OK);

src/Validity.java

@@ -8,13 +8,13 @@ public enum Validity {
 	INFO(2),
 	WARNING(3),
 	ERROR(4);
-	
+
 	private int rank;
-	
+
 	private Validity(int paramRank){
 		rank = paramRank;
 	}
-	
+
 	public int getRank(){
 		return rank;
 	}