Code Cleanup (warnings)

Automatically fixed
- Unnecessary modifier

Author: h-man2

use-core/src/main/java/org/tzi/use/gen/assl/dynamics/IGCaller.java

@@ -32,10 +32,10 @@
 import org.tzi.use.uml.ocl.value.Value;
 
 public interface IGCaller {
-    public void feedback( GConfiguration configuration,
-                          Value value,
-                          IGCollector collector ) 
+    void feedback(GConfiguration configuration,
+                  Value value,
+                  IGCollector collector)
         throws GEvaluationException;
 
-    public String toString();
+    String toString();
 }

use-core/src/main/java/org/tzi/use/gen/assl/dynamics/IGChecker.java

@@ -32,5 +32,5 @@
 import org.tzi.use.uml.sys.MSystemState;
 
 public interface IGChecker {
-    public boolean check(MSystemState state, IGCollector collector);
+    boolean check(MSystemState state, IGCollector collector);
 }

use-core/src/main/java/org/tzi/use/gen/assl/dynamics/IGCollector.java

@@ -41,83 +41,83 @@ public interface IGCollector {
      * No further execution is needed.
      * @return
      */
-	public boolean canStop();
+    boolean canStop();
 
-    public void setValidStateFound();
+    void setValidStateFound();
 
-    public void subsequentlyPrependStatement(MStatement statement);
+    void subsequentlyPrependStatement(MStatement statement);
 
-    public boolean expectSubsequentReporting();
+    boolean expectSubsequentReporting();
 
     /**
      * Called if a leaf is hit.
      * Normally used for statistical reasons (number of states checked).
      */
-    public void leaf();
+    void leaf();
 
     long numberOfCheckedStates();
 
-    public void setPrePostViolation();
+    void setPrePostViolation();
 
-    public boolean getPrePostViolation();
+    boolean getPrePostViolation();
 
-    public PrintWriter basicPrintWriter();
-    public boolean doBasicPrinting();
+    PrintWriter basicPrintWriter();
+    boolean doBasicPrinting();
 
-    public PrintWriter detailPrintWriter();
-    public boolean doDetailPrinting();
+    PrintWriter detailPrintWriter();
+    boolean doDetailPrinting();
 
-    public void invalid( String str );
-    public void invalid( Exception e );
+    void invalid(String str);
+    void invalid(Exception e);
 
 	/**
 	 * Adds <code>ignoredStates</code> to the overall ignored states
 	 * @param ignoredStates
 	 */
-	public void addIgnoredStates(long ignoredStates);
+    void addIgnoredStates(long ignoredStates);
 
 	/**
 	 * Informs the previous callers, that a barrier cannot be passed.
 	 */
-	public void setBlocked(boolean newValue);
+    void setBlocked(boolean newValue);
 
 	/**
 	 * Returns the state of the last checked barrier.
 	 */
-	public boolean getBlocked();
+    boolean getBlocked();
 
 	/**
 	 * Adds 1 to the cut counter
 	 */
-	public void addCut();
+    void addCut();
 
 	/**
 	 * Returns the number of cuts
 	 * @return Number of cuts made
 	 */
-	public long getCuts();
+    long getCuts();
 
 	/**
 	 * Adds one to the number of "hit" barriers.
 	 */
-	public void addBarrierBlock();
+    void addBarrierBlock();
 
 	/**
 	 * Returns the number of barriers hit.
 	 * @return Number of hit barriers.
 	 */
-	public long getBarriersHit();
+    long getBarriersHit();
 
 	/**
 	 * Add the barrier statement to the list of barriers.
 	 * @param bInstr 
 	 */
-	public void addBarrier(GInstrBarrier bInstr);
+    void addBarrier(GInstrBarrier bInstr);
 
 	/**
 	 * Add the calculated barrier statement to the list of barriers and
 	 * increments the counter for calculated barriers by one.
 	 * @param bInstr 
 	 */
-	public void addBarrier(GInstrCalculatedBarrier bInstr);
+    void addBarrier(GInstrCalculatedBarrier bInstr);
 }

use-core/src/main/java/org/tzi/use/gen/assl/statics/IGInstructionMatcher.java

@@ -32,8 +32,8 @@
  * @author  Joern Bohling
  */
 public interface IGInstructionMatcher {
-    public GInstruction createIfMatches( List<Object> param, MModel model);
-    public String name();
+    GInstruction createIfMatches(List<Object> param, MModel model);
+    String name();
 }
 
 

