Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java11
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerOMEditor.java10
-rw-r--r--org.eclipse.jubula.repo/pom.xml17
4 files changed, 19 insertions, 21 deletions
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java
index 648b39295..5e81b2d11 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java
@@ -490,8 +490,8 @@ public class EditSupport {
m_workVersion = workVersion;
m_compMapper.setCompNameCache(
new ComponentNamesDecorator(getSession()));
- m_compMapper.setContext(m_workVersion);
m_workVersion = m_session.merge(m_workVersion);
+ m_compMapper.setContext(m_workVersion);
} catch (PersistenceException e) {
final String msg = Messages.ReinitOfSessionFailed;
log.error(msg);
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 2b25b4795..e2b3e94d9 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
@@ -1232,6 +1232,7 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
IAUTMainPO aut = (IAUTMainPO)obj;
if (getAut().equals(aut)) {
cleanupNames();
+ synchronizeViewers();
}
break;
case IObjectMappingObserver.EVENT_COMPONENT_MAPPED :
@@ -1245,6 +1246,16 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
default:
}
}
+
+ /**
+ * Synchronizes the Viewers with the Edit Support after the latter changes
+ */
+ public void synchronizeViewers() {
+ final IObjectMappingPO om = getAut().getObjMap();
+ m_compNameTreeViewer.setInput(om.getUnmappedLogicalCategory());
+ m_uiElementTreeViewer.setInput(om.getUnmappedTechnicalCategory());
+ m_mappedComponentTreeViewer.setInput(om.getMappedCategory());
+ }
/**
* {@inheritDoc}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerOMEditor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerOMEditor.java
index b67eef483..3d6f4924d 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerOMEditor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerOMEditor.java
@@ -112,6 +112,7 @@ public class DeleteTreeItemHandlerOMEditor
if (toDelete.length > 0) {
editor.getEditorHelper().setDirty(true);
editor.cleanupNames();
+ editor.synchronizeViewers();
}
return lastParent;
}
@@ -139,7 +140,8 @@ public class DeleteTreeItemHandlerOMEditor
lastParent = editor.getOmEditorBP().deleteAssociation(
(IObjectMappingAssoziationPO)toDelete);
editor.getEditorHelper().setDirty(true);
- editor.cleanupNames();
+ editor.cleanupNames();
+ editor.synchronizeViewers();
}
} else if (toDelete instanceof IComponentNamePO) {
delete = MessageDialog.openConfirm(getActiveShell(),
@@ -149,7 +151,8 @@ public class DeleteTreeItemHandlerOMEditor
lastParent = editor.getOmEditorBP().deleteCompName(
(IComponentNamePO)toDelete);
editor.getEditorHelper().setDirty(true);
- editor.cleanupNames();
+ editor.cleanupNames();
+ editor.synchronizeViewers();
}
} else if (toDelete instanceof IObjectMappingCategoryPO) {
delete = MessageDialog.openConfirm(getActiveShell(),
@@ -159,7 +162,8 @@ public class DeleteTreeItemHandlerOMEditor
lastParent = editor.getOmEditorBP().deleteCategory(
(IObjectMappingCategoryPO)toDelete);
editor.getEditorHelper().setDirty(true);
- editor.cleanupNames();
+ editor.cleanupNames();
+ editor.synchronizeViewers();
}
}
return lastParent;
diff --git a/org.eclipse.jubula.repo/pom.xml b/org.eclipse.jubula.repo/pom.xml
index cdd4e3dc5..1940dc154 100644
--- a/org.eclipse.jubula.repo/pom.xml
+++ b/org.eclipse.jubula.repo/pom.xml
@@ -24,7 +24,6 @@
</activation>
<build>
<plugins>
- <!-- deploy "development" p2 repository -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -36,26 +35,10 @@
</goals>
<configuration>
<tasks>
- <property name="targetDir" value="/home/data/httpd/download.eclipse.org/jubula/nightly"/>
<checksum
file="${project.build.directory}/${project.artifactId}-${project.version}.zip"
forceOverwrite="yes"
algorithm="SHA-512" fileext=".sha" />
- <delete includeemptydirs="false">
- <fileset dir="${targetDir}">
- <include name="**" />
- </fileset>
- </delete>
- <move todir="${targetDir}">
- <fileset dir="${project.build.directory}">
- <include name="${project.artifactId}-${project.version}.zip*" />
- </fileset>
- </move>
- <move includeemptydirs="false" todir="${targetDir}/repo">
- <fileset dir="target/repository">
- <include name="**" />
- </fileset>
- </move>
</tasks>
</configuration>
</execution>

Back to the top