Updated copyright info etc.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@688 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/parser/ast/ExpressionConstant.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionFormula.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionFunc.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionITE.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionIdent.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionLabel.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionLiteral.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/ExpressionVar.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/ast/RewardStructItem.java

@@ -3,7 +3,6 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
-//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/parser/visitor/ExpandConstants.java

@@ -43,7 +43,7 @@ public class ExpandConstants extends ASTTraverseModify
 	
 	public Object visit(ExpressionConstant e) throws PrismLangException
 	{
-		int i;
+		int i, t;
 		Expression expr;
 		
 		// See if identifier corresponds to a constant
@@ -55,7 +55,10 @@ public class ExpandConstants extends ASTTraverseModify
 			expr = (Expression)expr.expandConstants(constantList);
 			// Put in brackets so precedence is preserved
 			// (for display purposes only; in case of re-parse)
+			// This is being done after type-checking so also set type
+			t = expr.getType();
 			expr = Expression.Parenth(expr);
+			expr.setType(t);
 			// Return replacement expression
 			return expr;
 		}

prism/src/parser/visitor/ExpandFormulas.java

@@ -43,7 +43,7 @@ public class ExpandFormulas extends ASTTraverseModify
 	
 	public Object visit(ExpressionFormula e) throws PrismLangException
 	{
-		int i;
+		int i, t;
 		Expression expr;
 		
 		// See if identifier corresponds to a formula
@@ -57,6 +57,11 @@ public class ExpandFormulas extends ASTTraverseModify
 			// Put in brackets so precedence is preserved
 			// (for display purposes only; in case of re-parse)
 			expr = Expression.Parenth(expr);
+			// This is probably being done before type-checking so
+			// don't really need to preserve type, but do so just in case
+			t = expr.getType();
+			expr = Expression.Parenth(expr);
+			expr.setType(t);
 			// Return replacement expression
 			return expr;
 		}

prism/src/parser/visitor/ToSimulator.java

@@ -3,6 +3,7 @@
 //	Copyright (c) 2002-
 //	Authors:
 //	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
 //	
 //------------------------------------------------------------------------------
 //	

prism/src/userinterface/model/GUITextModelEditor.java

@@ -1,23 +1,31 @@
 //==============================================================================
-//
-//	Copyright (c) 2002-2006, Andrew Hinton, Dave Parker, Charles Harley
-//
+//	
+//	Copyright (c) 2002-
+//	Authors:
+//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
+//	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Mark Kattenbelt <mark.kattenbelt@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Charles Harley <cd.harley@talk21.com> (University of Edinburgh)
+//	* Sebastian Vermehren <seb03@hotmail.com> (University of Edinburgh)
+//	
+//------------------------------------------------------------------------------
+//	
 //	This file is part of PRISM.
-//
+//	
 //	PRISM is free software; you can redistribute it and/or modify
 //	it under the terms of the GNU General Public License as published by
 //	the Free Software Foundation; either version 2 of the License, or
 //	(at your option) any later version.
-//
+//	
 //	PRISM is distributed in the hope that it will be useful,
 //	but WITHOUT ANY WARRANTY; without even the implied warranty of
 //	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //	GNU General Public License for more details.
-//
+//	
 //	You should have received a copy of the GNU General Public License
 //	along with PRISM; if not, write to the Free Software Foundation,
 //	Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
+//	
 //==============================================================================
 
 package userinterface.model;
@@ -43,15 +51,10 @@ import prism.PrismSettings;
 import prism.PrismSettingsListener;
 import userinterface.GUIClipboardEvent;
 import userinterface.GUIPrism;
-//import userinterface.PluginNotFoundException;
 
 /** Editing pane with syntax highlighting and line numbers etc for text 
  * model files. Currently supports Prism and Pepa models. It also tells 
  * the GUIPrism, of which it is a member, about modified events.
- * 
- * @author Andrew Hinton, Dave Parker, Charles Harley (cd.harley@talk21.com),
- * 		   Sebastian Vermehren (seb03@hotmail.com)
- * @version 1.4.2 08/12/2006
  */
 public class GUITextModelEditor extends GUIModelEditor implements DocumentListener, MouseListener
 {
@@ -747,4 +750,4 @@ public class GUITextModelEditor extends GUIModelEditor implements DocumentListen
 	} 
 	
 	
-}
+}

prism/src/userinterface/model/GUITextModelEditorGutter.java

@@ -1,23 +1,27 @@
 //==============================================================================
