Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Mueller2018-02-20 04:49:51 -0500
committerMarvin Mueller2018-02-20 06:55:17 -0500
commit1c54056ed07383edc61a24e038ba7d9875b47a3f (patch)
tree86d24a9ea4090158ff65c778c334ae51bdef08ad
parenta404a5454d678a023bc128cf1f4606c7bdc5ce91 (diff)
downloadorg.eclipse.jubula.core-1c54056ed07383edc61a24e038ba7d9875b47a3f.tar.gz
org.eclipse.jubula.core-1c54056ed07383edc61a24e038ba7d9875b47a3f.tar.xz
org.eclipse.jubula.core-1c54056ed07383edc61a24e038ba7d9875b47a3f.zip
Fix various smaller problems Problems
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java1
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java4
-rw-r--r--org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/gui/MarkerHandler.java9
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/JBEditorHelper.java6
4 files changed, 16 insertions, 4 deletions
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
index fb4be5ccf..a7b066e8b 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
@@ -1059,6 +1059,7 @@ public class FileStorageBP {
e.getMessage()})));
}
exportSession.detach(projectToExport);
+ exportSession.clear();
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java
index 3a2485bc6..e2239f575 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java
@@ -16,6 +16,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -225,6 +226,9 @@ public final class CompletenessGuard {
INodePO possibleDataSourceNode = node;
if (node instanceof IExecTestCasePO) {
IExecTestCasePO execTc = (IExecTestCasePO) node;
+ if (StringUtils.isNotBlank(execTc.getDataFile())) {
+ return;
+ }
if (execTc.getHasReferencedTD()) {
possibleDataSourceNode = execTc.getSpecTestCase();
}
diff --git a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/gui/MarkerHandler.java b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/gui/MarkerHandler.java
index 8eb672aa4..6289c7faf 100644
--- a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/gui/MarkerHandler.java
+++ b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/gui/MarkerHandler.java
@@ -101,10 +101,13 @@ public class MarkerHandler {
*/
public void remove(Problem problem) {
try {
- IMarker marker = m_res.findMarker(m_problems.get(problem).getId());
- marker.delete();
+ IMarker problemMarker = m_problems.get(problem);
+ if (problemMarker != null) {
+ IMarker marker = m_res.findMarker(problemMarker.getId());
+ marker.delete();
+ m_markers.remove(marker);
+ }
m_problems.remove(problem);
- m_markers.remove(marker);
} catch (CoreException e) {
e.printStackTrace();
}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/JBEditorHelper.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/JBEditorHelper.java
index bd5d7ecc5..b1f4c9370 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/JBEditorHelper.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/JBEditorHelper.java
@@ -273,7 +273,11 @@ public class JBEditorHelper implements ILockedObjects,
*/
public void handleDataChanged(final IPersistentObject po,
final DataState dataState) {
- IPersistentObject workVersion = getEditSupport().getWorkVersion();
+ EditSupport editSupport = getEditSupport();
+ if (editSupport == null) {
+ return;
+ }
+ IPersistentObject workVersion = editSupport.getWorkVersion();
switch (dataState) {
case Added:

Back to the top