Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Mueller2018-02-19 09:03:01 -0500
committerMarvin Mueller2018-02-19 09:30:29 -0500
commit60e137fd5a0c2806bbff570278868e621dc77700 (patch)
tree3550fc7258d327d614724e8b2811546ee83dfe3e
parentf68f710dc7a947774b0783a53df26623127da8d9 (diff)
downloadorg.eclipse.jubula.core-60e137fd5a0c2806bbff570278868e621dc77700.tar.gz
org.eclipse.jubula.core-60e137fd5a0c2806bbff570278868e621dc77700.tar.xz
org.eclipse.jubula.core-60e137fd5a0c2806bbff570278868e621dc77700.zip
Fix Problem with parameter proposol in Properties view
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java1
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/ContentAssistCellEditor.java1
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/dataset/AbstractDataSetPage.java4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/CheckedParamTextContentAssisted.java25
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ParamProposalProvider.java7
5 files changed, 5 insertions, 33 deletions
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java
index 45d3a8c4a..91f06a5e4 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java
@@ -327,7 +327,6 @@ class TDManagerPO implements ITDManager {
private String getCell(int dataSetRow, String uniqueId)
throws IllegalArgumentException {
int index = getUniqueIds().indexOf(uniqueId);
- System.out.println(index);
if (index == -1) {
throw new IndexOutOfBoundsException(Messages.ParameterWithUniqueId
+ StringConstants.SPACE + uniqueId + StringConstants.SPACE
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/ContentAssistCellEditor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/ContentAssistCellEditor.java
index f62e04a65..e6666333a 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/ContentAssistCellEditor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/ContentAssistCellEditor.java
@@ -106,7 +106,6 @@ public class ContentAssistCellEditor extends TextCellEditor {
@SuppressWarnings("synthetic-access")
public void proposalPopupClosed(
ContentProposalAdapter adapter) {
- setFocus();
m_popupOpen = false;
}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/dataset/AbstractDataSetPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/dataset/AbstractDataSetPage.java
index c136d931d..0d5ce25ff 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/dataset/AbstractDataSetPage.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/dataset/AbstractDataSetPage.java
@@ -1626,10 +1626,6 @@ public abstract class AbstractDataSetPage extends Page
instanceof CheckedParamTextContentAssisted) {
CheckedParamTextContentAssisted ed =
(CheckedParamTextContentAssisted)m_editor.getEditor();
- if (ed.isAccepted()) {
- ed.setAccepted(false);
- return;
- }
}
final Control editorControl = m_editor.getEditor();
if (!editorControl.isDisposed()) {
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/CheckedParamTextContentAssisted.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/CheckedParamTextContentAssisted.java
index ad629d68d..8b2aabcdb 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/CheckedParamTextContentAssisted.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/CheckedParamTextContentAssisted.java
@@ -11,8 +11,6 @@
package org.eclipse.jubula.client.ui.rcp.widgets;
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
-import org.eclipse.jface.fieldassist.IContentProposal;
-import org.eclipse.jface.fieldassist.IContentProposalListener;
import org.eclipse.jface.fieldassist.IContentProposalListener2;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
import org.eclipse.jface.fieldassist.TextContentAdapter;
@@ -53,8 +51,6 @@ public class CheckedParamTextContentAssisted extends CheckedParamText {
/** is this content assistent active? */
private boolean m_popupOpen = false;
- /** the accepted state*/
- private boolean m_accepted;
/** controller for popupOpen */
@@ -88,14 +84,6 @@ public class CheckedParamTextContentAssisted extends CheckedParamText {
cpa.setFilterStyle(ContentProposalAdapter.FILTER_NONE);
cpa.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_INSERT);
cpa.addContentProposalListener(m_popupListener);
- cpa.addContentProposalListener(new IContentProposalListener() {
-
- @Override
- public void proposalAccepted(IContentProposal proposal) {
- m_accepted = true;
-
- }
- });
}
/**
@@ -104,17 +92,4 @@ public class CheckedParamTextContentAssisted extends CheckedParamText {
public boolean isPopupOpen() {
return m_popupOpen;
}
- /**
- * @return if the content was accepted
- */
- public boolean isAccepted() {
- return m_accepted;
- }
- /**
- *
- * @param accepted the sccepted state
- */
- public void setAccepted(boolean accepted) {
- m_accepted = accepted;
- }
}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ParamProposalProvider.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ParamProposalProvider.java
index fbe222f00..428f64b45 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ParamProposalProvider.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/ParamProposalProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.jubula.client.ui.rcp.widgets;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -124,7 +125,7 @@ public class ParamProposalProvider implements IContentProposalProvider {
}
/** a map with values as key and comment as value */
- private Map<String, String> m_valueToComment;
+ private Map<String, String> m_valueToComment = new HashMap<>();
/** the node for which to provide proposals */
private INodePO m_node;
@@ -148,7 +149,9 @@ public class ParamProposalProvider implements IContentProposalProvider {
public ParamProposalProvider(String[] valueSet, INodePO node,
IParamDescriptionPO paramDesc) {
for (String string : valueSet) {
- m_valueToComment.put(string, StringConstants.EMPTY);
+ if (string != null) {
+ m_valueToComment.put(string, StringConstants.EMPTY);
+ }
}
m_node = node;
m_paramDesc = paramDesc;

Back to the top