### Eclipse Workspace Patch 1.0
#P de.fzi.kamp.ui2
Index: src/de/fzi/kamp/ui/workplanediting/providers/WorkPlanContainmentTreeLabelProvider.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/providers/WorkPlanContainmentTreeLabelProvider.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/providers/WorkPlanContainmentTreeLabelProvider.java	(working copy)
@@ -40,7 +40,7 @@
 		if(element instanceof CompositeTask){
 			
 			switch (columnIndex) {
-			case 0: return "Composite Task";				
+			case 0: return "Composite Activity";				
 			case 1: return ((CompositeTask)element).getTaskrationale().getKeyword();
 			case 2: return "";
 			case 3: return "";
Index: src/de/fzi/kamp/ui/workplanediting/listeners/GoToPreparationPageListener.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/listeners/GoToPreparationPageListener.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/listeners/GoToPreparationPageListener.java	(working copy)
@@ -5,11 +5,11 @@
 
 import de.fzi.kamp.service.IMainEditor;
 
-public class GoToPreparationPageistener extends SelectionAdapter {
+public class GoToPreparationPageListener extends SelectionAdapter {
 	
 	private IMainEditor mainEditor;
 	
-	public GoToPreparationPageistener(IMainEditor mainEditor) {
+	public GoToPreparationPageListener(IMainEditor mainEditor) {
 		this.mainEditor = mainEditor;
 	}
 
Index: src/de/fzi/kamp/ui/maineditor/MainEditorUI.java
===================================================================
--- src/de/fzi/kamp/ui/maineditor/MainEditorUI.java	(revision 912)
+++ src/de/fzi/kamp/ui/maineditor/MainEditorUI.java	(working copy)
@@ -320,7 +320,7 @@
 	
 	public void showWorkplanChanges(Workplan workplan, boolean isEditableEffort){
 				
-		centralPageFactory.notifyTreeAdapter(workplan, false, isEditableEffort, false);
+		centralPageFactory.setViewForOpenedWorkplan(workplan, false, isEditableEffort, false);
 		centralPageFactory.setWorkplanAsTopControl();			
 	}
 	
Index: src/de/fzi/kamp/ui/maineditor/stacklayers/WorkorganisationTreeLayer.java
===================================================================
--- src/de/fzi/kamp/ui/maineditor/stacklayers/WorkorganisationTreeLayer.java	(revision 912)
+++ src/de/fzi/kamp/ui/maineditor/stacklayers/WorkorganisationTreeLayer.java	(working copy)
@@ -16,7 +16,7 @@
 import de.fzi.kamp.service.AnalysisManager;
 import de.fzi.kamp.service.IMainEditor;
 import de.fzi.kamp.ui.general.SurfaceFactory;
-import de.fzi.kamp.ui.workplanediting.listeners.GoToPreparationPageistener;
+import de.fzi.kamp.ui.workplanediting.listeners.GoToPreparationPageListener;
 
 public class WorkorganisationTreeLayer {
 	
@@ -62,7 +62,7 @@
 		
 		workorganisationTreeViewer.setInput(analysisManager.getAnalysisModel().getWorkorganisation().get(0));
 		
-		SelectionAdapter[] listener = {new GoToPreparationPageistener(mainEditor)};
+		SelectionAdapter[] listener = {new GoToPreparationPageListener(mainEditor)};
 		factory.createHorizontalButtonsForEclipseForm(display,form.getBody(), new String[]{"Back To Preparation Page"},
 																		listener, TableWrapData.RIGHT, TableWrapData.RIGHT, false);
 		
Index: src/de/fzi/kamp/ui/workplanediting/listeners/LowestAbstractionListener.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/listeners/LowestAbstractionListener.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/listeners/LowestAbstractionListener.java	(working copy)
@@ -2,21 +2,23 @@
 
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Tree;
 
 import de.fzi.kamp.service.ICentralEditorPage;
-import de.fzi.maintainabilitymodel.main.EffortAnalysisInstance;
 import de.fzi.maintainabilitymodel.workplan.Workplan;
 
 public class LowestAbstractionListener extends SelectionAdapter {
 	
 	private ICentralEditorPage page;
 	private Tree tree;
+	private Button checkbox;
 
-	public LowestAbstractionListener(ICentralEditorPage page, Tree tree) {
+	public LowestAbstractionListener(ICentralEditorPage page, Tree tree, Button checkbox) {
 		super();
 		this.page = page;
 		this.tree = tree;
+		this.checkbox = checkbox;
 	}
 	
 	@Override
@@ -29,9 +31,8 @@
 	public void widgetSelected(SelectionEvent e) {
 		
 		if(tree.getData() instanceof Workplan){
-
-			EffortAnalysisInstance instance = ((Workplan)tree.getData()).getEffortanalaysisinstance();
-			this.page.notifyTreeAdapter(instance.getWorkplan(), false, false, true);
+			boolean testSelection = checkbox.getSelection();
+			this.page.updateWorkplanTree((Workplan)tree.getData(), false, true, checkbox.getSelection());
 		}
 		
 		super.widgetSelected(e);
Index: src/de/fzi/kamp/ui/workplanediting/listeners/WorkplanContainmentButtonListener.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/listeners/WorkplanContainmentButtonListener.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/listeners/WorkplanContainmentButtonListener.java	(working copy)
@@ -29,8 +29,8 @@
 		
 		if(tree.getData() instanceof Workplan){
 		
-			EffortAnalysisInstance instance = ((Workplan)tree.getData()).getEffortanalaysisinstance();
-			this.editorPage.notifyTreeAdapter(instance.getWorkplan(), false, false, false);
+			//EffortAnalysisInstance instance = ((Workplan)tree.getData()).getEffortanalaysisinstance();
+			this.editorPage.updateWorkplanTree((Workplan)tree.getData(), false, false, false);
 		}	
 		super.widgetSelected(e);
 	}
Index: src/de/fzi/kamp/ui/workplanediting/listeners/GoToPreparationPageistener.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/listeners/GoToPreparationPageistener.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/listeners/GoToPreparationPageistener.java	(working copy)
@@ -1,25 +0,0 @@
-package de.fzi.kamp.ui.workplanediting.listeners;
-
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-
-import de.fzi.kamp.service.IMainEditor;
-
-public class GoToPreparationPageistener extends SelectionAdapter {
-	
-	private IMainEditor mainEditor;
-	
-	public GoToPreparationPageistener(IMainEditor mainEditor) {
-		this.mainEditor = mainEditor;
-	}
-
-
-	@Override
-	public void widgetSelected(SelectionEvent e) {
-		
-		mainEditor.getCentralPage().setPreparationPageAsTopControl();
-		super.widgetSelected(e);
-	}
-
-
-}
Index: src/de/fzi/kamp/ui/maineditor/stacklayers/WorkplanTableLayer.java
===================================================================
--- src/de/fzi/kamp/ui/maineditor/stacklayers/WorkplanTableLayer.java	(revision 912)
+++ src/de/fzi/kamp/ui/maineditor/stacklayers/WorkplanTableLayer.java	(working copy)
@@ -41,8 +41,7 @@
 		
 	public WorkplanTableLayer(CentralEditorPage page) {
 		this.page = page;
-		this.factory = new SurfaceFactory();
-		this.workplan = workplan;
+		this.factory = new SurfaceFactory();		
 	}
 	
 	
@@ -93,22 +92,19 @@
 			
 			FormToolkit toolkit = new FormToolkit(display);
 			
-//			Composite selectOrder = factory.createCompositeForEclipseForm(display, form.getBody(), SWT.NONE, TableWrapData.RIGHT, true, 1, 1);
-			
 			Group group = factory.createGroupWithWhiteBackgroundTableWrap(display, this.form.getBody(), "Show Activities in", TableWrapData.RIGHT, false, 1,4);
 			group.setFont(factory.getFontStyle().getBold(SurfaceFactory.STYLE_GROUP));
-			
-			
+						
 				if(!isEditableEffort){
 					Button containment = toolkit.createButton(group, "Containment Relation", SWT.RADIO);
 					containment.addSelectionListener(new WorkplanContainmentButtonListener(this.page, this.tree));
 					containment.setSelection(true);
-					
+										
 					Button followUp = toolkit.createButton(group, "Follow-Up Relation", SWT.RADIO);
 					followUp.addSelectionListener(new WorkplanFollowUpButtonListener(this.page, this.tree));
 				}else{
-					Button elements = toolkit.createButton(group, "Lowest Abstraction Level", SWT.CHECK);
-					elements.addSelectionListener(new LowestAbstractionListener(this.page, this.tree));
+					Button lowestAbstractionButton = toolkit.createButton(group, "Lowest Abstraction Level", SWT.CHECK);
+					lowestAbstractionButton.addSelectionListener(new LowestAbstractionListener(this.page, this.tree, lowestAbstractionButton));
 					
 					Button xxx = toolkit.createButton(group, "Developer Structure", SWT.CHECK);
 					//TODO add listener
Index: src/de/fzi/kamp/ui/workplanediting/adapter/WorkPlanContentAdapter.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/adapter/WorkPlanContentAdapter.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/adapter/WorkPlanContentAdapter.java	(working copy)
@@ -47,7 +47,7 @@
 		this.workplan = workplan;
 		this.controls = new LinkedList<Control>();
 
-		update(this.workplan, true, false, false);
+		update(this.workplan, false, false, false);
 	}
 
 
Index: src/de/fzi/kamp/ui/workplanediting/listeners/WorkplanFollowUpButtonListener.java
===================================================================
--- src/de/fzi/kamp/ui/workplanediting/listeners/WorkplanFollowUpButtonListener.java	(revision 912)
+++ src/de/fzi/kamp/ui/workplanediting/listeners/WorkplanFollowUpButtonListener.java	(working copy)
@@ -29,8 +29,8 @@
 		
 		if(tree.getData() instanceof Workplan){
 
-			EffortAnalysisInstance instance = ((Workplan)tree.getData()).getEffortanalaysisinstance();
-			this.editorPage.notifyTreeAdapter(instance.getWorkplan(), true, false, false);
+//			EffortAnalysisInstance instance = ((Workplan)tree.getData()).getEffortanalaysisinstance();
+			this.editorPage.updateWorkplanTree((Workplan)tree.getData(), true, false, false);
 		}
 		super.widgetSelected(e);
 	}
Index: src/de/fzi/kamp/ui/maineditor/page/CentralEditorPage.java
===================================================================
--- src/de/fzi/kamp/ui/maineditor/page/CentralEditorPage.java	(revision 912)
+++ src/de/fzi/kamp/ui/maineditor/page/CentralEditorPage.java	(working copy)
@@ -144,13 +144,17 @@
 		this.globalContainer.layout();
 	}
 	
-	public void notifyTreeAdapter(Workplan workplan, boolean followUp, boolean isEditableEffort, boolean lowestAbstraction){
+	public void setViewForOpenedWorkplan(Workplan workplan, boolean followUp, boolean isEditableEffort, boolean lowestAbstraction){
 		this.workplanLayer.setIsEditableEffort(isEditableEffort);
-		if(!isEditableEffort)
+		if(isEditableEffort)
 			this.workplanLayer.showEffortEstimationColumns();
 		else
 			this.workplanLayer.hideButtons();
 		
+		updateWorkplanTree(workplan, followUp, isEditableEffort, lowestAbstraction);
+	}
+	
+	public void updateWorkplanTree(Workplan workplan, boolean followUp, boolean isEditableEffort, boolean lowestAbstraction){
 		this.workplanLayer.getAdapter().update(workplan, followUp, isEditableEffort, lowestAbstraction);
-	}	
+	}
 }
Index: src/de/fzi/kamp/ui/maineditor/stacklayers/AnalysisInstanceLayer.java
===================================================================
--- src/de/fzi/kamp/ui/maineditor/stacklayers/AnalysisInstanceLayer.java	(revision 912)
+++ src/de/fzi/kamp/ui/maineditor/stacklayers/AnalysisInstanceLayer.java	(working copy)
@@ -20,7 +20,7 @@
 import de.fzi.kamp.ui.analysisinstance.listeners.AnalysisInstanceRemoveArchitectureSelectionListener;
 import de.fzi.kamp.ui.general.SurfaceFactory;
 import de.fzi.kamp.ui.preparation.listeners.GoToAnalysisInstancePageListener;
-import de.fzi.kamp.ui.workplanediting.listeners.GoToPreparationPageistener;
+import de.fzi.kamp.ui.workplanediting.listeners.GoToPreparationPageListener;
 import de.fzi.kamp.ui.workplanediting.listeners.GoToWorkorganisationView;
 
 public class AnalysisInstanceLayer {
@@ -80,6 +80,6 @@
 		Group group = factory.createGroupWithWhiteBackgroundTableWrap(display, this.comp, "Back to", TableWrapData.CENTER, true, 1, 1);
 		
 		factory.createHorizontalButtonsForEclipseForm(display, group, new String[]{"Preparation Page"}, 
-				new SelectionAdapter[]{new GoToPreparationPageistener(mainEditorUI)}, TableWrapData.CENTER, TableWrapData.CENTER, false);
+				new SelectionAdapter[]{new GoToPreparationPageListener(mainEditorUI)}, TableWrapData.CENTER, TableWrapData.CENTER, false);
 	}
 }
#P de.fzi.kamp.service2
Index: src/de/fzi/kamp/service/ICentralEditorPage.java
===================================================================
--- src/de/fzi/kamp/service/ICentralEditorPage.java	(revision 912)
+++ src/de/fzi/kamp/service/ICentralEditorPage.java	(working copy)
@@ -12,6 +12,8 @@
 	
 	public void setWorkorganisationPageAsTopControl();
 	
-	public void notifyTreeAdapter(Workplan workplan, boolean followUp, boolean isEditableEffort, boolean samePage);
+	public void setViewForOpenedWorkplan(Workplan workplan, boolean followUp, boolean isEditableEffort, boolean samePage);
+	
+	public void updateWorkplanTree(Workplan workplan, boolean followUp, boolean isEditableEffort, boolean lowestAbstraction);
 
 }
