Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Struckmann2015-08-07 08:25:22 +0000
committerSebastian Struckmann2015-08-07 08:25:55 +0000
commit54471730512b1b6608981ccd30ba1fd708ce1b11 (patch)
treea06c3c0de42210c74fb3e4b7ade9fec0a7a83845 /org.eclipse.jubula.client.ui.rcp
parent5e311475494bf7a6f5aef065e811d92e9ff254aa (diff)
downloadorg.eclipse.jubula.core-54471730512b1b6608981ccd30ba1fd708ce1b11.tar.gz
org.eclipse.jubula.core-54471730512b1b6608981ccd30ba1fd708ce1b11.tar.xz
org.eclipse.jubula.core-54471730512b1b6608981ccd30ba1fd708ce1b11.zip
Sprint task - Change logical names in object mapping associations from list to set, see http://eclip.se/469940
Diffstat (limited to 'org.eclipse.jubula.client.ui.rcp')
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java5
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewLogicalNameHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/objectmapping/OMEditorTreeContentProvider.java3
4 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java
index f7e4f856a..8325ea92c 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java
@@ -11,6 +11,7 @@
package org.eclipse.jubula.client.ui.rcp.controllers.dnd.objectmapping;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import org.eclipse.jface.dialogs.Dialog;
@@ -164,7 +165,7 @@ public class OMEditorDndSupport {
try {
IObjectMappingAssoziationPO newAssoc =
PoMaker.createObjectMappingAssoziationPO(
- null, new ArrayList<String>());
+ null, new HashSet<String>());
compMapper.changeReuse(newAssoc, null, compNameGuid);
compMapper.changeReuse(oldAssoc, compNameGuid, null);
target.addAssociation(newAssoc);
@@ -233,7 +234,7 @@ public class OMEditorDndSupport {
compMapper.changeReuse(assoc, compNameGuid, null);
IObjectMappingAssoziationPO compNameAssoc =
PoMaker.createObjectMappingAssoziationPO(
- null, new ArrayList<String>());
+ null, new HashSet<String>());
compMapper.changeReuse(
compNameAssoc, null, compNameGuid);
unmappedCompNames.addAssociation(compNameAssoc);
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
index 243a7f211..86fa13806 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
@@ -297,7 +297,7 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
IObjectMappingAssoziationPO assoc =
PoMaker.createObjectMappingAssoziationPO(
- null, new ArrayList<String>());
+ null, new HashSet<String>());
try {
getCompMapper().changeReuse(
assoc, null, compNamePo.getGuid());
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewLogicalNameHandler.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewLogicalNameHandler.java
index d7860c691..3da8eca55 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewLogicalNameHandler.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewLogicalNameHandler.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.client.ui.rcp.handlers;
-import java.util.ArrayList;
+import java.util.HashSet;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.jubula.client.core.businessprocess.IComponentNameMapper;
@@ -81,7 +81,7 @@ public class NewLogicalNameHandler extends AbstractNewComponentNameHandler {
try {
IObjectMappingAssoziationPO assoc =
PoMaker.createObjectMappingAssoziationPO(
- null, new ArrayList<String>());
+ null, new HashSet<String>());
mapper.changeReuse(assoc, null,
performOperation(newName, mapper).getGuid());
objMap.getUnmappedLogicalCategory().addAssociation(assoc);
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/objectmapping/OMEditorTreeContentProvider.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/objectmapping/OMEditorTreeContentProvider.java
index 5ec460c9f..dc5c39096 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/objectmapping/OMEditorTreeContentProvider.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/objectmapping/OMEditorTreeContentProvider.java
@@ -85,9 +85,8 @@ public class OMEditorTreeContentProvider extends
if (parentElement instanceof IObjectMappingAssoziationPO) {
IObjectMappingAssoziationPO assoc =
(IObjectMappingAssoziationPO)parentElement;
- List<String> componentNameGuidList = assoc.getLogicalNames();
List<Object> componentNamePoList = new ArrayList<Object>();
- for (String compNameGuid : componentNameGuidList) {
+ for (String compNameGuid : assoc.getLogicalNames()) {
IComponentNamePO compNamePo =
m_compNameMapper.getCompNameCache().getCompNamePo(
compNameGuid);

Back to the top