Code Cleanup (warnings)

Automatically fixed
- "'size() == 0' can be replaced with 'isEmpty()'

Author: h-man2

use-core/src/main/java/org/tzi/use/gen/tool/GGenerator.java

@@ -304,7 +304,7 @@ public void printResultStatistics() throws GNoResultException {
         PrintWriter pw = new PrintWriter(System.out);
         lastResult().checker().printStatistics(pw, lastResult().collector().numberOfCheckedStates());
 
-        if (lastResult().collector().getBarriers().size() > 0) {
+        if (!lastResult().collector().getBarriers().isEmpty()) {
         	pw.println();
         	pw.println("Barrier statistics (barriers marked with * were calculated):");
         	pw.println("        checks          valid        invalid     mul. viol.      time (ms)  Barrier");

use-core/src/main/java/org/tzi/use/parser/ocl/ASTExpression.java

@@ -187,7 +187,7 @@ protected Expression genNavigation(Context ctx, Token rolenameToken,
         }
 
         if (navigationNeedsExplicitRolename(srcClass, dst)) {
-			if (explicitRolenameOrQualifiers.size() == 0) {
+			if (explicitRolenameOrQualifiers.isEmpty()) {
 				// an explicit rolename is needed, but not provided
 				throw new SemanticException(
 						rolenameToken,

use-core/src/main/java/org/tzi/use/parser/ocl/ASTOperationExpression.java

@@ -283,7 +283,7 @@ else if (srcType.isKindOfTupleType(VoidHandling.EXCLUDE_VOID) )
 
         opcase += fFollowsArrow ? ARROW : DOT;
         opcase += fHasParentheses ? PARENTHESES : NO_PARENTHESES;
-        opcase += fExplicitRolenameOrQualifiers.size() > 0 ? EXPLICIT_ROLENAME : NO_EXPLICIT_ROLENAME;
+        opcase += !fExplicitRolenameOrQualifiers.isEmpty() ? EXPLICIT_ROLENAME : NO_EXPLICIT_ROLENAME;
 
         switch ( opcase ) {
         case SRC_SIMPLE_TYPE + DOT + NO_PARENTHESES: 

use-core/src/main/java/org/tzi/use/parser/use/ASTAssociation.java

@@ -188,7 +188,7 @@ public void generate() throws SemanticException {
 		 */
 		private void genRedefinesConstraints(ASTAssociationEnd aEnd)
 				throws SemanticException {			
-			if (aEnd.getRedefinesRolenames().size() > 0) {
+			if (!aEnd.getRedefinesRolenames().isEmpty()) {
 				// Get the MAssociationEnd from the name
 				MClass cls = model.getClass(aEnd.getClassName());
 				MAssociationEnd redefiningEnd = association.getAssociationEnd(cls, aEnd.getRolename(ctx));
@@ -202,7 +202,7 @@ private void genRedefinesConstraints(ASTAssociationEnd aEnd)
 					String redefinesRolename = redefinesRolenameToken.getText();
 					List<MAssociationEnd> possibleRedefinedEnds = cls.getAssociationEnd(redefinesRolename);
 
-					if (possibleRedefinedEnds.size() == 0) {
+					if (possibleRedefinedEnds.isEmpty()) {
 						throw new SemanticException(redefinesRolenameToken, "No association end with name '" + redefinesRolename + "' to redefine.");
 					}
 
@@ -259,7 +259,7 @@ private void genSubsetsConstraints(ASTAssociationEnd aEnd) throws SemanticExcept
 					String subsetsRolename = subsetsRolenameToken.getText();
 					List<MAssociationEnd> possibleSubsettedEnds = cls.getAssociationEnd(subsetsRolename);
 
-					if (possibleSubsettedEnds.size() == 0) {
+					if (possibleSubsettedEnds.isEmpty()) {
 						throw new SemanticException(subsetsRolenameToken, "No association end with name '" + subsetsRolename + "' to subset.");
 					}
 

use-core/src/main/java/org/tzi/use/parser/use/ASTAssociationEnd.java

@@ -162,7 +162,7 @@ public boolean isUnion() {
      */
     public void addSubsetsRolename(Token name) {
     	// Lazy initialization of the list.
-    	if (subsetsRolename.size() == 0)
+    	if (subsetsRolename.isEmpty())
     		subsetsRolename = new ArrayList<Token>();
 
     	subsetsRolename.add(name);
@@ -182,7 +182,7 @@ public List<Token> getSubsetsRolenames() {
      */
     public void addRedefinesRolename(Token rolename) {
     	// Lazy initialization of the list.
-    	if (redefinesRolenames.size() == 0)
+    	if (redefinesRolenames.isEmpty())
     		redefinesRolenames = new ArrayList<Token>();
 
     	redefinesRolenames.add(rolename);
@@ -248,7 +248,7 @@ public MAssociationEnd gen(Context ctx, int kind) throws SemanticException {
         }
 
         List<VarDecl> generatedQualifiers;
-        if (qualifiers.size() == 0) {
+        if (qualifiers.isEmpty()) {
         	generatedQualifiers = Collections.emptyList();
         } else {
         	generatedQualifiers = new ArrayList<VarDecl>(qualifiers.size());

use-core/src/main/java/org/tzi/use/parser/use/ASTInvariantClause.java

@@ -62,7 +62,7 @@ MClassInvariant gen(Context ctx, List<Token> varTokens, MClassifier cf, boolean
         MClassInvariant inv = null;
 
         try {
-            if (varTokens != null && varTokens.size() > 0) {                
+            if (varTokens != null && !varTokens.isEmpty()) {
             	for (Token var : varTokens) {
             		vars.add(var, cf);
             		ctx.exprContext().push(var.getText(), cf);

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

@@ -248,7 +248,7 @@ public boolean equals(Object obj) {
     public Type getType( Type sourceObjectType, MNavigableElement src, boolean qualifiedAccess ) {
     	Type t;
 
-    	if (this.getRedefiningEnds().size() > 0) {
+    	if (!this.getRedefiningEnds().isEmpty()) {
     		t = getRedefinedType((MClass)sourceObjectType);
     	} else {
     		t = cls();
@@ -480,7 +480,7 @@ public List<VarDecl> getQualifiers() {
 
 	@Override
 	public boolean hasQualifiers() {
-		return getQualifiers().size() > 0;
+		return !getQualifiers().isEmpty();
 	}
 
 	/* (non-Javadoc)

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

@@ -100,7 +100,7 @@ public final class MClassInvariant extends MModelElementImpl implements UseFileL
         fIsExistential = isExistential;
 
         // parse variables
-        if (vars == null || vars.size() == 0)
+        if (vars == null || vars.isEmpty())
         {
         	fHasVars = false;
         	VarDecl decl = new VarDecl("self", fClassifier);

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

@@ -233,7 +233,7 @@ public void visitAssociationEnd(MAssociationEnd e) {
         	result.append(')');
         }
 
-        if (e.getSubsettedEnds().size() > 0) {
+        if (!e.getSubsettedEnds().isEmpty()) {
         	for (MAssociationEnd end : e.getSubsettedEnds()) {
         		result.append(ws());
         		result.append(keyword("subsets"));
@@ -242,7 +242,7 @@ public void visitAssociationEnd(MAssociationEnd e) {
         	}
         }
 
-        if (e.getRedefinedEnds().size() > 0) {
+        if (!e.getRedefinedEnds().isEmpty()) {
         	for (MAssociationEnd end : e.getRedefinedEnds()) {
         		result.append(ws());
         		result.append(keyword("redefines"));
@@ -299,7 +299,7 @@ else if(e.isDerived()){
 
     private void visitAttributesAndOperations( MClassifier e ) {
         // visit attributes
-        if (e.attributes().size() > 0 ) {
+        if (!e.attributes().isEmpty()) {
             indent();
             println(keyword("attributes"));
             incIndent();
@@ -315,7 +315,7 @@ private void visitAttributesAndOperations( MClassifier e ) {
         }
 
         // visit operations
-        if (e.operations().size() > 0 ) {
+        if (!e.operations().isEmpty()) {
             indent();
             println(keyword("operations"));
             incIndent();

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

@@ -58,7 +58,7 @@ static class MutableInteger {
     }
 
     protected MModelElementImpl(String name) {
-        if (name == null || name.length() == 0 )
+        if (name == null || name.isEmpty())
             throw new IllegalArgumentException("Modelelement without name");
         fName = name;
         hashCode = fName.hashCode();
@@ -71,7 +71,7 @@ protected MModelElementImpl(String name) {
      * they may still clash with some user defined name.
      */
     protected MModelElementImpl(String name, String prefix) {
-        if (name == null || name.trim().length() == 0 ) {
+        if (name == null || name.trim().isEmpty()) {
             MutableInteger i = fNameMap.get(prefix);
             if (i == null ) {
                 i = new MutableInteger();

use-core/src/main/java/org/tzi/use/uml/ocl/expr/operations/StandardOperationsString.java

@@ -435,8 +435,8 @@ public Value eval(EvalContext ctx, Value[] args, Type resultType) {
 		String self = ((StringValue)args[0]).value();
 		String s = ((StringValue)args[1]).value();
 
-		if (self.length() == 0) return IntegerValue.valueOf(0);
-		if (s.length()== 0 && self.length() > 0) return IntegerValue.valueOf(1);
+		if (self.isEmpty()) return IntegerValue.valueOf(0);
+		if (s.isEmpty() && !self.isEmpty()) return IntegerValue.valueOf(1);
 
 		return IntegerValue.valueOf(self.indexOf(s) + 1);
 	}

use-core/src/main/java/org/tzi/use/uml/sys/MLinkImpl.java

@@ -82,7 +82,7 @@ protected MLinkImpl(MAssociation assoc, List<MObject> objects, List<List<Value>>
         this.qualifierValues = qualifierValues;
         Iterator<MAssociationEnd> it1 = assoc.associationEnds().iterator();
         Iterator<MObject> it2 = objects.iterator();
-        boolean hasQualifiers = (qualifierValues != null && qualifierValues.size() > 0);
+        boolean hasQualifiers = (qualifierValues != null && !qualifierValues.isEmpty());
         Iterator<List<Value>> it3 = (hasQualifiers ? qualifierValues.iterator() : null);
 
         int newHashCode = fAssociation.hashCode();

use-core/src/main/java/org/tzi/use/uml/sys/MLinkSet.java

@@ -67,7 +67,7 @@ public CacheEntry(MAssociationEnd end, MObject object, List<Value> qualifiers) {
             this.object = object;
             // We set qualifier to null, if no elements are given
             // This makes comparison easier.
-            this.qualifiers = (qualifiers != null && qualifiers.size() == 0) ? null : qualifiers;
+            this.qualifiers = (qualifiers != null && qualifiers.isEmpty()) ? null : qualifiers;
             hashCode = end.hashCode() + 19 * object.hashCode() + (this.qualifiers == null ? 0 : 23 * this.qualifiers.hashCode());
         }
 

use-core/src/main/java/org/tzi/use/uml/sys/MOperationCall.java

@@ -621,7 +621,7 @@ public Map<MProtocolStateMachineInstance, Set<MTransition>> getExecutedTransitio
 	 * @return
 	 */
 	public boolean hasExecutedTransitions() {
-		return executedTransitions != null && executedTransitions.size() > 0;
+		return executedTransitions != null && !executedTransitions.isEmpty();
 	}
 
 	/**

use-core/src/main/java/org/tzi/use/uml/sys/MSystemState.java

@@ -1453,7 +1453,7 @@ protected ArrayList<MObject> getNavigableObjectsFromDerivedAssociation(MObject o
 			} else if (dst.isDerived()) {
 				res.addAll(linkedObjects);
 			} else {
-				if (linkedObjects.size() > 0)
+				if (!linkedObjects.isEmpty())
 					res.add(sourceObjects[dstIndex]);
 			}
 		}
@@ -1942,7 +1942,7 @@ private boolean validateBinaryAssociations(PrintWriter out, MAssociation assoc,
 		for (MObject obj : objects) {
 			Map<List<Value>,Set<MObject>> linkedObjects = getLinkedObjects(obj, aend1, aend2);
 
-			if (linkedObjects.size() == 0 && !aend2.multiplicity().contains(0)) {
+			if (linkedObjects.isEmpty() && !aend2.multiplicity().contains(0)) {
 				reportMultiplicityViolation(out, assoc, aend1, aend2, obj, null);
 				if (!reportAllErrors) {
 					return false;

use-core/src/main/java/org/tzi/use/uml/sys/soil/MBlockStatement.java

@@ -84,7 +84,7 @@ public Value execute(SoilEvaluationContext context,
 	protected String shellCommand() {
 		StringBuilder sb = new StringBuilder();
 
-		if(fVariableDeclarations.size() > 0){
+		if(!fVariableDeclarations.isEmpty()){
 			sb.append("declare ");
 			boolean first = true;
 			for(VarDecl var : fVariableDeclarations){
@@ -109,7 +109,7 @@ protected void toConcreteSyntax(
 			String indentIncrease,
 			StringBuilder target) {
 
-		if(fVariableDeclarations.size() > 0){
+		if(!fVariableDeclarations.isEmpty()){
 			target.append(indent);
 			target.append("declare ");
 			boolean first = true;

use-core/src/main/java/org/tzi/use/uml/sys/soil/MLinkDeletionStatement.java

@@ -189,7 +189,7 @@ protected String shellCommand() {
 			public String format(MRValue element) {
 				String qualifierValues = "";
 
-				if (!qualifier.isEmpty() && qualifier.get(index) != null && qualifier.get(index).size() > 0) {
+				if (!qualifier.isEmpty() && qualifier.get(index) != null && !qualifier.get(index).isEmpty()) {
 					qualifierValues = "{";
 					qualifierValues += StringUtil.fmtSeq(qualifier.get(index), ",");
 					qualifierValues += "}";

use-core/src/main/java/org/tzi/use/util/Report.java

@@ -93,7 +93,7 @@ public Report(int columns, String fmt) {
         Arrays.fill(fColumnFormat, FMT_LEFT);
 
         // parse format string
-        if (fmt != null && fmt.length() > 0 ) {
+        if (fmt != null && !fmt.isEmpty()) {
             char[] f = fmt.toCharArray();
             int col = 0;
             int fillIndex = 0;

use-core/src/main/java/org/tzi/use/util/collections/CollectionUtil.java

@@ -122,7 +122,7 @@ public static <T> List<List<Pair<T>>> combinationsOne( List<T> firstList, List<T
 
     private static <T> void combinationsOneAux(List<List<Pair<T>>> result, List<Pair<T>> head, List<List<Pair<T>>> tail) {
 
-    	if (tail.size() == 0) return;
+    	if (tail.isEmpty()) return;
 
     	List<Pair<T>> myCombinations = tail.get(0);
 
@@ -196,7 +196,7 @@ public static <T> Set<T> emptySetIfNull(final Set<T> theSet) {
      * @return The same list if <code>theList.size() > 0</code> or a new <code>ArrayList</code>  
      */
     public static <T> List<T> initAsArrayList(final List<T> theList) {
-    	if (theList.size() == 0)
+    	if (theList.isEmpty())
     		return new ArrayList<T>();
     	else
     		return theList;
@@ -218,7 +218,7 @@ public static <T> List<T> initAsArrayList(final List<T> theList) {
      * @return The same <code>Map</code> if <code>theMap.size() > 0</code> or a new <code>HashMap</code>  
      */
     public static <TK, TV> Map<TK,TV> initAsHashMap(final Map<TK,TV> theMap) {
-    	if (theMap.size() == 0)
+    	if (theMap.isEmpty())
     		return new HashMap<TK,TV>();
     	else
     		return theMap;
@@ -239,7 +239,7 @@ public static <TK, TV> Map<TK,TV> initAsHashMap(final Map<TK,TV> theMap) {
      * @return The same set if <code>theSet.size() > 0</code> or a new <code>HashSet</code>  
      */
     public static <T> Set<T> initAsHashSet(final Set<T> theSet) {
-    	if (theSet.size() == 0)
+    	if (theSet.isEmpty())
     		return new HashSet<T>();
     	else
     		return theSet;

use-core/src/main/java/org/tzi/use/util/collections/MinCombinationsIterator.java

@@ -102,7 +102,7 @@ private void buildPartitions() {
     			partition.add(entry);
     		}
 
-    		if (partition.size() > 0)
+    		if (!partition.isEmpty())
     			partitionedCombinations.add(partition);
     	}
 	}

use-core/src/test/java/org/tzi/use/parser/USECompilerTest.java

@@ -179,7 +179,7 @@ public void testExpression() throws IOException {
                 }
                 continue;
             }
-            if (line.length() == 0 || line.startsWith("#")) {
+            if (line.isEmpty() || line.startsWith("#")) {
                 continue;
             }