-//
-//	Copyright (c) 2006, Charles Harley
-//
+//	
+//	Copyright (c) 2002-
+//	Authors:
+//	* Charles Harley <cd.harley@talk21.com> (University of Edinburgh)
+//	
+//------------------------------------------------------------------------------
+//	
 //	This file is part of PRISM.
-//
+//	
 //	PRISM is free software; you can redistribute it and/or modify
 //	it under the terms of the GNU General Public License as published by
 //	the Free Software Foundation; either version 2 of the License, or
 //	(at your option) any later version.
-//
+//	
 //	PRISM is distributed in the hope that it will be useful,
 //	but WITHOUT ANY WARRANTY; without even the implied warranty of
 //	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //	GNU General Public License for more details.
-//
+//	
 //	You should have received a copy of the GNU General Public License
 //	along with PRISM; if not, write to the Free Software Foundation,
 //	Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
+//	
 //==============================================================================
 
 package userinterface.model;
@@ -378,4 +382,4 @@ public class GUITextModelEditorGutter extends JPanel implements PropertyChangeLi
 		repaint();
 	}
 
-}
+}

prism/src/userinterface/model/PepaEditorKit.java

@@ -1,23 +1,30 @@
 //==============================================================================
-//
-// Copyright (c) 2002-2006, Andrew Hinton, Dave Parker
-//
-// This file is part of PRISM.
-//
-// PRISM is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// PRISM is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with PRISM; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
+//	
+//	Copyright (c) 2002-
+//	Authors:
+//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
+//	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Mark Kattenbelt <mark.kattenbelt@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Charles Harley <cd.harley@talk21.com> (University of Edinburgh)
+//	
+//------------------------------------------------------------------------------
+//	
+//	This file is part of PRISM.
+//	
+//	PRISM is free software; you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation; either version 2 of the License, or
+//	(at your option) any later version.
+//	
+//	PRISM is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU General Public License for more details.
+//	
+//	You should have received a copy of the GNU General Public License
+//	along with PRISM; if not, write to the Free Software Foundation,
+//	Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//	
 //==============================================================================
 
 package userinterface.model;
@@ -42,9 +49,6 @@ import javax.swing.text.ViewFactory;
 
 /** Pepa model editor kit for the text model editor. Defines the syntax
  * highlighting that the model editor should use.
- * 
- * @author Andrew Hinton, Dave Parker, Charles Harley <cd.harley@talk21.com>
- * @version 1.1 24/11/2006
  */
 class PepaEditorKit extends DefaultEditorKit
 {
@@ -314,4 +318,4 @@ class PepaView extends PlainView
 		return index;
 	}
 	
-}
+}

prism/src/userinterface/model/PrismEditorKit.java

@@ -1,23 +1,31 @@
 //==============================================================================
-//
-// Copyright (c) 2002-2006, Andrew Hinton, Dave Parker
-//
-// This file is part of PRISM.
-//
-// PRISM is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// PRISM is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with PRISM; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
+//	
+//	Copyright (c) 2002-
+//	Authors:
+//	* Andrew Hinton <ug60axh@cs.bham.ac.uk> (University of Birmingham)
+//	* Dave Parker <david.parker@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Mark Kattenbelt <mark.kattenbelt@comlab.ox.ac.uk> (University of Oxford, formerly University of Birmingham)
+//	* Charles Harley <cd.harley@talk21.com> (University of Edinburgh)
+//	* Sebastian Vermehren <seb03@hotmail.com> (University of Edinburgh)
+//	
+//------------------------------------------------------------------------------
+//	
+//	This file is part of PRISM.
+//	
+//	PRISM is free software; you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation; either version 2 of the License, or
+//	(at your option) any later version.
+//	
+//	PRISM is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU General Public License for more details.
+//	
+//	You should have received a copy of the GNU General Public License
+//	along with PRISM; if not, write to the Free Software Foundation,
+//	Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//	
 //==============================================================================
 
 package userinterface.model;
@@ -43,9 +51,6 @@ import parser.PrismSyntaxHighlighter;
 
 /** Prism model editor kit for the text model editor. Defines the syntax
  * highlighting that the model editor should use.
- * 
- * @author Andrew Hinton, Dave Parker, Charles Harley <cd.harley@talk21.com>
- * @version 1.1 20/11/2006
  */
 class PrismEditorKit extends DefaultEditorKit
 {
@@ -341,4 +346,4 @@ class PrismView extends PlainView
 		return index;
 	}*/
 
-}
+}