use-core/src/main/java/org/tzi/use/graph/DirectedGraph.java

@@ -315,7 +315,7 @@ public interface DirectedGraph<N, E extends DirectedEdge<N>> extends Collection<
 	 */
 	void clear();
 
-	public interface NodeSetIterator<N> extends Iterator<N> {
+	interface NodeSetIterator<N> extends Iterator<N> {
 		int getDepth();
 	}
 }

use-core/src/main/java/org/tzi/use/uml/mm/MAssociation.java

@@ -149,15 +149,15 @@ public interface MAssociation extends MClassifier {
     /**
      * Sets the position in the defined USE-Model.
      */
-    public void setPositionInModel(int position);
+    void setPositionInModel(int position);
 
     /**
      * Sets the model owning this class. This method must be called by
      * {@link MModel#addAssociation(MAssociation)}.
      *
      * @see MModel#addAssociation(MAssociation)
      */
-    public void setModel( MModel model );
+    void setModel(MModel model);
 
     /** 
      * Returns true if a link consisting of objects of the given classes
@@ -214,22 +214,22 @@ public interface MAssociation extends MClassifier {
 	Set<MAssociation> getRedefinesClosure();
 
 	@Override
-    public Set<? extends MAssociation> parents();
+    Set<? extends MAssociation> parents();
 
     @Override
-    public Set<? extends MAssociation> allParents();
+    Set<? extends MAssociation> allParents();
 
     @Override
-    public Set<? extends MAssociation> allChildren();
+    Set<? extends MAssociation> allChildren();
 
     @Override
-    public Set<? extends MAssociation> children();
+    Set<? extends MAssociation> children();
 
     @Override
-    public Iterable<? extends MAssociation> generalizationHierachie(boolean includeThis);
+    Iterable<? extends MAssociation> generalizationHierachie(boolean includeThis);
 
     @Override
-    public Iterable<? extends MAssociation> specializationHierachie(boolean includeThis);
+    Iterable<? extends MAssociation> specializationHierachie(boolean includeThis);
 
 	/**
 	 * True, if links can be inserted into this association otherwise

use-core/src/main/java/org/tzi/use/uml/mm/MAssociationClass.java

@@ -30,21 +30,21 @@
 public interface MAssociationClass extends MClass, MAssociation, MNavigableElement {
 
 	@Override
-    public Set<MAssociationClass> parents();
+    Set<MAssociationClass> parents();
 
 
 	@Override
-    public Set<MAssociationClass> allParents();
+    Set<MAssociationClass> allParents();
 
 	@Override
-    public Set<MAssociationClass> allChildren();
+    Set<MAssociationClass> allChildren();
 
 	@Override
-    public Set<MAssociationClass> children();
+    Set<MAssociationClass> children();
 
 	@Override
-	public Iterable<MAssociationClass> generalizationHierachie(boolean includeThis);
+    Iterable<MAssociationClass> generalizationHierachie(boolean includeThis);
 
 	@Override
-	public Iterable<MAssociationClass> specializationHierachie(boolean includeThis);
+    Iterable<MAssociationClass> specializationHierachie(boolean includeThis);
 }

use-core/src/main/java/org/tzi/use/uml/mm/MClass.java

@@ -36,7 +36,7 @@ public interface MClass extends MClassifier {
     /**
      * Returns the name of this class with lowercase first letter.
      */
-    public String nameAsRolename();
+    String nameAsRolename();
 
     /**
      * Returns the set of all direct parent classes (without this class).
@@ -45,7 +45,7 @@ public interface MClass extends MClassifier {
      * @return Set<MClass>
      */
     @Override
-    public Set<? extends MClass> parents();
+    Set<? extends MClass> parents();
 
     /**
      * Returns the set of all parent classes (without this class). 
@@ -55,7 +55,7 @@ public interface MClass extends MClassifier {
      * @return Set&lt;MClass&gt;
      */
     @Override
-    public Set<? extends MClass> allParents();
+    Set<? extends MClass> allParents();
 
     /**
      * Returns the set of all child classes (without this class). This
@@ -64,7 +64,7 @@ public interface MClass extends MClassifier {
      * @return Set(MClass)
      */
     @Override
-    public Set<? extends MClass> allChildren();
+    Set<? extends MClass> allChildren();
 
     /**
      * Returns the set of all direct child classes (without this
@@ -73,13 +73,13 @@ public interface MClass extends MClassifier {
      * @return Set(MClass) 
      */
     @Override
-    public Set<? extends MClass> children();
+    Set<? extends MClass> children();
 
     @Override
-    public Iterable<? extends MClass> generalizationHierachie(boolean includeThis);
+    Iterable<? extends MClass> generalizationHierachie(boolean includeThis);
 
     @Override
-    public Iterable<? extends MClass> specializationHierachie(boolean includeThis);
+    Iterable<? extends MClass> specializationHierachie(boolean includeThis);
 
     /**
      * Adds an attribute. The attribute must have a unique name within
@@ -91,15 +91,15 @@ public interface MClass extends MClassifier {
      *            attribute with the same name or a name clash
      *            occurred.
      */
-    public void addAttribute( MAttribute attr ) throws MInvalidModelException;
+    void addAttribute(MAttribute attr) throws MInvalidModelException;
 
     /**
      * Returns the set of all attributes (including inherited ones)
      * defined for this class.
      *
      * @return List(MAttribute)
      */
-    public List<MAttribute> allAttributes();
+    List<MAttribute> allAttributes();
 
     /**
      * Adds an operation. The operation name must be unique among all
@@ -109,49 +109,49 @@ public interface MClass extends MClassifier {
      * @exception MInvalidModelException the operation is not unique
      *            or is not a valid redefinition.
      */
-    public void addOperation( MOperation op ) throws MInvalidModelException;
+    void addOperation(MOperation op) throws MInvalidModelException;
 
     /**
      * Returns the set of all operations (including inherited ones)
      * defined for this class.
      *
      * @return List(MOperation)
      */
-    public List<MOperation> allOperations();
+    List<MOperation> allOperations();
 
     /**
      * Returns the set of associations this class directly
      * participates in.
      *
      * @return Set(MAssociation).
      */
-    public Set<MAssociation> associations();
+    Set<MAssociation> associations();
 
     /**
      * Returns the set of associations this class and all of its
      * parents participate in.
      *
      * @return Set(MAssociation).
      */
-    public Set<MAssociation> allAssociations();
+    Set<MAssociation> allAssociations();
 
     /**
      * Sets the position in the defined USE-Model.
      */
-    public void setPositionInModel(int position);
+    void setPositionInModel(int position);
 
     /**
      * Process this element with visitor.
      */
-    public void processWithVisitor( MMVisitor v );
+    void processWithVisitor(MMVisitor v);
 
     /**
      * Searches for the association ends connected to this class or 
      * its parents with the given name.
      * @param name The name of association ends to look for.
      * @return A list of association ends in the order from the most specific class to the more general classes.
      */
-	public List<MAssociationEnd> getAssociationEnd(String name);
+    List<MAssociationEnd> getAssociationEnd(String name);
 
 	/**
      * Registers all association ends as navigable from this
@@ -167,22 +167,22 @@ public interface MClass extends MClassifier {
 	 * Adds a new PSM to the class
 	 * @param psm
 	 */
-	public void addOwnedProtocolStateMachine(MProtocolStateMachine psm);
+    void addOwnedProtocolStateMachine(MProtocolStateMachine psm);
 
 	/**
 	 * Returns all owned PSM or an empty list if no PSM is defined.
 	 * @return
 	 */
-	public Set<MProtocolStateMachine> getOwnedProtocolStateMachines();
+    Set<MProtocolStateMachine> getOwnedProtocolStateMachines();
 
 	/**
 	 * @param operationCall
 	 * @return
 	 */
-	public boolean hasStateMachineWhichHandles(MOperationCall operationCall);
+    boolean hasStateMachineWhichHandles(MOperationCall operationCall);
 
 	/**
 	 * @return
 	 */
-	public Set<MProtocolStateMachine> getAllOwnedProtocolStateMachines();
+    Set<MProtocolStateMachine> getAllOwnedProtocolStateMachines();
 }

use-core/src/main/java/org/tzi/use/uml/mm/MClassifier.java

@@ -38,15 +38,15 @@ public interface MClassifier extends Type, MModelElement, MNamedElement, UseFile
 	/**
      * Returns the model owning this classifier.
      */
-    public MModel model();
+    MModel model();
 
     /**
      * Sets the model owning this classifier. This method must be called by
      * {@link MModel#addClass(MClass)}.
      *
      * @see MModel#addClass(MClass)
      */
-    public void setModel( MModel model );
+    void setModel(MModel model);
 
 	/**
 	 * If true, the Classifier does not provide a complete declaration and can typically not be instantiated.