Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Schladebeck2012-03-19 10:15:14 +0000
committerAlexandra Schladebeck2012-03-19 10:15:14 +0000
commit0d4fcf797867475eb0a54991629cf814d14053f0 (patch)
tree1d35012498e703539a2654ffab0c06c3a0bd2f4c
parentaef2cd9592209e92674f3b4aa5d82c3f58fdce0c (diff)
parentbcad32a3e521cb4e67dad04ac8de97e226c47f42 (diff)
downloadorg.eclipse.jubula.core-0d4fcf797867475eb0a54991629cf814d14053f0.tar.gz
org.eclipse.jubula.core-0d4fcf797867475eb0a54991629cf814d14053f0.tar.xz
org.eclipse.jubula.core-0d4fcf797867475eb0a54991629cf814d14053f0.zip
Merge branch 'master' of ssh://gatekeeper.bredex.de:2407/jubula/org.eclipse.jubula.corev1.2.0
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java13
-rw-r--r--org.eclipse.jubula.documentation/build.xml3
-rw-r--r--org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages.properties2
-rw-r--r--org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages_de.properties2
4 files changed, 17 insertions, 3 deletions
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 11cdb7a4c..f9f944db9 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
@@ -11,6 +11,7 @@
package org.eclipse.jubula.client.core.businessprocess.compcheck;
import java.util.HashSet;
+import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -129,8 +130,9 @@ public final class CompletenessGuard {
if (compName != null && objMap != null) {
IComponentIdentifier id = null;
+ List<INodePO> currentTreePath = ctx.getCurrentTreePath();
CompNameResult result = m_compNamesBP.findCompName(
- ctx.getCurrentTreePath(), cap, cap.getComponentName(),
+ currentTreePath, cap, cap.getComponentName(),
ComponentNamesBP.getInstance());
try {
id = objMap.getTechnicalName(result.getCompName());
@@ -139,6 +141,15 @@ public final class CompletenessGuard {
}
if (id == null) {
INodePO rNode = result.getResponsibleNode();
+ if (rNode instanceof ICapPO) {
+ // this is a workaround for issue
+ // http://bugzilla.bredex.de/289#c4
+ int responsibleNodeIdx = currentTreePath
+ .lastIndexOf(rNode) - 1;
+ if (responsibleNodeIdx > -1) {
+ rNode = currentTreePath.get(responsibleNodeIdx);
+ }
+ }
setCompletenessObjectMapping(rNode, m_aut, false);
} else {
setCompletenessObjectMapping(cap, m_aut, true);
diff --git a/org.eclipse.jubula.documentation/build.xml b/org.eclipse.jubula.documentation/build.xml
index 13bdf4f50..267c70587 100644
--- a/org.eclipse.jubula.documentation/build.xml
+++ b/org.eclipse.jubula.documentation/build.xml
@@ -5,6 +5,9 @@
<target name="setupBuildDocumentation">
<mkdir dir="${buildLogDir}" />
+ <loadproperties srcFile="${buildRoot}/../../../guidancer/Configurations/build.properties" />
+ <fail unless="build.version" />
+ <echo message="Using build.version: ${build.version}" />
<exec executable="make" failonerror="true" dir="${buildRoot}">
<arg line="setversion TAG=V${build.version}" />
</exec>
diff --git a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages.properties b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages.properties
index a70d9ada6..111c7827e 100644
--- a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages.properties
+++ b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages.properties
@@ -10,7 +10,7 @@ action.clear.description=Clear description
action.copy.to.clipboard=Copy to clipboard
action.show.waiting.dialog=Show waiting dialog
actor=Actor
-application.name=DVD Manager Version 2.0
+application.name=DVD Manager Version 3.0
application.title=DVD Manager
bonus=Bonus
categories=Categories
diff --git a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages_de.properties b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages_de.properties
index d8f1a2e1b..b90f738bc 100644
--- a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages_de.properties
+++ b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/messages_de.properties
@@ -20,7 +20,7 @@ region_code.rc5=RC5
region_code.rc6=RC6
region_code.rc7=RC8
region_code=Regionalcode
-application.name=DVD-Verwaltung Version 2.0
+application.name=DVD-Verwaltung Version 3.0
application.title=DVD Verwaltung
dialog.about.title=Info
dialog.error.title=Fehler

Back to the top