diff --git a/edu.kit.ipd.descartes.mm.workload.editor/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.workload.editor/META-INF/MANIFEST.MF
index 2bfd35ef3dc38530e41d52bbe7075cdaa4aef524..c8477f41205685eb9f9f689cf11ce95f6055c45a 100644
--- a/edu.kit.ipd.descartes.mm.workload.editor/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.mm.workload.editor/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Bundle-Activator: edu.kit.ipd.descartes.mm.workload.presentation.WorkloadEditorP
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: edu.kit.ipd.descartes.mm.workload.presentation,
- edu.kit.ipd.descartes.mm.workload.workload.presentation
+Export-Package: edu.kit.ipd.descartes.mm.workload.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
edu.kit.ipd.descartes.mm.workload.edit;visibility:=reexport,
diff --git a/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadActionBarContributor.java b/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadActionBarContributor.java
similarity index 98%
rename from edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadActionBarContributor.java
rename to edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadActionBarContributor.java
index 263a6f06d6756fca5d721b2d1ee30fc6eb8effed..80d39c85e31b46540ac40fd2d7750e12a22b0a1c 100644
--- a/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadActionBarContributor.java
+++ b/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadActionBarContributor.java
@@ -1,9 +1,7 @@
/**
* Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
*/
-package edu.kit.ipd.descartes.mm.workload.workload.presentation;
-
-import edu.kit.ipd.descartes.mm.workload.presentation.WorkloadEditorPlugin;
+package edu.kit.ipd.descartes.mm.workload.presentation;
import java.util.ArrayList;
import java.util.Collection;
@@ -181,7 +179,7 @@ public class WorkloadActionBarContributor
public void contributeToMenu(IMenuManager menuManager) {
super.contributeToMenu(menuManager);
- IMenuManager submenuManager = new MenuManager(WorkloadEditorPlugin.INSTANCE.getString("_UI_WorkloadEditor_menu"), "edu.kit.ipd.descartes.mm.workload.workloadMenuID");
+ IMenuManager submenuManager = new MenuManager(WorkloadEditorPlugin.INSTANCE.getString("_UI_WorkloadEditor_menu"), "edu.kit.ipd.descartes.mm.workloadMenuID");
menuManager.insertAfter("additions", submenuManager);
submenuManager.add(new Separator("settings"));
submenuManager.add(new Separator("actions"));
diff --git a/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadEditor.java b/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadEditor.java
similarity index 99%
rename from edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadEditor.java
rename to edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadEditor.java
index 5a3c834932a7a38c6c662e26dcb745491b12977e..d07c523f3da66a2cf38b4fbd06c89db1847b76e6 100644
--- a/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadEditor.java
+++ b/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadEditor.java
@@ -1,7 +1,7 @@
/**
* Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
*/
-package edu.kit.ipd.descartes.mm.workload.workload.presentation;
+package edu.kit.ipd.descartes.mm.workload.presentation;
import java.io.IOException;
@@ -154,7 +154,7 @@ import org.eclipse.emf.edit.ui.util.EditUIUtil;
import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import edu.kit.ipd.descartes.mm.workload.workload.provider.WorkloadItemProviderAdapterFactory;
+import edu.kit.ipd.descartes.mm.workload.provider.WorkloadItemProviderAdapterFactory;
import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
@@ -168,8 +168,6 @@ import edu.kit.ipd.descartes.mm.applicationlevel.repository.provider.RepositoryI
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider.ServicebehaviorItemProviderAdapterFactory;
-import edu.kit.ipd.descartes.mm.workload.presentation.WorkloadEditorPlugin;
-
import org.eclipse.ui.actions.WorkspaceModifyOperation;
diff --git a/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadModelWizard.java b/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadModelWizard.java
similarity index 98%
rename from edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadModelWizard.java
rename to edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadModelWizard.java
index fda7f5d97b7c65d8602e57c3b38595ed9ed98200..18dd32525ae1135282a599fc7b8dea96a62a817e 100644
--- a/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadModelWizard.java
+++ b/edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadModelWizard.java
@@ -1,7 +1,7 @@
/**
* Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
*/
-package edu.kit.ipd.descartes.mm.workload.workload.presentation;
+package edu.kit.ipd.descartes.mm.workload.presentation;
import java.util.ArrayList;
@@ -70,13 +70,11 @@ import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.ISetSelectionTarget;
-import edu.kit.ipd.descartes.mm.workload.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.workload.WorkloadPackage;
+import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
+import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
import edu.kit.ipd.descartes.mm.workload.provider.WorkloadEditPlugin;
-import edu.kit.ipd.descartes.mm.workload.presentation.WorkloadEditorPlugin;
-
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.ISelection;
@@ -398,7 +396,8 @@ public class WorkloadModelWizard extends Wizard implements INewWizard {
* @generated
*/
public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE); {
+ Composite composite = new Composite(parent, SWT.NONE);
+ {
GridLayout layout = new GridLayout();
layout.numColumns = 1;
layout.verticalSpacing = 12;