generics
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchFeatureProvider.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchFeatureProvider.java
index f6d071f..a1c26b8 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchFeatureProvider.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/SketchFeatureProvider.java
@@ -260,22 +260,22 @@
return retList.toArray(new ICreateConnectionFeature[0]);
}
- private ICreateFeature createCreateGaContainerFeature(String name, String description, Class gaType) {
+ private ICreateFeature createCreateGaContainerFeature(String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
ICreateFeature createFeature = new SketchCreateGaContainerFeature(this, name, description, gaType);
return createFeature;
}
- private ICreateFeature createCreateGaShapeFeature(String name, String description, Class gaType) {
+ private ICreateFeature createCreateGaShapeFeature(String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
ICreateFeature createFeature = new SketchCreateGaShapeFeature(this, name, description, gaType);
return createFeature;
}
- private ICreateFeature createCreateGaShapeFeatureSingleText(String name, String description, Class gaType) {
+ private ICreateFeature createCreateGaShapeFeatureSingleText(String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
ICreateFeature createFeature = new SketchCreateGaShapeFeature(this, name, description, gaType, false);
return createFeature;
}
- private ICreateFeature createCreateGaShapeFeatureWithGhost(String name, String description, Class gaType) {
+ private ICreateFeature createCreateGaShapeFeatureWithGhost(String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
// breaks the build: ICreateFeature createFeature = new
// SketchCreateGaShapeFeatureWithGhost(this, name, description,
// gaType);
@@ -283,7 +283,7 @@
return createFeature;
}
- private ICreateFeature createCreateGaContainerFeatureWithGhost(String name, String description, Class gaType) {
+ private ICreateFeature createCreateGaContainerFeatureWithGhost(String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
// breaks the build: ICreateFeature createFeature = new
// SketchCreateGaShapeFeatureWithGhost(this, name, description,
// gaType);
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeature.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeature.java
index af9e428..853327f 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeature.java
@@ -16,6 +16,7 @@
package org.eclipse.graphiti.testtool.sketch.features.create;
import org.eclipse.graphiti.features.IFeatureProvider;
+import org.eclipse.graphiti.mm.GraphicsAlgorithmContainer;
import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
import org.eclipse.graphiti.mm.pictograms.AnchorContainer;
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
@@ -38,7 +39,7 @@
* @param gaType
* the ga type
*/
- public SketchCreateGaContainerFeature(IFeatureProvider fp, String name, String description, Class<GraphicsAlgorithm> gaType) {
+ public SketchCreateGaContainerFeature(IFeatureProvider fp, String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
super(fp, name, description, gaType);
}
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeatureWithGhost.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeatureWithGhost.java
index c2d1201..485eebd 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeatureWithGhost.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaContainerFeatureWithGhost.java
@@ -49,7 +49,7 @@
* @param gaType
* the ga type
*/
- public SketchCreateGaContainerFeatureWithGhost(IFeatureProvider fp, String name, String description, Class<GraphicsAlgorithm> gaType) {
+ public SketchCreateGaContainerFeatureWithGhost(IFeatureProvider fp, String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
super(fp, name, description, gaType);
}
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java
index 99b64b8..17edffe 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaFeature.java
@@ -47,7 +47,7 @@
public abstract class SketchCreateGaFeature extends AbstractCreateFeature {
private static final String NEW_ELEMENT = "new element";
- private Class gaType;
+ private Class<? extends GraphicsAlgorithm> gaType;
/**
* Instantiates a new sketch create ga feature.
@@ -61,7 +61,7 @@
* @param gaType
* the ga type
*/
- public SketchCreateGaFeature(IFeatureProvider fp, String name, String description, Class<GraphicsAlgorithm> gaType) {
+ public SketchCreateGaFeature(IFeatureProvider fp, String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
super(fp, name, description);
setGaType(gaType);
}
@@ -203,11 +203,11 @@
return ret;
}
- private void setGaType(Class gaType) {
+ private void setGaType(Class<? extends GraphicsAlgorithm> gaType) {
this.gaType = gaType;
}
- protected Class getGaType() {
+ protected Class<?> getGaType() {
return gaType;
}
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeature.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeature.java
index fcbeae0..402a55f 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeature.java
@@ -41,11 +41,11 @@
* @param gaType
* the ga type
*/
- public SketchCreateGaShapeFeature(IFeatureProvider fp, String name, String description, Class<GraphicsAlgorithm> gaType) {
+ public SketchCreateGaShapeFeature(IFeatureProvider fp, String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
super(fp, name, description, gaType);
}
- public SketchCreateGaShapeFeature(IFeatureProvider fp, String name, String description, Class<GraphicsAlgorithm> gaType,
+ public SketchCreateGaShapeFeature(IFeatureProvider fp, String name, String description, Class<? extends GraphicsAlgorithm> gaType,
boolean multiLineText) {
this(fp, name, description, gaType);
this.multiLineText = multiLineText;
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeatureWithGhost.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeatureWithGhost.java
index 57c5621..f208ce9 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeatureWithGhost.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/create/SketchCreateGaShapeFeatureWithGhost.java
@@ -46,7 +46,7 @@
* @param gaType
* the ga type
*/
- public SketchCreateGaShapeFeatureWithGhost(IFeatureProvider fp, String name, String description, Class<GraphicsAlgorithm> gaType) {
+ public SketchCreateGaShapeFeatureWithGhost(IFeatureProvider fp, String name, String description, Class<? extends GraphicsAlgorithm> gaType) {
super(fp, name, description, gaType);
}