corrected package naming from edu.kit.ipd.descartes.mm.workload.workload to...

corrected package naming from edu.kit.ipd.descartes.mm.workload.workload to edu.kit.ipd.descartes.mm.workload

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10133 9e42b895-fcda-4063-8a3b-11be15eb1bbd

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,

edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadActionBarContributor.java → edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadActionBarContributor.java

 /**
  * 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"));

edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadEditor.java → edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadEditor.java

 /**
  * 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;
 
 

edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/workload/presentation/WorkloadModelWizard.java → edu.kit.ipd.descartes.mm.workload.editor/src/edu/kit/ipd/descartes/mm/workload/presentation/WorkloadModelWizard.java

 /**
  * 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;