Merge pull request #480 from ptidejteam/479-inconsistent-use-of-dimension-and-cardinality

Fixed the cardinality attribute and deleted dimension in Parameter.java

Author: yann-gael

PADL Creator JavaFile (Eclipse)/src/main/java/padl/creator/javafile/eclipse/util/PadlParserUtil.java

@@ -289,12 +289,7 @@ public static int getCardinality(final ITypeBinding aTypeBinding) {
 	 * @return
 	 */
 	public static int getDimension(final ITypeBinding aTypeBinding) {
-		if (aTypeBinding.isArray()) {
-			return aTypeBinding.getDimensions();
-		}
-		else {
-			return getCardinality(aTypeBinding) - 1;
-		}
+		return aTypeBinding.getDimensions();
 	}
 
 	/**
@@ -507,29 +502,18 @@ public static List<IParameter> getListOfParameters(
 				// Yann: May be null when parsing Foutse's Eclipse data!
 				// TODO: Understand why it could be null...
 				if (entity != null) {
-					final IParameter parameter;
-					final int cardinality = PadlParserUtil.getCardinality(type);
-					if (type.isArray()) {
-						// Yann 2015/04/15: Dimensions!
-						// I don't forget to add +1 because
-						//	int 	has for cardinality 1
-						//	int[]	has for cardinality 2
-						//	int[][]	has for cardniality 3
-						//	...
-						final int dimension = PadlParserUtil.getDimension(type) + 1;
-						parameter =
+					// Yann 2015/04/15: Dimensions!
+					// I don't forget to add +1 because
+					//	int 	has for cardinality 1
+					//	int[]	has for cardinality 2
+					//	int[][]	has for cardniality 3
+					//	...
+					final int dim = PadlParserUtil.getDimension(type) + 1;
+					final IParameter parameter =
 								model.getFactory().createParameter(
 									entity,
 									var.getName().toString().toCharArray(),
-									cardinality,
-									dimension);
-					} else {
-						parameter =
-							model.getFactory().createParameter(
-								entity,
-								var.getName().toString().toCharArray(),
-								cardinality);
-					}
+									dim);
 
 					parameter.setVisibility(var.getModifiers());
 					// I will use the field comment of param to register the
@@ -538,7 +522,7 @@ public static List<IParameter> getListOfParameters(
 					// computation, I will delete it
 					// This for having the same information with padl .class
 					// Aminata 05/05/11
-					parameter.setComment(Integer.toString(cardinality));
+					parameter.setComment(Integer.toString(dim));
 					listOfParameters.add(parameter);
 				}
 			}

PADL/src/main/java/padl/kernel/IFactory.java

@@ -92,11 +92,6 @@ IParameter createParameter(
 		final char[] aName,
 		final int aCardinality);
 	IParameter createParameter(final IEntity aType, final int aCardinality);
-	IParameter createParameter(
-		final IEntity aType,
-		final char [] aName,
-		final int aCardinality,
-		final int aDimension);
 	IPrimitiveEntity createPrimitiveEntity(final char[] aPrimitiveEntityName);
 	ISetter createSetter(final char[] anID, final char[] aName);
 	ISetter createSetter(final IMethod aMethod);

PADL/src/main/java/padl/kernel/IParameter.java

@@ -16,7 +16,6 @@
 public interface IParameter extends IElement, IConstituentOfOperation {
 	String LOGO = "\"P\"";
 	int getCardinality();
-	int getDimension();
 	String getDisplayTypeName();
 	IEntity getType();
 	char[] getTypeName();