Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Hartmann2016-07-26 05:23:05 -0400
committerMarvin Mueller2016-07-28 07:48:11 -0400
commit6cf7785217762fe4b14b2426dffda5eb1441e4e7 (patch)
tree76089040a80978b0844034e7ef470a0d1cb0a947
parent5aba432406d86796a62d8cc4db59171f19302e4b (diff)
downloadorg.eclipse.jubula.core-6cf7785217762fe4b14b2426dffda5eb1441e4e7.tar.gz
org.eclipse.jubula.core-6cf7785217762fe4b14b2426dffda5eb1441e4e7.tar.xz
org.eclipse.jubula.core-6cf7785217762fe4b14b2426dffda5eb1441e4e7.zip
Fix for Bug 498284: collision between Simple and Normal Extensions
Change-Id: I9831c95e05c0066d204b7d1c7f8b3a7d8b54710e Signed-off-by: Miklos Hartmann <miklos.hartmann@z-consulting.eu>
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java5
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java4
2 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java
index 8ffc1e1ac..4a9858df0 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java
@@ -281,7 +281,10 @@ public class CapGUIPropertySource extends AbstractNodePropertySource {
cbpd.setLabelProvider(new LabelProvider() {
public String getText(Object element) {
if (element instanceof Integer) {
- return m_actionTypes[((Integer)element).intValue()];
+ int temp = ((Integer) element).intValue();
+ if (temp < m_actionTypes.length) {
+ return m_actionTypes[temp];
+ }
}
Assert.notReached(Messages.WrongElementType
+ StringConstants.DOT);
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java
index 07db0b3cb..61c289b5f 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java
@@ -194,6 +194,10 @@ public class CompSystem {
cleanPreviousSimpleExtension(graphicsComponent);
for (String componentName : componentNames) {
String cleanName = componentName.trim();
+ if (m_componentsByType.containsKey(cleanName)) {
+ // if the Component is already supported, we do not add it to the list
+ continue;
+ }
ConcreteComponent myComponent = new ConcreteComponent();
myComponent.setType(cleanName);
myComponent.setTesterClass(

Back to the top