From 309cfc0294eec3ed7de2528ae154719df63069c1 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 25 Jun 2014 12:12:50 +0000 Subject: [PATCH] Code tidy (JavaDoc). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8594 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/parser/ast/SystemBrackets.java | 20 +++++--------------- prism/src/parser/ast/SystemFullParallel.java | 20 +++++--------------- prism/src/parser/ast/SystemHide.java | 20 +++++--------------- prism/src/parser/ast/SystemInterleaved.java | 20 +++++--------------- prism/src/parser/ast/SystemModule.java | 20 +++++--------------- prism/src/parser/ast/SystemParallel.java | 20 +++++--------------- prism/src/parser/ast/SystemRename.java | 20 +++++--------------- 7 files changed, 35 insertions(+), 105 deletions(-) diff --git a/prism/src/parser/ast/SystemBrackets.java b/prism/src/parser/ast/SystemBrackets.java index b3dc2535..8b43474c 100644 --- a/prism/src/parser/ast/SystemBrackets.java +++ b/prism/src/parser/ast/SystemBrackets.java @@ -67,17 +67,13 @@ public class SystemBrackets extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { operand.getModules(v); } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { operand.getSynchs(v); @@ -85,25 +81,19 @@ public class SystemBrackets extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return "(" + operand + ")"; } - /** - * Perform a deep copy. - */ + @Override public SystemDefn deepCopy() { SystemDefn ret = new SystemBrackets(getOperand().deepCopy()); diff --git a/prism/src/parser/ast/SystemFullParallel.java b/prism/src/parser/ast/SystemFullParallel.java index a4a95b89..d536e336 100644 --- a/prism/src/parser/ast/SystemFullParallel.java +++ b/prism/src/parser/ast/SystemFullParallel.java @@ -69,9 +69,7 @@ public class SystemFullParallel extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { int i, n; @@ -82,9 +80,7 @@ public class SystemFullParallel extends SystemDefn } } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { int i, n; @@ -97,17 +93,13 @@ public class SystemFullParallel extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { int i, n; @@ -124,9 +116,7 @@ public class SystemFullParallel extends SystemDefn return s; } - /** - * Perform a deep copy. - */ + @Override public SystemDefn deepCopy() { int i, n; diff --git a/prism/src/parser/ast/SystemHide.java b/prism/src/parser/ast/SystemHide.java index 4bb5b66c..3dbfa548 100644 --- a/prism/src/parser/ast/SystemHide.java +++ b/prism/src/parser/ast/SystemHide.java @@ -92,17 +92,13 @@ public class SystemHide extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { operand.getModules(v); } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { // recurse @@ -111,17 +107,13 @@ public class SystemHide extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { int i, n; @@ -140,9 +132,7 @@ public class SystemHide extends SystemDefn return s; } - /** - * Perform a deep copy. - */ + @Override public SystemDefn deepCopy() { int i, n; diff --git a/prism/src/parser/ast/SystemInterleaved.java b/prism/src/parser/ast/SystemInterleaved.java index aa613bef..9bb826ce 100644 --- a/prism/src/parser/ast/SystemInterleaved.java +++ b/prism/src/parser/ast/SystemInterleaved.java @@ -69,9 +69,7 @@ public class SystemInterleaved extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { int i, n; @@ -82,9 +80,7 @@ public class SystemInterleaved extends SystemDefn } } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { int i, n; @@ -97,17 +93,13 @@ public class SystemInterleaved extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { int i, n; @@ -124,9 +116,7 @@ public class SystemInterleaved extends SystemDefn return s; } - /** - * Perform a deep copy. - */ + @Override public SystemDefn deepCopy() { int i, n; diff --git a/prism/src/parser/ast/SystemModule.java b/prism/src/parser/ast/SystemModule.java index 3d6da621..4e5d84a5 100644 --- a/prism/src/parser/ast/SystemModule.java +++ b/prism/src/parser/ast/SystemModule.java @@ -63,17 +63,13 @@ public class SystemModule extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { v.addElement(name); } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { // do nothing @@ -81,25 +77,19 @@ public class SystemModule extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return name; } - /** - * Perform a deep copy. - */ + @Override public SystemDefn deepCopy() { SystemDefn ret = new SystemModule(name); diff --git a/prism/src/parser/ast/SystemParallel.java b/prism/src/parser/ast/SystemParallel.java index 7dae8c28..3441f0cd 100644 --- a/prism/src/parser/ast/SystemParallel.java +++ b/prism/src/parser/ast/SystemParallel.java @@ -104,18 +104,14 @@ public class SystemParallel extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { operand1.getModules(v); operand2.getModules(v); } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { operand1.getSynchs(v); @@ -124,17 +120,13 @@ public class SystemParallel extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { int i, n; @@ -153,9 +145,7 @@ public class SystemParallel extends SystemDefn return s; } - /** - * Perform a deep copy. - */ + @Override @SuppressWarnings("unchecked") public SystemDefn deepCopy() { diff --git a/prism/src/parser/ast/SystemRename.java b/prism/src/parser/ast/SystemRename.java index 400ad1cb..f7ec0e36 100644 --- a/prism/src/parser/ast/SystemRename.java +++ b/prism/src/parser/ast/SystemRename.java @@ -110,17 +110,13 @@ public class SystemRename extends SystemDefn // Methods required for SystemDefn (all subclasses should implement): - /** - * Get list of all modules appearing (recursively). - */ + @Override public void getModules(Vector v) { operand.getModules(v); } - /** - * Get list of all synchronising actions _introduced_ (recursively). - */ + @Override public void getSynchs(Vector v) { int i, n; @@ -141,17 +137,13 @@ public class SystemRename extends SystemDefn // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { int i, n; @@ -170,9 +162,7 @@ public class SystemRename extends SystemDefn return s; } - /** - * Perform a deep copy. - */ + @Override public SystemDefn deepCopy() { int i, n;