From 9d04b5f4bbcce3fb089c0444d49df248a532414c Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Thu, 28 Feb 2013 08:42:58 +0000 Subject: [PATCH] removed dependency to resourcepoolconfig git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10495 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../META-INF/MANIFEST.MF | 3 +- ...ntainerrepositoryActionBarContributor.java | 142 ++--- .../ContainerrepositoryEditor.java | 507 +++++++++-------- .../ContainerrepositoryModelWizard.java | 213 ++++---- ...urceconfigurationActionBarContributor.java | 142 ++--- .../ResourceconfigurationEditor.java | 507 +++++++++-------- .../ResourceconfigurationModelWizard.java | 213 ++++---- .../presentation/ResourcelandscapeEditor.java | 507 +++++++++-------- .../ResourcelandscapeEditorPlugin.java | 53 +- .../presentation/ResourcetypeEditor.java | 508 +++++++++--------- 10 files changed, 1395 insertions(+), 1400 deletions(-) diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF index 844b4155..9f5b3044 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF @@ -19,6 +19,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit.ui;visibility:=reexport, org.eclipse.ui.ide;visibility:=reexport, edu.kit.ipd.descartes.core.edit;visibility:=reexport, - edu.kit.ipd.descartes.identifier.edit;visibility:=reexport, - edu.kit.ipd.descartes.mm.resourcepoolconfig.edit;visibility:=reexport + edu.kit.ipd.descartes.identifier.edit;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryActionBarContributor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryActionBarContributor.java index 625c9730..0da5c2d1 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryActionBarContributor.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryActionBarContributor.java @@ -49,32 +49,32 @@ import org.eclipse.ui.PartInitException; * @generated */ public class ContainerrepositoryActionBarContributor - extends EditingDomainActionBarContributor - implements ISelectionChangedListener { - /** + extends EditingDomainActionBarContributor + implements ISelectionChangedListener { + /** * This keeps track of the active editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IEditorPart activeEditorPart; + protected IEditorPart activeEditorPart; - /** + /** * This keeps track of the current selection provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelectionProvider selectionProvider; + protected ISelectionProvider selectionProvider; - /** + /** * This action opens the Properties view. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IAction showPropertiesViewAction = - new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) { + protected IAction showPropertiesViewAction = + new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) { @Override public void run() { try { @@ -86,15 +86,15 @@ public class ContainerrepositoryActionBarContributor } }; - /** + /** * This action refreshes the viewer of the current editor if the editor * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IAction refreshViewerAction = - new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { + protected IAction refreshViewerAction = + new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { @Override public boolean isEnabled() { return activeEditorPart instanceof IViewerProvider; @@ -111,74 +111,74 @@ public class ContainerrepositoryActionBarContributor } }; - /** + /** * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor * generated for the current selection by the item provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> createChildActions; + protected Collection<IAction> createChildActions; - /** + /** * This is the menu manager into which menu contribution items should be added for CreateChild actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IMenuManager createChildMenuManager; + protected IMenuManager createChildMenuManager; - /** + /** * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor * generated for the current selection by the item provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> createSiblingActions; + protected Collection<IAction> createSiblingActions; - /** + /** * This is the menu manager into which menu contribution items should be added for CreateSibling actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IMenuManager createSiblingMenuManager; + protected IMenuManager createSiblingMenuManager; - /** + /** * This creates an instance of the contributor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ContainerrepositoryActionBarContributor() { + public ContainerrepositoryActionBarContributor() { super(ADDITIONS_LAST_STYLE); loadResourceAction = new LoadResourceAction(); validateAction = new ValidateAction(); controlAction = new ControlAction(); } - /** + /** * This adds Separators for editor additions to the tool bar. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void contributeToToolBar(IToolBarManager toolBarManager) { + @Override + public void contributeToToolBar(IToolBarManager toolBarManager) { toolBarManager.add(new Separator("containerrepository-settings")); toolBarManager.add(new Separator("containerrepository-additions")); } - /** + /** * This adds to the menu bar a menu and some separators for editor additions, * as well as the sub-menus for object creation items. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void contributeToMenu(IMenuManager menuManager) { + @Override + public void contributeToMenu(IMenuManager menuManager) { super.contributeToMenu(menuManager); IMenuManager submenuManager = new MenuManager(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ContainerrepositoryEditor_menu"), "edu.kit.ipd.descartes.mm.containerrepositoryMenuID"); @@ -210,14 +210,14 @@ public class ContainerrepositoryActionBarContributor addGlobalActions(submenuManager); } - /** + /** * When the active editor changes, this remembers the change and registers with it as a selection provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setActiveEditor(IEditorPart part) { + @Override + public void setActiveEditor(IEditorPart part) { super.setActiveEditor(part); activeEditorPart = part; @@ -241,15 +241,15 @@ public class ContainerrepositoryActionBarContributor } } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings * that can be added to the selected object and updating the menus accordingly. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void selectionChanged(SelectionChangedEvent event) { + public void selectionChanged(SelectionChangedEvent event) { // Remove any menu items for old selection. // if (createChildMenuManager != null) { @@ -289,14 +289,14 @@ public class ContainerrepositoryActionBarContributor } } - /** + /** * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>, * and returns the collection of these actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) { + protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) { Collection<IAction> actions = new ArrayList<IAction>(); if (descriptors != null) { for (Object descriptor : descriptors) { @@ -306,14 +306,14 @@ public class ContainerrepositoryActionBarContributor return actions; } - /** + /** * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>, * and returns the collection of these actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) { + protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) { Collection<IAction> actions = new ArrayList<IAction>(); if (descriptors != null) { for (Object descriptor : descriptors) { @@ -323,16 +323,16 @@ public class ContainerrepositoryActionBarContributor return actions; } - /** + /** * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection, * by inserting them before the specified contribution item <code>contributionID</code>. * If <code>contributionID</code> is <code>null</code>, they are simply added. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) { + protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) { if (actions != null) { for (IAction action : actions) { if (contributionID != null) { @@ -344,15 +344,15 @@ public class ContainerrepositoryActionBarContributor } } } - - /** + + /** * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) { + protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) { if (actions != null) { IContributionItem[] items = manager.getItems(); for (int i = 0; i < items.length; i++) { @@ -375,14 +375,14 @@ public class ContainerrepositoryActionBarContributor } } - /** + /** * This populates the pop-up menu before it appears. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void menuAboutToShow(IMenuManager menuManager) { + @Override + public void menuAboutToShow(IMenuManager menuManager) { super.menuAboutToShow(menuManager); MenuManager submenuManager = null; @@ -395,14 +395,14 @@ public class ContainerrepositoryActionBarContributor menuManager.insertBefore("edit", submenuManager); } - /** + /** * This inserts global actions before the "additions-end" separator. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void addGlobalActions(IMenuManager menuManager) { + @Override + protected void addGlobalActions(IMenuManager menuManager) { menuManager.insertAfter("additions-end", new Separator("ui-actions")); menuManager.insertAfter("ui-actions", showPropertiesViewAction); @@ -412,14 +412,14 @@ public class ContainerrepositoryActionBarContributor super.addGlobalActions(menuManager); } - /** + /** * This ensures that a delete action will clean up all references to deleted objects. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected boolean removeAllReferencesOnDelete() { + @Override + protected boolean removeAllReferencesOnDelete() { return true; } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java index 79fc14c4..8a7b6e16 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java @@ -166,7 +166,6 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resourcelandscape import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory; import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory; import org.eclipse.ui.actions.WorkspaceModifyOperation; @@ -179,164 +178,164 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; * @generated */ public class ContainerrepositoryEditor - extends MultiPageEditorPart - implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { - /** + extends MultiPageEditorPart + implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { + /** * This keeps track of the editing domain that is used to track all changes to the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected AdapterFactoryEditingDomain editingDomain; + protected AdapterFactoryEditingDomain editingDomain; - /** + /** * This is the one adapter factory used for providing views of the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ComposedAdapterFactory adapterFactory; + protected ComposedAdapterFactory adapterFactory; - /** + /** * This is the content outline page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IContentOutlinePage contentOutlinePage; + protected IContentOutlinePage contentOutlinePage; - /** + /** * This is a kludge... * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IStatusLineManager contentOutlineStatusLineManager; + protected IStatusLineManager contentOutlineStatusLineManager; - /** + /** * This is the content outline page's viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer contentOutlineViewer; + protected TreeViewer contentOutlineViewer; - /** + /** * This is the property sheet page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected PropertySheetPage propertySheetPage; + protected PropertySheetPage propertySheetPage; - /** + /** * This is the viewer that shadows the selection in the content outline. * The parent relation must be correctly defined for this to work. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer selectionViewer; + protected TreeViewer selectionViewer; - /** + /** * This inverts the roll of parent and child in the content provider and show parents as a tree. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer parentViewer; + protected TreeViewer parentViewer; - /** + /** * This shows how a tree view works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewer; + protected TreeViewer treeViewer; - /** + /** * This shows how a list view works. * A list viewer doesn't support icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ListViewer listViewer; + protected ListViewer listViewer; - /** + /** * This shows how a table view works. * A table can be used as a list with icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TableViewer tableViewer; + protected TableViewer tableViewer; - /** + /** * This shows how a tree view with columns works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewerWithColumns; + protected TreeViewer treeViewerWithColumns; - /** + /** * This keeps track of the active viewer pane, in the book. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ViewerPane currentViewerPane; + protected ViewerPane currentViewerPane; - /** + /** * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Viewer currentViewer; + protected Viewer currentViewer; - /** + /** * This listens to which ever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelectionChangedListener selectionChangedListener; + protected ISelectionChangedListener selectionChangedListener; - /** + /** * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); + protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); - /** + /** * This keeps track of the selection of the editor as a whole. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelection editorSelection = StructuredSelection.EMPTY; + protected ISelection editorSelection = StructuredSelection.EMPTY; - /** + /** * The MarkerHelper is responsible for creating workspace resource markers presented * in Eclipse's Problems View. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected MarkerHelper markerHelper = new EditUIMarkerHelper(); + protected MarkerHelper markerHelper = new EditUIMarkerHelper(); - /** + /** * This listens for when the outline becomes active * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IPartListener partListener = - new IPartListener() { + protected IPartListener partListener = + new IPartListener() { public void partActivated(IWorkbenchPart p) { if (p instanceof ContentOutline) { if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) { @@ -369,54 +368,54 @@ public class ContainerrepositoryEditor } }; - /** + /** * Resources that have been removed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> removedResources = new ArrayList<Resource>(); + protected Collection<Resource> removedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been changed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> changedResources = new ArrayList<Resource>(); + protected Collection<Resource> changedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been saved. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> savedResources = new ArrayList<Resource>(); + protected Collection<Resource> savedResources = new ArrayList<Resource>(); - /** + /** * Map to store the diagnostic associated with a resource. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); + protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); - /** + /** * Controls whether the problem indication should be updated. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean updateProblemIndication = true; + protected boolean updateProblemIndication = true; - /** + /** * Adapter used to update the problem indication when resources are demanded loaded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected EContentAdapter problemIndicationAdapter = - new EContentAdapter() { + protected EContentAdapter problemIndicationAdapter = + new EContentAdapter() { @Override public void notifyChanged(Notification notification) { if (notification.getNotifier() instanceof Resource) { @@ -461,14 +460,14 @@ public class ContainerrepositoryEditor } }; - /** + /** * This listens for workspace changes. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IResourceChangeListener resourceChangeListener = - new IResourceChangeListener() { + protected IResourceChangeListener resourceChangeListener = + new IResourceChangeListener() { public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta = event.getDelta(); try { @@ -538,13 +537,13 @@ public class ContainerrepositoryEditor } }; - /** + /** * Handles activation of the editor or it's associated views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleActivate() { + protected void handleActivate() { // Recompute the read only state. // if (editingDomain.getResourceToReadOnlyMap() != null) { @@ -573,13 +572,13 @@ public class ContainerrepositoryEditor } } - /** + /** * Handles what to do with changed resources on activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleChangedResources() { + protected void handleChangedResources() { if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { if (isDirty()) { changedResources.addAll(editingDomain.getResourceSet().getResources()); @@ -610,13 +609,13 @@ public class ContainerrepositoryEditor } } - /** + /** * Updates the problems indication with the information described in the specified diagnostic. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void updateProblemIndication() { + protected void updateProblemIndication() { if (updateProblemIndication) { BasicDiagnostic diagnostic = new BasicDiagnostic @@ -667,13 +666,13 @@ public class ContainerrepositoryEditor } } - /** + /** * Shows a dialog that asks if conflicting changes should be discarded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean handleDirtyConflict() { + protected boolean handleDirtyConflict() { return MessageDialog.openQuestion (getSite().getShell(), @@ -681,24 +680,24 @@ public class ContainerrepositoryEditor getString("_WARN_FileConflict")); } - /** + /** * This creates a model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ContainerrepositoryEditor() { + public ContainerrepositoryEditor() { super(); initializeEditingDomain(); } - /** + /** * This sets up the editing domain for the model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void initializeEditingDomain() { + protected void initializeEditingDomain() { // Create an adapter factory that yields item providers. // adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); @@ -745,24 +744,24 @@ public class ContainerrepositoryEditor editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); } - /** + /** * This is here for the listener to be able to call it. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void firePropertyChange(int action) { + @Override + protected void firePropertyChange(int action) { super.firePropertyChange(action); } - /** + /** * This sets the selection into whichever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelectionToViewer(Collection<?> collection) { + public void setSelectionToViewer(Collection<?> collection) { final Collection<?> theSelection = collection; // Make sure it's okay. // @@ -781,83 +780,83 @@ public class ContainerrepositoryEditor } } - /** + /** * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomain getEditingDomain() { + public EditingDomain getEditingDomain() { return editingDomain; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { - /** + public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { + public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { super(adapterFactory); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getElements(Object object) { + @Override + public Object [] getElements(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getChildren(Object object) { + @Override + public Object [] getChildren(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean hasChildren(Object object) { + @Override + public boolean hasChildren(Object object) { Object parent = super.getParent(object); return parent != null; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object getParent(Object object) { + @Override + public Object getParent(Object object) { return null; } - } + } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewerPane(ViewerPane viewerPane) { + public void setCurrentViewerPane(ViewerPane viewerPane) { if (currentViewerPane != viewerPane) { if (currentViewerPane != null) { currentViewerPane.showFocus(false); @@ -867,14 +866,14 @@ public class ContainerrepositoryEditor setCurrentViewer(currentViewerPane.getViewer()); } - /** + /** * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, * is the current one. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewer(Viewer viewer) { + public void setCurrentViewer(Viewer viewer) { // If it is changing... // if (currentViewer != viewer) { @@ -913,23 +912,23 @@ public class ContainerrepositoryEditor } } - /** + /** * This returns the viewer as required by the {@link IViewerProvider} interface. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Viewer getViewer() { + public Viewer getViewer() { return currentViewer; } - /** + /** * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void createContextMenuFor(StructuredViewer viewer) { + protected void createContextMenuFor(StructuredViewer viewer) { MenuManager contextMenu = new MenuManager("#PopUp"); contextMenu.add(new Separator("additions")); contextMenu.setRemoveAllWhenShown(true); @@ -944,13 +943,13 @@ public class ContainerrepositoryEditor viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); } - /** + /** * This is the method called to load a resource into the editing domain's resource set based on the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void createModel() { + public void createModel() { URI resourceURI = EditUIUtil.getURI(getEditorInput()); Exception exception = null; Resource resource = null; @@ -971,14 +970,14 @@ public class ContainerrepositoryEditor editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); } - /** + /** * Returns a diagnostic describing the errors and warnings listed in the resource * and the specified exception (if any). * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { + public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) { BasicDiagnostic basicDiagnostic = new BasicDiagnostic @@ -1004,14 +1003,14 @@ public class ContainerrepositoryEditor } } - /** + /** * This is the method used by the framework to install your own controls. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void createPages() { + @Override + public void createPages() { // Creates the model from the editor input // createModel(); @@ -1252,14 +1251,14 @@ public class ContainerrepositoryEditor }); } - /** + /** * If there is just one page in the multi-page editor part, * this hides the single tab at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void hideTabs() { + protected void hideTabs() { if (getPageCount() <= 1) { setPageText(0, ""); if (getContainer() instanceof CTabFolder) { @@ -1270,14 +1269,14 @@ public class ContainerrepositoryEditor } } - /** + /** * If there is more than one page in the multi-page editor part, * this shows the tabs at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void showTabs() { + protected void showTabs() { if (getPageCount() > 1) { setPageText(0, getString("_UI_SelectionPage_label")); if (getContainer() instanceof CTabFolder) { @@ -1288,14 +1287,14 @@ public class ContainerrepositoryEditor } } - /** + /** * This is used to track the active viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void pageChange(int pageIndex) { + @Override + protected void pageChange(int pageIndex) { super.pageChange(pageIndex); if (contentOutlinePage != null) { @@ -1303,15 +1302,15 @@ public class ContainerrepositoryEditor } } - /** + /** * This is how the framework determines which interfaces we implement. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class key) { + @SuppressWarnings("rawtypes") + @Override + public Object getAdapter(Class key) { if (key.equals(IContentOutlinePage.class)) { return showOutlineView() ? getContentOutlinePage() : null; } @@ -1326,13 +1325,13 @@ public class ContainerrepositoryEditor } } - /** + /** * This accesses a cached version of the content outliner. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IContentOutlinePage getContentOutlinePage() { + public IContentOutlinePage getContentOutlinePage() { if (contentOutlinePage == null) { // The content outline is just a tree. // @@ -1390,13 +1389,13 @@ public class ContainerrepositoryEditor return contentOutlinePage; } - /** + /** * This accesses a cached version of the property sheet. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IPropertySheetPage getPropertySheetPage() { + public IPropertySheetPage getPropertySheetPage() { if (propertySheetPage == null) { propertySheetPage = new ExtendedPropertySheetPage(editingDomain) { @@ -1418,13 +1417,13 @@ public class ContainerrepositoryEditor return propertySheetPage; } - /** + /** * This deals with how we want selection in the outliner to affect the other views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void handleContentOutlineSelection(ISelection selection) { + public void handleContentOutlineSelection(ISelection selection) { if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator(); if (selectedElements.hasNext()) { @@ -1457,25 +1456,25 @@ public class ContainerrepositoryEditor } } - /** + /** * This is for implementing {@link IEditorPart} and simply tests the command stack. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isDirty() { + @Override + public boolean isDirty() { return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded(); } - /** + /** * This is for implementing {@link IEditorPart} and simply saves the model file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSave(IProgressMonitor progressMonitor) { + @Override + public void doSave(IProgressMonitor progressMonitor) { // Save only resources that have actually changed. // final Map<Object, Object> saveOptions = new HashMap<Object, Object>(); @@ -1530,14 +1529,14 @@ public class ContainerrepositoryEditor updateProblemIndication(); } - /** + /** * This returns whether something has been persisted to the URI of the specified resource. * The implementation uses the URI converter from the editor's resource set to try to open an input stream. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean isPersisted(Resource resource) { + protected boolean isPersisted(Resource resource) { boolean result = false; try { InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI()); @@ -1552,25 +1551,25 @@ public class ContainerrepositoryEditor return result; } - /** + /** * This always returns true because it is not currently supported. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isSaveAsAllowed() { + @Override + public boolean isSaveAsAllowed() { return true; } - /** + /** * This also changes the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSaveAs() { + @Override + public void doSaveAs() { SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); saveAsDialog.open(); IPath path = saveAsDialog.getResult(); @@ -1582,12 +1581,12 @@ public class ContainerrepositoryEditor } } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void doSaveAs(URI uri, IEditorInput editorInput) { + protected void doSaveAs(URI uri, IEditorInput editorInput) { (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1598,12 +1597,12 @@ public class ContainerrepositoryEditor doSave(progressMonitor); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void gotoMarker(IMarker marker) { + public void gotoMarker(IMarker marker) { try { if (marker.getType().equals(EValidator.MARKER)) { String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null); @@ -1621,14 +1620,14 @@ public class ContainerrepositoryEditor } } - /** + /** * This is called during startup. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void init(IEditorSite site, IEditorInput editorInput) { + @Override + public void init(IEditorSite site, IEditorInput editorInput) { setSite(site); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1637,13 +1636,13 @@ public class ContainerrepositoryEditor ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setFocus() { + @Override + public void setFocus() { if (currentViewerPane != null) { currentViewerPane.setFocus(); } @@ -1652,44 +1651,44 @@ public class ContainerrepositoryEditor } } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { + public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.add(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) { + public void removeSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.remove(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ISelection getSelection() { + public ISelection getSelection() { return editorSelection; } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection. * Calling this result will notify the listeners. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelection(ISelection selection) { + public void setSelection(ISelection selection) { editorSelection = selection; for (ISelectionChangedListener listener : selectionChangedListeners) { @@ -1698,12 +1697,12 @@ public class ContainerrepositoryEditor setStatusLineManager(selection); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setStatusLineManager(ISelection selection) { + public void setStatusLineManager(ISelection selection) { IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager(); @@ -1732,70 +1731,70 @@ public class ContainerrepositoryEditor } } - /** + /** * This looks up a string in the plugin's plugin.properties file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key) { + private static String getString(String key) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key); } - /** + /** * This looks up a string in plugin.properties, making a substitution. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key, Object s1) { + private static String getString(String key, Object s1) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 }); } - /** + /** * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void menuAboutToShow(IMenuManager menuManager) { + public void menuAboutToShow(IMenuManager menuManager) { ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomainActionBarContributor getActionBarContributor() { + public EditingDomainActionBarContributor getActionBarContributor() { return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IActionBars getActionBars() { + public IActionBars getActionBars() { return getActionBarContributor().getActionBars(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public AdapterFactory getAdapterFactory() { + public AdapterFactory getAdapterFactory() { return adapterFactory; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void dispose() { + @Override + public void dispose() { updateProblemIndication = false; ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); @@ -1819,13 +1818,13 @@ public class ContainerrepositoryEditor super.dispose(); } - /** + /** * Returns whether the outline view should be presented to the user. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean showOutlineView() { + protected boolean showOutlineView() { return true; } } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryModelWizard.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryModelWizard.java index 35503baa..67c1ccd7 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryModelWizard.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryModelWizard.java @@ -95,100 +95,100 @@ import org.eclipse.ui.PartInitException; * @generated */ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard { - /** + /** * The supported extensions for created files. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public static final List<String> FILE_EXTENSIONS = - Collections.unmodifiableList(Arrays.asList(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ContainerrepositoryEditorFilenameExtensions").split("\\s*,\\s*"))); + public static final List<String> FILE_EXTENSIONS = + Collections.unmodifiableList(Arrays.asList(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ContainerrepositoryEditorFilenameExtensions").split("\\s*,\\s*"))); - /** + /** * A formatted list of supported file extensions, suitable for display. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public static final String FORMATTED_FILE_EXTENSIONS = - ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ContainerrepositoryEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); + public static final String FORMATTED_FILE_EXTENSIONS = + ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ContainerrepositoryEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); - /** + /** * This caches an instance of the model package. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ContainerrepositoryPackage containerrepositoryPackage = ContainerrepositoryPackage.eINSTANCE; + protected ContainerrepositoryPackage containerrepositoryPackage = ContainerrepositoryPackage.eINSTANCE; - /** + /** * This caches an instance of the model factory. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ContainerrepositoryFactory containerrepositoryFactory = containerrepositoryPackage.getContainerrepositoryFactory(); + protected ContainerrepositoryFactory containerrepositoryFactory = containerrepositoryPackage.getContainerrepositoryFactory(); - /** + /** * This is the file creation page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ContainerrepositoryModelWizardNewFileCreationPage newFileCreationPage; + protected ContainerrepositoryModelWizardNewFileCreationPage newFileCreationPage; - /** + /** * This is the initial object creation page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ContainerrepositoryModelWizardInitialObjectCreationPage initialObjectCreationPage; + protected ContainerrepositoryModelWizardInitialObjectCreationPage initialObjectCreationPage; - /** + /** * Remember the selection during initialization for populating the default container. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IStructuredSelection selection; + protected IStructuredSelection selection; - /** + /** * Remember the workbench during initialization. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IWorkbench workbench; + protected IWorkbench workbench; - /** + /** * Caches the names of the types that can be created as the root object. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected List<String> initialObjectNames; + protected List<String> initialObjectNames; - /** + /** * This just records the information. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void init(IWorkbench workbench, IStructuredSelection selection) { + public void init(IWorkbench workbench, IStructuredSelection selection) { this.workbench = workbench; this.selection = selection; setWindowTitle(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ResourcelandscapeEditorPlugin.INSTANCE.getImage("full/wizban/NewContainerrepository"))); } - /** + /** * Returns the names of the types that can be created as the root object. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<String> getInitialObjectNames() { + protected Collection<String> getInitialObjectNames() { if (initialObjectNames == null) { initialObjectNames = new ArrayList<String>(); for (EClassifier eClassifier : containerrepositoryPackage.getEClassifiers()) { @@ -204,26 +204,26 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard return initialObjectNames; } - /** + /** * Create a new model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected EObject createInitialModel() { + protected EObject createInitialModel() { EClass eClass = (EClass)containerrepositoryPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName()); EObject rootObject = containerrepositoryFactory.create(eClass); return rootObject; } - /** + /** * Do the work after everything is specified. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean performFinish() { + @Override + public boolean performFinish() { try { // Remember the file. // @@ -307,31 +307,31 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard } } - /** + /** * This is the one page of the wizard. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ContainerrepositoryModelWizardNewFileCreationPage extends WizardNewFileCreationPage { - /** + public class ContainerrepositoryModelWizardNewFileCreationPage extends WizardNewFileCreationPage { + /** * Pass in the selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ContainerrepositoryModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) { + public ContainerrepositoryModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) { super(pageId, selection); } - /** + /** * The framework calls this to see if the file is correct. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected boolean validatePage() { + @Override + protected boolean validatePage() { if (super.validatePage()) { String extension = new Path(getFileName()).getFileExtension(); if (extension == null || !FILE_EXTENSIONS.contains(extension)) { @@ -344,61 +344,62 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard return false; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IFile getModelFile() { + public IFile getModelFile() { return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName())); } - } + } - /** + /** * This is the page where the type of object to create is selected. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ContainerrepositoryModelWizardInitialObjectCreationPage extends WizardPage { - /** + public class ContainerrepositoryModelWizardInitialObjectCreationPage extends WizardPage { + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Combo initialObjectField; + protected Combo initialObjectField; - /** + /** * @generated * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> */ - protected List<String> encodings; + protected List<String> encodings; - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Combo encodingField; + protected Combo encodingField; - /** + /** * Pass in the selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ContainerrepositoryModelWizardInitialObjectCreationPage(String pageId) { + public ContainerrepositoryModelWizardInitialObjectCreationPage(String pageId) { super(pageId); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); { + public void createControl(Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + { GridLayout layout = new GridLayout(); layout.numColumns = 1; layout.verticalSpacing = 12; @@ -464,34 +465,34 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard setControl(composite); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ModifyListener validator = - new ModifyListener() { + protected ModifyListener validator = + new ModifyListener() { public void modifyText(ModifyEvent e) { setPageComplete(validatePage()); } }; - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean validatePage() { + protected boolean validatePage() { return getInitialObjectName() != null && getEncodings().contains(encodingField.getText()); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setVisible(boolean visible) { + @Override + public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { if (initialObjectField.getItemCount() == 1) { @@ -505,12 +506,12 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard } } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public String getInitialObjectName() { + public String getInitialObjectName() { String label = initialObjectField.getText(); for (String name : getInitialObjectNames()) { @@ -521,22 +522,22 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard return null; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public String getEncoding() { + public String getEncoding() { return encodingField.getText(); } - /** + /** * Returns the label for the specified type name. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected String getLabel(String typeName) { + protected String getLabel(String typeName) { try { return ResourcelandscapeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); } @@ -546,12 +547,12 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard return typeName; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<String> getEncodings() { + protected Collection<String> getEncodings() { if (encodings == null) { encodings = new ArrayList<String>(); for (StringTokenizer stringTokenizer = new StringTokenizer(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) { @@ -560,16 +561,16 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard } return encodings; } - } + } - /** + /** * The framework calls this to create the contents of the wizard. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void addPages() { + @Override + public void addPages() { // Create a page, set the title, and the initial model file name. // newFileCreationPage = new ContainerrepositoryModelWizardNewFileCreationPage("Whatever", selection); @@ -617,13 +618,13 @@ public class ContainerrepositoryModelWizard extends Wizard implements INewWizard addPage(initialObjectCreationPage); } - /** + /** * Get the file from the page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IFile getModelFile() { + public IFile getModelFile() { return newFileCreationPage.getModelFile(); } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationActionBarContributor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationActionBarContributor.java index df0177f1..ae6bccb8 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationActionBarContributor.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationActionBarContributor.java @@ -49,32 +49,32 @@ import org.eclipse.ui.PartInitException; * @generated */ public class ResourceconfigurationActionBarContributor - extends EditingDomainActionBarContributor - implements ISelectionChangedListener { - /** + extends EditingDomainActionBarContributor + implements ISelectionChangedListener { + /** * This keeps track of the active editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IEditorPart activeEditorPart; + protected IEditorPart activeEditorPart; - /** + /** * This keeps track of the current selection provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelectionProvider selectionProvider; + protected ISelectionProvider selectionProvider; - /** + /** * This action opens the Properties view. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IAction showPropertiesViewAction = - new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) { + protected IAction showPropertiesViewAction = + new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) { @Override public void run() { try { @@ -86,15 +86,15 @@ public class ResourceconfigurationActionBarContributor } }; - /** + /** * This action refreshes the viewer of the current editor if the editor * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IAction refreshViewerAction = - new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { + protected IAction refreshViewerAction = + new Action(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { @Override public boolean isEnabled() { return activeEditorPart instanceof IViewerProvider; @@ -111,74 +111,74 @@ public class ResourceconfigurationActionBarContributor } }; - /** + /** * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor * generated for the current selection by the item provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> createChildActions; + protected Collection<IAction> createChildActions; - /** + /** * This is the menu manager into which menu contribution items should be added for CreateChild actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IMenuManager createChildMenuManager; + protected IMenuManager createChildMenuManager; - /** + /** * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor * generated for the current selection by the item provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> createSiblingActions; + protected Collection<IAction> createSiblingActions; - /** + /** * This is the menu manager into which menu contribution items should be added for CreateSibling actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IMenuManager createSiblingMenuManager; + protected IMenuManager createSiblingMenuManager; - /** + /** * This creates an instance of the contributor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourceconfigurationActionBarContributor() { + public ResourceconfigurationActionBarContributor() { super(ADDITIONS_LAST_STYLE); loadResourceAction = new LoadResourceAction(); validateAction = new ValidateAction(); controlAction = new ControlAction(); } - /** + /** * This adds Separators for editor additions to the tool bar. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void contributeToToolBar(IToolBarManager toolBarManager) { + @Override + public void contributeToToolBar(IToolBarManager toolBarManager) { toolBarManager.add(new Separator("resourceconfiguration-settings")); toolBarManager.add(new Separator("resourceconfiguration-additions")); } - /** + /** * This adds to the menu bar a menu and some separators for editor additions, * as well as the sub-menus for object creation items. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void contributeToMenu(IMenuManager menuManager) { + @Override + public void contributeToMenu(IMenuManager menuManager) { super.contributeToMenu(menuManager); IMenuManager submenuManager = new MenuManager(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ResourceconfigurationEditor_menu"), "edu.kit.ipd.descartes.mm.resourceconfigurationMenuID"); @@ -210,14 +210,14 @@ public class ResourceconfigurationActionBarContributor addGlobalActions(submenuManager); } - /** + /** * When the active editor changes, this remembers the change and registers with it as a selection provider. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setActiveEditor(IEditorPart part) { + @Override + public void setActiveEditor(IEditorPart part) { super.setActiveEditor(part); activeEditorPart = part; @@ -241,15 +241,15 @@ public class ResourceconfigurationActionBarContributor } } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings * that can be added to the selected object and updating the menus accordingly. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void selectionChanged(SelectionChangedEvent event) { + public void selectionChanged(SelectionChangedEvent event) { // Remove any menu items for old selection. // if (createChildMenuManager != null) { @@ -289,14 +289,14 @@ public class ResourceconfigurationActionBarContributor } } - /** + /** * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>, * and returns the collection of these actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) { + protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) { Collection<IAction> actions = new ArrayList<IAction>(); if (descriptors != null) { for (Object descriptor : descriptors) { @@ -306,14 +306,14 @@ public class ResourceconfigurationActionBarContributor return actions; } - /** + /** * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>, * and returns the collection of these actions. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) { + protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) { Collection<IAction> actions = new ArrayList<IAction>(); if (descriptors != null) { for (Object descriptor : descriptors) { @@ -323,16 +323,16 @@ public class ResourceconfigurationActionBarContributor return actions; } - /** + /** * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection, * by inserting them before the specified contribution item <code>contributionID</code>. * If <code>contributionID</code> is <code>null</code>, they are simply added. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) { + protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) { if (actions != null) { for (IAction action : actions) { if (contributionID != null) { @@ -344,15 +344,15 @@ public class ResourceconfigurationActionBarContributor } } } - - /** + + /** * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) { + protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) { if (actions != null) { IContributionItem[] items = manager.getItems(); for (int i = 0; i < items.length; i++) { @@ -375,14 +375,14 @@ public class ResourceconfigurationActionBarContributor } } - /** + /** * This populates the pop-up menu before it appears. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void menuAboutToShow(IMenuManager menuManager) { + @Override + public void menuAboutToShow(IMenuManager menuManager) { super.menuAboutToShow(menuManager); MenuManager submenuManager = null; @@ -395,14 +395,14 @@ public class ResourceconfigurationActionBarContributor menuManager.insertBefore("edit", submenuManager); } - /** + /** * This inserts global actions before the "additions-end" separator. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void addGlobalActions(IMenuManager menuManager) { + @Override + protected void addGlobalActions(IMenuManager menuManager) { menuManager.insertAfter("additions-end", new Separator("ui-actions")); menuManager.insertAfter("ui-actions", showPropertiesViewAction); @@ -412,14 +412,14 @@ public class ResourceconfigurationActionBarContributor super.addGlobalActions(menuManager); } - /** + /** * This ensures that a delete action will clean up all references to deleted objects. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected boolean removeAllReferencesOnDelete() { + @Override + protected boolean removeAllReferencesOnDelete() { return true; } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java index 46c8fe36..9bc32335 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java @@ -166,7 +166,6 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resourcelandscape import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory; import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory; import org.eclipse.ui.actions.WorkspaceModifyOperation; @@ -179,164 +178,164 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; * @generated */ public class ResourceconfigurationEditor - extends MultiPageEditorPart - implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { - /** + extends MultiPageEditorPart + implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { + /** * This keeps track of the editing domain that is used to track all changes to the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected AdapterFactoryEditingDomain editingDomain; + protected AdapterFactoryEditingDomain editingDomain; - /** + /** * This is the one adapter factory used for providing views of the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ComposedAdapterFactory adapterFactory; + protected ComposedAdapterFactory adapterFactory; - /** + /** * This is the content outline page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IContentOutlinePage contentOutlinePage; + protected IContentOutlinePage contentOutlinePage; - /** + /** * This is a kludge... * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IStatusLineManager contentOutlineStatusLineManager; + protected IStatusLineManager contentOutlineStatusLineManager; - /** + /** * This is the content outline page's viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer contentOutlineViewer; + protected TreeViewer contentOutlineViewer; - /** + /** * This is the property sheet page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected PropertySheetPage propertySheetPage; + protected PropertySheetPage propertySheetPage; - /** + /** * This is the viewer that shadows the selection in the content outline. * The parent relation must be correctly defined for this to work. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer selectionViewer; + protected TreeViewer selectionViewer; - /** + /** * This inverts the roll of parent and child in the content provider and show parents as a tree. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer parentViewer; + protected TreeViewer parentViewer; - /** + /** * This shows how a tree view works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewer; + protected TreeViewer treeViewer; - /** + /** * This shows how a list view works. * A list viewer doesn't support icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ListViewer listViewer; + protected ListViewer listViewer; - /** + /** * This shows how a table view works. * A table can be used as a list with icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TableViewer tableViewer; + protected TableViewer tableViewer; - /** + /** * This shows how a tree view with columns works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewerWithColumns; + protected TreeViewer treeViewerWithColumns; - /** + /** * This keeps track of the active viewer pane, in the book. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ViewerPane currentViewerPane; + protected ViewerPane currentViewerPane; - /** + /** * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Viewer currentViewer; + protected Viewer currentViewer; - /** + /** * This listens to which ever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelectionChangedListener selectionChangedListener; + protected ISelectionChangedListener selectionChangedListener; - /** + /** * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); + protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); - /** + /** * This keeps track of the selection of the editor as a whole. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelection editorSelection = StructuredSelection.EMPTY; + protected ISelection editorSelection = StructuredSelection.EMPTY; - /** + /** * The MarkerHelper is responsible for creating workspace resource markers presented * in Eclipse's Problems View. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected MarkerHelper markerHelper = new EditUIMarkerHelper(); + protected MarkerHelper markerHelper = new EditUIMarkerHelper(); - /** + /** * This listens for when the outline becomes active * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IPartListener partListener = - new IPartListener() { + protected IPartListener partListener = + new IPartListener() { public void partActivated(IWorkbenchPart p) { if (p instanceof ContentOutline) { if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) { @@ -369,54 +368,54 @@ public class ResourceconfigurationEditor } }; - /** + /** * Resources that have been removed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> removedResources = new ArrayList<Resource>(); + protected Collection<Resource> removedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been changed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> changedResources = new ArrayList<Resource>(); + protected Collection<Resource> changedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been saved. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> savedResources = new ArrayList<Resource>(); + protected Collection<Resource> savedResources = new ArrayList<Resource>(); - /** + /** * Map to store the diagnostic associated with a resource. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); + protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); - /** + /** * Controls whether the problem indication should be updated. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean updateProblemIndication = true; + protected boolean updateProblemIndication = true; - /** + /** * Adapter used to update the problem indication when resources are demanded loaded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected EContentAdapter problemIndicationAdapter = - new EContentAdapter() { + protected EContentAdapter problemIndicationAdapter = + new EContentAdapter() { @Override public void notifyChanged(Notification notification) { if (notification.getNotifier() instanceof Resource) { @@ -461,14 +460,14 @@ public class ResourceconfigurationEditor } }; - /** + /** * This listens for workspace changes. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IResourceChangeListener resourceChangeListener = - new IResourceChangeListener() { + protected IResourceChangeListener resourceChangeListener = + new IResourceChangeListener() { public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta = event.getDelta(); try { @@ -538,13 +537,13 @@ public class ResourceconfigurationEditor } }; - /** + /** * Handles activation of the editor or it's associated views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleActivate() { + protected void handleActivate() { // Recompute the read only state. // if (editingDomain.getResourceToReadOnlyMap() != null) { @@ -573,13 +572,13 @@ public class ResourceconfigurationEditor } } - /** + /** * Handles what to do with changed resources on activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleChangedResources() { + protected void handleChangedResources() { if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { if (isDirty()) { changedResources.addAll(editingDomain.getResourceSet().getResources()); @@ -610,13 +609,13 @@ public class ResourceconfigurationEditor } } - /** + /** * Updates the problems indication with the information described in the specified diagnostic. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void updateProblemIndication() { + protected void updateProblemIndication() { if (updateProblemIndication) { BasicDiagnostic diagnostic = new BasicDiagnostic @@ -667,13 +666,13 @@ public class ResourceconfigurationEditor } } - /** + /** * Shows a dialog that asks if conflicting changes should be discarded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean handleDirtyConflict() { + protected boolean handleDirtyConflict() { return MessageDialog.openQuestion (getSite().getShell(), @@ -681,24 +680,24 @@ public class ResourceconfigurationEditor getString("_WARN_FileConflict")); } - /** + /** * This creates a model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourceconfigurationEditor() { + public ResourceconfigurationEditor() { super(); initializeEditingDomain(); } - /** + /** * This sets up the editing domain for the model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void initializeEditingDomain() { + protected void initializeEditingDomain() { // Create an adapter factory that yields item providers. // adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); @@ -745,24 +744,24 @@ public class ResourceconfigurationEditor editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); } - /** + /** * This is here for the listener to be able to call it. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void firePropertyChange(int action) { + @Override + protected void firePropertyChange(int action) { super.firePropertyChange(action); } - /** + /** * This sets the selection into whichever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelectionToViewer(Collection<?> collection) { + public void setSelectionToViewer(Collection<?> collection) { final Collection<?> theSelection = collection; // Make sure it's okay. // @@ -781,83 +780,83 @@ public class ResourceconfigurationEditor } } - /** + /** * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomain getEditingDomain() { + public EditingDomain getEditingDomain() { return editingDomain; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { - /** + public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { + public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { super(adapterFactory); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getElements(Object object) { + @Override + public Object [] getElements(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getChildren(Object object) { + @Override + public Object [] getChildren(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean hasChildren(Object object) { + @Override + public boolean hasChildren(Object object) { Object parent = super.getParent(object); return parent != null; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object getParent(Object object) { + @Override + public Object getParent(Object object) { return null; } - } + } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewerPane(ViewerPane viewerPane) { + public void setCurrentViewerPane(ViewerPane viewerPane) { if (currentViewerPane != viewerPane) { if (currentViewerPane != null) { currentViewerPane.showFocus(false); @@ -867,14 +866,14 @@ public class ResourceconfigurationEditor setCurrentViewer(currentViewerPane.getViewer()); } - /** + /** * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, * is the current one. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewer(Viewer viewer) { + public void setCurrentViewer(Viewer viewer) { // If it is changing... // if (currentViewer != viewer) { @@ -913,23 +912,23 @@ public class ResourceconfigurationEditor } } - /** + /** * This returns the viewer as required by the {@link IViewerProvider} interface. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Viewer getViewer() { + public Viewer getViewer() { return currentViewer; } - /** + /** * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void createContextMenuFor(StructuredViewer viewer) { + protected void createContextMenuFor(StructuredViewer viewer) { MenuManager contextMenu = new MenuManager("#PopUp"); contextMenu.add(new Separator("additions")); contextMenu.setRemoveAllWhenShown(true); @@ -944,13 +943,13 @@ public class ResourceconfigurationEditor viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); } - /** + /** * This is the method called to load a resource into the editing domain's resource set based on the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void createModel() { + public void createModel() { URI resourceURI = EditUIUtil.getURI(getEditorInput()); Exception exception = null; Resource resource = null; @@ -971,14 +970,14 @@ public class ResourceconfigurationEditor editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); } - /** + /** * Returns a diagnostic describing the errors and warnings listed in the resource * and the specified exception (if any). * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { + public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) { BasicDiagnostic basicDiagnostic = new BasicDiagnostic @@ -1004,14 +1003,14 @@ public class ResourceconfigurationEditor } } - /** + /** * This is the method used by the framework to install your own controls. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void createPages() { + @Override + public void createPages() { // Creates the model from the editor input // createModel(); @@ -1252,14 +1251,14 @@ public class ResourceconfigurationEditor }); } - /** + /** * If there is just one page in the multi-page editor part, * this hides the single tab at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void hideTabs() { + protected void hideTabs() { if (getPageCount() <= 1) { setPageText(0, ""); if (getContainer() instanceof CTabFolder) { @@ -1270,14 +1269,14 @@ public class ResourceconfigurationEditor } } - /** + /** * If there is more than one page in the multi-page editor part, * this shows the tabs at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void showTabs() { + protected void showTabs() { if (getPageCount() > 1) { setPageText(0, getString("_UI_SelectionPage_label")); if (getContainer() instanceof CTabFolder) { @@ -1288,14 +1287,14 @@ public class ResourceconfigurationEditor } } - /** + /** * This is used to track the active viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void pageChange(int pageIndex) { + @Override + protected void pageChange(int pageIndex) { super.pageChange(pageIndex); if (contentOutlinePage != null) { @@ -1303,15 +1302,15 @@ public class ResourceconfigurationEditor } } - /** + /** * This is how the framework determines which interfaces we implement. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class key) { + @SuppressWarnings("rawtypes") + @Override + public Object getAdapter(Class key) { if (key.equals(IContentOutlinePage.class)) { return showOutlineView() ? getContentOutlinePage() : null; } @@ -1326,13 +1325,13 @@ public class ResourceconfigurationEditor } } - /** + /** * This accesses a cached version of the content outliner. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IContentOutlinePage getContentOutlinePage() { + public IContentOutlinePage getContentOutlinePage() { if (contentOutlinePage == null) { // The content outline is just a tree. // @@ -1390,13 +1389,13 @@ public class ResourceconfigurationEditor return contentOutlinePage; } - /** + /** * This accesses a cached version of the property sheet. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IPropertySheetPage getPropertySheetPage() { + public IPropertySheetPage getPropertySheetPage() { if (propertySheetPage == null) { propertySheetPage = new ExtendedPropertySheetPage(editingDomain) { @@ -1418,13 +1417,13 @@ public class ResourceconfigurationEditor return propertySheetPage; } - /** + /** * This deals with how we want selection in the outliner to affect the other views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void handleContentOutlineSelection(ISelection selection) { + public void handleContentOutlineSelection(ISelection selection) { if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator(); if (selectedElements.hasNext()) { @@ -1457,25 +1456,25 @@ public class ResourceconfigurationEditor } } - /** + /** * This is for implementing {@link IEditorPart} and simply tests the command stack. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isDirty() { + @Override + public boolean isDirty() { return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded(); } - /** + /** * This is for implementing {@link IEditorPart} and simply saves the model file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSave(IProgressMonitor progressMonitor) { + @Override + public void doSave(IProgressMonitor progressMonitor) { // Save only resources that have actually changed. // final Map<Object, Object> saveOptions = new HashMap<Object, Object>(); @@ -1530,14 +1529,14 @@ public class ResourceconfigurationEditor updateProblemIndication(); } - /** + /** * This returns whether something has been persisted to the URI of the specified resource. * The implementation uses the URI converter from the editor's resource set to try to open an input stream. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean isPersisted(Resource resource) { + protected boolean isPersisted(Resource resource) { boolean result = false; try { InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI()); @@ -1552,25 +1551,25 @@ public class ResourceconfigurationEditor return result; } - /** + /** * This always returns true because it is not currently supported. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isSaveAsAllowed() { + @Override + public boolean isSaveAsAllowed() { return true; } - /** + /** * This also changes the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSaveAs() { + @Override + public void doSaveAs() { SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); saveAsDialog.open(); IPath path = saveAsDialog.getResult(); @@ -1582,12 +1581,12 @@ public class ResourceconfigurationEditor } } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void doSaveAs(URI uri, IEditorInput editorInput) { + protected void doSaveAs(URI uri, IEditorInput editorInput) { (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1598,12 +1597,12 @@ public class ResourceconfigurationEditor doSave(progressMonitor); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void gotoMarker(IMarker marker) { + public void gotoMarker(IMarker marker) { try { if (marker.getType().equals(EValidator.MARKER)) { String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null); @@ -1621,14 +1620,14 @@ public class ResourceconfigurationEditor } } - /** + /** * This is called during startup. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void init(IEditorSite site, IEditorInput editorInput) { + @Override + public void init(IEditorSite site, IEditorInput editorInput) { setSite(site); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1637,13 +1636,13 @@ public class ResourceconfigurationEditor ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setFocus() { + @Override + public void setFocus() { if (currentViewerPane != null) { currentViewerPane.setFocus(); } @@ -1652,44 +1651,44 @@ public class ResourceconfigurationEditor } } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { + public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.add(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) { + public void removeSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.remove(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ISelection getSelection() { + public ISelection getSelection() { return editorSelection; } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection. * Calling this result will notify the listeners. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelection(ISelection selection) { + public void setSelection(ISelection selection) { editorSelection = selection; for (ISelectionChangedListener listener : selectionChangedListeners) { @@ -1698,12 +1697,12 @@ public class ResourceconfigurationEditor setStatusLineManager(selection); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setStatusLineManager(ISelection selection) { + public void setStatusLineManager(ISelection selection) { IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager(); @@ -1732,70 +1731,70 @@ public class ResourceconfigurationEditor } } - /** + /** * This looks up a string in the plugin's plugin.properties file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key) { + private static String getString(String key) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key); } - /** + /** * This looks up a string in plugin.properties, making a substitution. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key, Object s1) { + private static String getString(String key, Object s1) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 }); } - /** + /** * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void menuAboutToShow(IMenuManager menuManager) { + public void menuAboutToShow(IMenuManager menuManager) { ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomainActionBarContributor getActionBarContributor() { + public EditingDomainActionBarContributor getActionBarContributor() { return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IActionBars getActionBars() { + public IActionBars getActionBars() { return getActionBarContributor().getActionBars(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public AdapterFactory getAdapterFactory() { + public AdapterFactory getAdapterFactory() { return adapterFactory; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void dispose() { + @Override + public void dispose() { updateProblemIndication = false; ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); @@ -1819,13 +1818,13 @@ public class ResourceconfigurationEditor super.dispose(); } - /** + /** * Returns whether the outline view should be presented to the user. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean showOutlineView() { + protected boolean showOutlineView() { return true; } } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationModelWizard.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationModelWizard.java index d0838180..d4fc5b9a 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationModelWizard.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationModelWizard.java @@ -95,100 +95,100 @@ import org.eclipse.ui.PartInitException; * @generated */ public class ResourceconfigurationModelWizard extends Wizard implements INewWizard { - /** + /** * The supported extensions for created files. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public static final List<String> FILE_EXTENSIONS = - Collections.unmodifiableList(Arrays.asList(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ResourceconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); + public static final List<String> FILE_EXTENSIONS = + Collections.unmodifiableList(Arrays.asList(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ResourceconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); - /** + /** * A formatted list of supported file extensions, suitable for display. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public static final String FORMATTED_FILE_EXTENSIONS = - ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ResourceconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); + public static final String FORMATTED_FILE_EXTENSIONS = + ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_ResourceconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); - /** + /** * This caches an instance of the model package. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ResourceconfigurationPackage resourceconfigurationPackage = ResourceconfigurationPackage.eINSTANCE; + protected ResourceconfigurationPackage resourceconfigurationPackage = ResourceconfigurationPackage.eINSTANCE; - /** + /** * This caches an instance of the model factory. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ResourceconfigurationFactory resourceconfigurationFactory = resourceconfigurationPackage.getResourceconfigurationFactory(); + protected ResourceconfigurationFactory resourceconfigurationFactory = resourceconfigurationPackage.getResourceconfigurationFactory(); - /** + /** * This is the file creation page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ResourceconfigurationModelWizardNewFileCreationPage newFileCreationPage; + protected ResourceconfigurationModelWizardNewFileCreationPage newFileCreationPage; - /** + /** * This is the initial object creation page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ResourceconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage; + protected ResourceconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage; - /** + /** * Remember the selection during initialization for populating the default container. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IStructuredSelection selection; + protected IStructuredSelection selection; - /** + /** * Remember the workbench during initialization. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IWorkbench workbench; + protected IWorkbench workbench; - /** + /** * Caches the names of the types that can be created as the root object. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected List<String> initialObjectNames; + protected List<String> initialObjectNames; - /** + /** * This just records the information. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void init(IWorkbench workbench, IStructuredSelection selection) { + public void init(IWorkbench workbench, IStructuredSelection selection) { this.workbench = workbench; this.selection = selection; setWindowTitle(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ResourcelandscapeEditorPlugin.INSTANCE.getImage("full/wizban/NewResourceconfiguration"))); } - /** + /** * Returns the names of the types that can be created as the root object. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<String> getInitialObjectNames() { + protected Collection<String> getInitialObjectNames() { if (initialObjectNames == null) { initialObjectNames = new ArrayList<String>(); for (EClassifier eClassifier : resourceconfigurationPackage.getEClassifiers()) { @@ -204,26 +204,26 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza return initialObjectNames; } - /** + /** * Create a new model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected EObject createInitialModel() { + protected EObject createInitialModel() { EClass eClass = (EClass)resourceconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName()); EObject rootObject = resourceconfigurationFactory.create(eClass); return rootObject; } - /** + /** * Do the work after everything is specified. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean performFinish() { + @Override + public boolean performFinish() { try { // Remember the file. // @@ -307,31 +307,31 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza } } - /** + /** * This is the one page of the wizard. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ResourceconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage { - /** + public class ResourceconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage { + /** * Pass in the selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourceconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) { + public ResourceconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) { super(pageId, selection); } - /** + /** * The framework calls this to see if the file is correct. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected boolean validatePage() { + @Override + protected boolean validatePage() { if (super.validatePage()) { String extension = new Path(getFileName()).getFileExtension(); if (extension == null || !FILE_EXTENSIONS.contains(extension)) { @@ -344,61 +344,62 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza return false; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IFile getModelFile() { + public IFile getModelFile() { return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName())); } - } + } - /** + /** * This is the page where the type of object to create is selected. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ResourceconfigurationModelWizardInitialObjectCreationPage extends WizardPage { - /** + public class ResourceconfigurationModelWizardInitialObjectCreationPage extends WizardPage { + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Combo initialObjectField; + protected Combo initialObjectField; - /** + /** * @generated * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> */ - protected List<String> encodings; + protected List<String> encodings; - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Combo encodingField; + protected Combo encodingField; - /** + /** * Pass in the selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourceconfigurationModelWizardInitialObjectCreationPage(String pageId) { + public ResourceconfigurationModelWizardInitialObjectCreationPage(String pageId) { super(pageId); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); { + public void createControl(Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + { GridLayout layout = new GridLayout(); layout.numColumns = 1; layout.verticalSpacing = 12; @@ -464,34 +465,34 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza setControl(composite); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ModifyListener validator = - new ModifyListener() { + protected ModifyListener validator = + new ModifyListener() { public void modifyText(ModifyEvent e) { setPageComplete(validatePage()); } }; - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean validatePage() { + protected boolean validatePage() { return getInitialObjectName() != null && getEncodings().contains(encodingField.getText()); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setVisible(boolean visible) { + @Override + public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { if (initialObjectField.getItemCount() == 1) { @@ -505,12 +506,12 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza } } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public String getInitialObjectName() { + public String getInitialObjectName() { String label = initialObjectField.getText(); for (String name : getInitialObjectNames()) { @@ -521,22 +522,22 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza return null; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public String getEncoding() { + public String getEncoding() { return encodingField.getText(); } - /** + /** * Returns the label for the specified type name. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected String getLabel(String typeName) { + protected String getLabel(String typeName) { try { return ResourcelandscapeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); } @@ -546,12 +547,12 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza return typeName; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<String> getEncodings() { + protected Collection<String> getEncodings() { if (encodings == null) { encodings = new ArrayList<String>(); for (StringTokenizer stringTokenizer = new StringTokenizer(ResourcelandscapeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) { @@ -560,16 +561,16 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza } return encodings; } - } + } - /** + /** * The framework calls this to create the contents of the wizard. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void addPages() { + @Override + public void addPages() { // Create a page, set the title, and the initial model file name. // newFileCreationPage = new ResourceconfigurationModelWizardNewFileCreationPage("Whatever", selection); @@ -617,13 +618,13 @@ public class ResourceconfigurationModelWizard extends Wizard implements INewWiza addPage(initialObjectCreationPage); } - /** + /** * Get the file from the page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IFile getModelFile() { + public IFile getModelFile() { return newFileCreationPage.getModelFile(); } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java index 1a3f321c..2debea3f 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java @@ -164,7 +164,6 @@ import edu.kit.ipd.descartes.mm.containerrepository.provider.Containerrepository import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.ResourceconfigurationItemProviderAdapterFactory; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory; import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory; import org.eclipse.ui.actions.WorkspaceModifyOperation; @@ -177,164 +176,164 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; * @generated */ public class ResourcelandscapeEditor - extends MultiPageEditorPart - implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { - /** + extends MultiPageEditorPart + implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { + /** * This keeps track of the editing domain that is used to track all changes to the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected AdapterFactoryEditingDomain editingDomain; + protected AdapterFactoryEditingDomain editingDomain; - /** + /** * This is the one adapter factory used for providing views of the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ComposedAdapterFactory adapterFactory; + protected ComposedAdapterFactory adapterFactory; - /** + /** * This is the content outline page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IContentOutlinePage contentOutlinePage; + protected IContentOutlinePage contentOutlinePage; - /** + /** * This is a kludge... * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IStatusLineManager contentOutlineStatusLineManager; + protected IStatusLineManager contentOutlineStatusLineManager; - /** + /** * This is the content outline page's viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer contentOutlineViewer; + protected TreeViewer contentOutlineViewer; - /** + /** * This is the property sheet page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected PropertySheetPage propertySheetPage; + protected PropertySheetPage propertySheetPage; - /** + /** * This is the viewer that shadows the selection in the content outline. * The parent relation must be correctly defined for this to work. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer selectionViewer; + protected TreeViewer selectionViewer; - /** + /** * This inverts the roll of parent and child in the content provider and show parents as a tree. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer parentViewer; + protected TreeViewer parentViewer; - /** + /** * This shows how a tree view works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewer; + protected TreeViewer treeViewer; - /** + /** * This shows how a list view works. * A list viewer doesn't support icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ListViewer listViewer; + protected ListViewer listViewer; - /** + /** * This shows how a table view works. * A table can be used as a list with icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TableViewer tableViewer; + protected TableViewer tableViewer; - /** + /** * This shows how a tree view with columns works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewerWithColumns; + protected TreeViewer treeViewerWithColumns; - /** + /** * This keeps track of the active viewer pane, in the book. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ViewerPane currentViewerPane; + protected ViewerPane currentViewerPane; - /** + /** * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Viewer currentViewer; + protected Viewer currentViewer; - /** + /** * This listens to which ever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelectionChangedListener selectionChangedListener; + protected ISelectionChangedListener selectionChangedListener; - /** + /** * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); + protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); - /** + /** * This keeps track of the selection of the editor as a whole. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelection editorSelection = StructuredSelection.EMPTY; + protected ISelection editorSelection = StructuredSelection.EMPTY; - /** + /** * The MarkerHelper is responsible for creating workspace resource markers presented * in Eclipse's Problems View. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected MarkerHelper markerHelper = new EditUIMarkerHelper(); + protected MarkerHelper markerHelper = new EditUIMarkerHelper(); - /** + /** * This listens for when the outline becomes active * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IPartListener partListener = - new IPartListener() { + protected IPartListener partListener = + new IPartListener() { public void partActivated(IWorkbenchPart p) { if (p instanceof ContentOutline) { if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) { @@ -367,54 +366,54 @@ public class ResourcelandscapeEditor } }; - /** + /** * Resources that have been removed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> removedResources = new ArrayList<Resource>(); + protected Collection<Resource> removedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been changed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> changedResources = new ArrayList<Resource>(); + protected Collection<Resource> changedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been saved. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> savedResources = new ArrayList<Resource>(); + protected Collection<Resource> savedResources = new ArrayList<Resource>(); - /** + /** * Map to store the diagnostic associated with a resource. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); + protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); - /** + /** * Controls whether the problem indication should be updated. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean updateProblemIndication = true; + protected boolean updateProblemIndication = true; - /** + /** * Adapter used to update the problem indication when resources are demanded loaded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected EContentAdapter problemIndicationAdapter = - new EContentAdapter() { + protected EContentAdapter problemIndicationAdapter = + new EContentAdapter() { @Override public void notifyChanged(Notification notification) { if (notification.getNotifier() instanceof Resource) { @@ -459,14 +458,14 @@ public class ResourcelandscapeEditor } }; - /** + /** * This listens for workspace changes. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IResourceChangeListener resourceChangeListener = - new IResourceChangeListener() { + protected IResourceChangeListener resourceChangeListener = + new IResourceChangeListener() { public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta = event.getDelta(); try { @@ -536,13 +535,13 @@ public class ResourcelandscapeEditor } }; - /** + /** * Handles activation of the editor or it's associated views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleActivate() { + protected void handleActivate() { // Recompute the read only state. // if (editingDomain.getResourceToReadOnlyMap() != null) { @@ -571,13 +570,13 @@ public class ResourcelandscapeEditor } } - /** + /** * Handles what to do with changed resources on activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleChangedResources() { + protected void handleChangedResources() { if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { if (isDirty()) { changedResources.addAll(editingDomain.getResourceSet().getResources()); @@ -608,13 +607,13 @@ public class ResourcelandscapeEditor } } - /** + /** * Updates the problems indication with the information described in the specified diagnostic. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void updateProblemIndication() { + protected void updateProblemIndication() { if (updateProblemIndication) { BasicDiagnostic diagnostic = new BasicDiagnostic @@ -665,13 +664,13 @@ public class ResourcelandscapeEditor } } - /** + /** * Shows a dialog that asks if conflicting changes should be discarded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean handleDirtyConflict() { + protected boolean handleDirtyConflict() { return MessageDialog.openQuestion (getSite().getShell(), @@ -679,24 +678,24 @@ public class ResourcelandscapeEditor getString("_WARN_FileConflict")); } - /** + /** * This creates a model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourcelandscapeEditor() { + public ResourcelandscapeEditor() { super(); initializeEditingDomain(); } - /** + /** * This sets up the editing domain for the model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void initializeEditingDomain() { + protected void initializeEditingDomain() { // Create an adapter factory that yields item providers. // adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); @@ -743,24 +742,24 @@ public class ResourcelandscapeEditor editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); } - /** + /** * This is here for the listener to be able to call it. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void firePropertyChange(int action) { + @Override + protected void firePropertyChange(int action) { super.firePropertyChange(action); } - /** + /** * This sets the selection into whichever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelectionToViewer(Collection<?> collection) { + public void setSelectionToViewer(Collection<?> collection) { final Collection<?> theSelection = collection; // Make sure it's okay. // @@ -779,83 +778,83 @@ public class ResourcelandscapeEditor } } - /** + /** * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomain getEditingDomain() { + public EditingDomain getEditingDomain() { return editingDomain; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { - /** + public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { + public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { super(adapterFactory); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getElements(Object object) { + @Override + public Object [] getElements(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getChildren(Object object) { + @Override + public Object [] getChildren(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean hasChildren(Object object) { + @Override + public boolean hasChildren(Object object) { Object parent = super.getParent(object); return parent != null; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object getParent(Object object) { + @Override + public Object getParent(Object object) { return null; } - } + } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewerPane(ViewerPane viewerPane) { + public void setCurrentViewerPane(ViewerPane viewerPane) { if (currentViewerPane != viewerPane) { if (currentViewerPane != null) { currentViewerPane.showFocus(false); @@ -865,14 +864,14 @@ public class ResourcelandscapeEditor setCurrentViewer(currentViewerPane.getViewer()); } - /** + /** * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, * is the current one. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewer(Viewer viewer) { + public void setCurrentViewer(Viewer viewer) { // If it is changing... // if (currentViewer != viewer) { @@ -911,23 +910,23 @@ public class ResourcelandscapeEditor } } - /** + /** * This returns the viewer as required by the {@link IViewerProvider} interface. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Viewer getViewer() { + public Viewer getViewer() { return currentViewer; } - /** + /** * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void createContextMenuFor(StructuredViewer viewer) { + protected void createContextMenuFor(StructuredViewer viewer) { MenuManager contextMenu = new MenuManager("#PopUp"); contextMenu.add(new Separator("additions")); contextMenu.setRemoveAllWhenShown(true); @@ -942,13 +941,13 @@ public class ResourcelandscapeEditor viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); } - /** + /** * This is the method called to load a resource into the editing domain's resource set based on the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void createModel() { + public void createModel() { URI resourceURI = EditUIUtil.getURI(getEditorInput()); Exception exception = null; Resource resource = null; @@ -969,14 +968,14 @@ public class ResourcelandscapeEditor editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); } - /** + /** * Returns a diagnostic describing the errors and warnings listed in the resource * and the specified exception (if any). * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { + public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) { BasicDiagnostic basicDiagnostic = new BasicDiagnostic @@ -1002,14 +1001,14 @@ public class ResourcelandscapeEditor } } - /** + /** * This is the method used by the framework to install your own controls. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void createPages() { + @Override + public void createPages() { // Creates the model from the editor input // createModel(); @@ -1250,14 +1249,14 @@ public class ResourcelandscapeEditor }); } - /** + /** * If there is just one page in the multi-page editor part, * this hides the single tab at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void hideTabs() { + protected void hideTabs() { if (getPageCount() <= 1) { setPageText(0, ""); if (getContainer() instanceof CTabFolder) { @@ -1268,14 +1267,14 @@ public class ResourcelandscapeEditor } } - /** + /** * If there is more than one page in the multi-page editor part, * this shows the tabs at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void showTabs() { + protected void showTabs() { if (getPageCount() > 1) { setPageText(0, getString("_UI_SelectionPage_label")); if (getContainer() instanceof CTabFolder) { @@ -1286,14 +1285,14 @@ public class ResourcelandscapeEditor } } - /** + /** * This is used to track the active viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void pageChange(int pageIndex) { + @Override + protected void pageChange(int pageIndex) { super.pageChange(pageIndex); if (contentOutlinePage != null) { @@ -1301,15 +1300,15 @@ public class ResourcelandscapeEditor } } - /** + /** * This is how the framework determines which interfaces we implement. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class key) { + @SuppressWarnings("rawtypes") + @Override + public Object getAdapter(Class key) { if (key.equals(IContentOutlinePage.class)) { return showOutlineView() ? getContentOutlinePage() : null; } @@ -1324,13 +1323,13 @@ public class ResourcelandscapeEditor } } - /** + /** * This accesses a cached version of the content outliner. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IContentOutlinePage getContentOutlinePage() { + public IContentOutlinePage getContentOutlinePage() { if (contentOutlinePage == null) { // The content outline is just a tree. // @@ -1388,13 +1387,13 @@ public class ResourcelandscapeEditor return contentOutlinePage; } - /** + /** * This accesses a cached version of the property sheet. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IPropertySheetPage getPropertySheetPage() { + public IPropertySheetPage getPropertySheetPage() { if (propertySheetPage == null) { propertySheetPage = new ExtendedPropertySheetPage(editingDomain) { @@ -1416,13 +1415,13 @@ public class ResourcelandscapeEditor return propertySheetPage; } - /** + /** * This deals with how we want selection in the outliner to affect the other views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void handleContentOutlineSelection(ISelection selection) { + public void handleContentOutlineSelection(ISelection selection) { if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator(); if (selectedElements.hasNext()) { @@ -1455,25 +1454,25 @@ public class ResourcelandscapeEditor } } - /** + /** * This is for implementing {@link IEditorPart} and simply tests the command stack. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isDirty() { + @Override + public boolean isDirty() { return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded(); } - /** + /** * This is for implementing {@link IEditorPart} and simply saves the model file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSave(IProgressMonitor progressMonitor) { + @Override + public void doSave(IProgressMonitor progressMonitor) { // Save only resources that have actually changed. // final Map<Object, Object> saveOptions = new HashMap<Object, Object>(); @@ -1528,14 +1527,14 @@ public class ResourcelandscapeEditor updateProblemIndication(); } - /** + /** * This returns whether something has been persisted to the URI of the specified resource. * The implementation uses the URI converter from the editor's resource set to try to open an input stream. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean isPersisted(Resource resource) { + protected boolean isPersisted(Resource resource) { boolean result = false; try { InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI()); @@ -1550,25 +1549,25 @@ public class ResourcelandscapeEditor return result; } - /** + /** * This always returns true because it is not currently supported. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isSaveAsAllowed() { + @Override + public boolean isSaveAsAllowed() { return true; } - /** + /** * This also changes the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSaveAs() { + @Override + public void doSaveAs() { SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); saveAsDialog.open(); IPath path = saveAsDialog.getResult(); @@ -1580,12 +1579,12 @@ public class ResourcelandscapeEditor } } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void doSaveAs(URI uri, IEditorInput editorInput) { + protected void doSaveAs(URI uri, IEditorInput editorInput) { (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1596,12 +1595,12 @@ public class ResourcelandscapeEditor doSave(progressMonitor); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void gotoMarker(IMarker marker) { + public void gotoMarker(IMarker marker) { try { if (marker.getType().equals(EValidator.MARKER)) { String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null); @@ -1619,14 +1618,14 @@ public class ResourcelandscapeEditor } } - /** + /** * This is called during startup. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void init(IEditorSite site, IEditorInput editorInput) { + @Override + public void init(IEditorSite site, IEditorInput editorInput) { setSite(site); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1635,13 +1634,13 @@ public class ResourcelandscapeEditor ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setFocus() { + @Override + public void setFocus() { if (currentViewerPane != null) { currentViewerPane.setFocus(); } @@ -1650,44 +1649,44 @@ public class ResourcelandscapeEditor } } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { + public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.add(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) { + public void removeSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.remove(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ISelection getSelection() { + public ISelection getSelection() { return editorSelection; } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection. * Calling this result will notify the listeners. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelection(ISelection selection) { + public void setSelection(ISelection selection) { editorSelection = selection; for (ISelectionChangedListener listener : selectionChangedListeners) { @@ -1696,12 +1695,12 @@ public class ResourcelandscapeEditor setStatusLineManager(selection); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setStatusLineManager(ISelection selection) { + public void setStatusLineManager(ISelection selection) { IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager(); @@ -1730,70 +1729,70 @@ public class ResourcelandscapeEditor } } - /** + /** * This looks up a string in the plugin's plugin.properties file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key) { + private static String getString(String key) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key); } - /** + /** * This looks up a string in plugin.properties, making a substitution. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key, Object s1) { + private static String getString(String key, Object s1) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 }); } - /** + /** * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void menuAboutToShow(IMenuManager menuManager) { + public void menuAboutToShow(IMenuManager menuManager) { ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomainActionBarContributor getActionBarContributor() { + public EditingDomainActionBarContributor getActionBarContributor() { return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IActionBars getActionBars() { + public IActionBars getActionBars() { return getActionBarContributor().getActionBars(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public AdapterFactory getAdapterFactory() { + public AdapterFactory getAdapterFactory() { return adapterFactory; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void dispose() { + @Override + public void dispose() { updateProblemIndication = false; ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); @@ -1817,13 +1816,13 @@ public class ResourcelandscapeEditor super.dispose(); } - /** + /** * Returns whether the outline view should be presented to the user. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean showOutlineView() { + protected boolean showOutlineView() { return true; } } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java index 152671bb..b38530ea 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java @@ -7,7 +7,6 @@ import edu.kit.ipd.descartes.core.provider.CoreEditPlugin; import edu.kit.ipd.descartes.identifier.provider.IdentifierEditPlugin; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigEditPlugin; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.ui.EclipseUIPlugin; @@ -21,29 +20,29 @@ import org.eclipse.emf.common.util.ResourceLocator; * @generated */ public final class ResourcelandscapeEditorPlugin extends EMFPlugin { - /** + /** * Keep track of the singleton. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public static final ResourcelandscapeEditorPlugin INSTANCE = new ResourcelandscapeEditorPlugin(); - - /** + public static final ResourcelandscapeEditorPlugin INSTANCE = new ResourcelandscapeEditorPlugin(); + + /** * Keep track of the singleton. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static Implementation plugin; + private static Implementation plugin; - /** + /** * Create the instance. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourcelandscapeEditorPlugin() { + public ResourcelandscapeEditorPlugin() { super (new ResourceLocator [] { CoreEditPlugin.INSTANCE, @@ -51,49 +50,49 @@ public final class ResourcelandscapeEditorPlugin extends EMFPlugin { }); } - /** + /** * Returns the singleton instance of the Eclipse plugin. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @return the singleton instance. * @generated */ - @Override - public ResourceLocator getPluginResourceLocator() { + @Override + public ResourceLocator getPluginResourceLocator() { return plugin; } - - /** + + /** * Returns the singleton instance of the Eclipse plugin. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @return the singleton instance. * @generated */ - public static Implementation getPlugin() { + public static Implementation getPlugin() { return plugin; } - - /** + + /** * The actual implementation of the Eclipse <b>Plugin</b>. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public static class Implementation extends EclipseUIPlugin { - /** + public static class Implementation extends EclipseUIPlugin { + /** * Creates an instance. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Implementation() { + public Implementation() { super(); // Remember the static instance. // plugin = this; } - } + } } diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java index efb256f3..4778fc3c 100644 --- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java +++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java @@ -168,8 +168,6 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.Resourcelandscape import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory; -import edu.kit.ipd.descartes.mm.resourcepoolconfig.provider.ResourcepoolconfigItemProviderAdapterFactory; - import org.eclipse.ui.actions.WorkspaceModifyOperation; @@ -180,164 +178,164 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; * @generated */ public class ResourcetypeEditor - extends MultiPageEditorPart - implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { - /** + extends MultiPageEditorPart + implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker { + /** * This keeps track of the editing domain that is used to track all changes to the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected AdapterFactoryEditingDomain editingDomain; + protected AdapterFactoryEditingDomain editingDomain; - /** + /** * This is the one adapter factory used for providing views of the model. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ComposedAdapterFactory adapterFactory; + protected ComposedAdapterFactory adapterFactory; - /** + /** * This is the content outline page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IContentOutlinePage contentOutlinePage; + protected IContentOutlinePage contentOutlinePage; - /** + /** * This is a kludge... * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IStatusLineManager contentOutlineStatusLineManager; + protected IStatusLineManager contentOutlineStatusLineManager; - /** + /** * This is the content outline page's viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer contentOutlineViewer; + protected TreeViewer contentOutlineViewer; - /** + /** * This is the property sheet page. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected PropertySheetPage propertySheetPage; + protected PropertySheetPage propertySheetPage; - /** + /** * This is the viewer that shadows the selection in the content outline. * The parent relation must be correctly defined for this to work. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer selectionViewer; + protected TreeViewer selectionViewer; - /** + /** * This inverts the roll of parent and child in the content provider and show parents as a tree. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer parentViewer; + protected TreeViewer parentViewer; - /** + /** * This shows how a tree view works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewer; + protected TreeViewer treeViewer; - /** + /** * This shows how a list view works. * A list viewer doesn't support icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ListViewer listViewer; + protected ListViewer listViewer; - /** + /** * This shows how a table view works. * A table can be used as a list with icons. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TableViewer tableViewer; + protected TableViewer tableViewer; - /** + /** * This shows how a tree view with columns works. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected TreeViewer treeViewerWithColumns; + protected TreeViewer treeViewerWithColumns; - /** + /** * This keeps track of the active viewer pane, in the book. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ViewerPane currentViewerPane; + protected ViewerPane currentViewerPane; - /** + /** * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Viewer currentViewer; + protected Viewer currentViewer; - /** + /** * This listens to which ever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelectionChangedListener selectionChangedListener; + protected ISelectionChangedListener selectionChangedListener; - /** + /** * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); + protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); - /** + /** * This keeps track of the selection of the editor as a whole. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected ISelection editorSelection = StructuredSelection.EMPTY; + protected ISelection editorSelection = StructuredSelection.EMPTY; - /** + /** * The MarkerHelper is responsible for creating workspace resource markers presented * in Eclipse's Problems View. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected MarkerHelper markerHelper = new EditUIMarkerHelper(); + protected MarkerHelper markerHelper = new EditUIMarkerHelper(); - /** + /** * This listens for when the outline becomes active * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IPartListener partListener = - new IPartListener() { + protected IPartListener partListener = + new IPartListener() { public void partActivated(IWorkbenchPart p) { if (p instanceof ContentOutline) { if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) { @@ -370,54 +368,54 @@ public class ResourcetypeEditor } }; - /** + /** * Resources that have been removed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> removedResources = new ArrayList<Resource>(); + protected Collection<Resource> removedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been changed since last activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> changedResources = new ArrayList<Resource>(); + protected Collection<Resource> changedResources = new ArrayList<Resource>(); - /** + /** * Resources that have been saved. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Collection<Resource> savedResources = new ArrayList<Resource>(); + protected Collection<Resource> savedResources = new ArrayList<Resource>(); - /** + /** * Map to store the diagnostic associated with a resource. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); + protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); - /** + /** * Controls whether the problem indication should be updated. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean updateProblemIndication = true; + protected boolean updateProblemIndication = true; - /** + /** * Adapter used to update the problem indication when resources are demanded loaded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected EContentAdapter problemIndicationAdapter = - new EContentAdapter() { + protected EContentAdapter problemIndicationAdapter = + new EContentAdapter() { @Override public void notifyChanged(Notification notification) { if (notification.getNotifier() instanceof Resource) { @@ -462,14 +460,14 @@ public class ResourcetypeEditor } }; - /** + /** * This listens for workspace changes. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected IResourceChangeListener resourceChangeListener = - new IResourceChangeListener() { + protected IResourceChangeListener resourceChangeListener = + new IResourceChangeListener() { public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta = event.getDelta(); try { @@ -539,13 +537,13 @@ public class ResourcetypeEditor } }; - /** + /** * Handles activation of the editor or it's associated views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleActivate() { + protected void handleActivate() { // Recompute the read only state. // if (editingDomain.getResourceToReadOnlyMap() != null) { @@ -574,13 +572,13 @@ public class ResourcetypeEditor } } - /** + /** * Handles what to do with changed resources on activation. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void handleChangedResources() { + protected void handleChangedResources() { if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) { if (isDirty()) { changedResources.addAll(editingDomain.getResourceSet().getResources()); @@ -611,13 +609,13 @@ public class ResourcetypeEditor } } - /** + /** * Updates the problems indication with the information described in the specified diagnostic. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void updateProblemIndication() { + protected void updateProblemIndication() { if (updateProblemIndication) { BasicDiagnostic diagnostic = new BasicDiagnostic @@ -668,13 +666,13 @@ public class ResourcetypeEditor } } - /** + /** * Shows a dialog that asks if conflicting changes should be discarded. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean handleDirtyConflict() { + protected boolean handleDirtyConflict() { return MessageDialog.openQuestion (getSite().getShell(), @@ -682,24 +680,24 @@ public class ResourcetypeEditor getString("_WARN_FileConflict")); } - /** + /** * This creates a model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ResourcetypeEditor() { + public ResourcetypeEditor() { super(); initializeEditingDomain(); } - /** + /** * This sets up the editing domain for the model editor. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void initializeEditingDomain() { + protected void initializeEditingDomain() { // Create an adapter factory that yields item providers. // adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); @@ -746,24 +744,24 @@ public class ResourcetypeEditor editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); } - /** + /** * This is here for the listener to be able to call it. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void firePropertyChange(int action) { + @Override + protected void firePropertyChange(int action) { super.firePropertyChange(action); } - /** + /** * This sets the selection into whichever viewer is active. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelectionToViewer(Collection<?> collection) { + public void setSelectionToViewer(Collection<?> collection) { final Collection<?> theSelection = collection; // Make sure it's okay. // @@ -782,83 +780,83 @@ public class ResourcetypeEditor } } - /** + /** * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomain getEditingDomain() { + public EditingDomain getEditingDomain() { return editingDomain; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { - /** + public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider { + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { + public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) { super(adapterFactory); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getElements(Object object) { + @Override + public Object [] getElements(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object [] getChildren(Object object) { + @Override + public Object [] getChildren(Object object) { Object parent = super.getParent(object); return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean hasChildren(Object object) { + @Override + public boolean hasChildren(Object object) { Object parent = super.getParent(object); return parent != null; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public Object getParent(Object object) { + @Override + public Object getParent(Object object) { return null; } - } + } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewerPane(ViewerPane viewerPane) { + public void setCurrentViewerPane(ViewerPane viewerPane) { if (currentViewerPane != viewerPane) { if (currentViewerPane != null) { currentViewerPane.showFocus(false); @@ -868,14 +866,14 @@ public class ResourcetypeEditor setCurrentViewer(currentViewerPane.getViewer()); } - /** + /** * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, * is the current one. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setCurrentViewer(Viewer viewer) { + public void setCurrentViewer(Viewer viewer) { // If it is changing... // if (currentViewer != viewer) { @@ -914,23 +912,23 @@ public class ResourcetypeEditor } } - /** + /** * This returns the viewer as required by the {@link IViewerProvider} interface. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Viewer getViewer() { + public Viewer getViewer() { return currentViewer; } - /** + /** * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void createContextMenuFor(StructuredViewer viewer) { + protected void createContextMenuFor(StructuredViewer viewer) { MenuManager contextMenu = new MenuManager("#PopUp"); contextMenu.add(new Separator("additions")); contextMenu.setRemoveAllWhenShown(true); @@ -945,13 +943,13 @@ public class ResourcetypeEditor viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer)); } - /** + /** * This is the method called to load a resource into the editing domain's resource set based on the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void createModel() { + public void createModel() { URI resourceURI = EditUIUtil.getURI(getEditorInput()); Exception exception = null; Resource resource = null; @@ -972,14 +970,14 @@ public class ResourcetypeEditor editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter); } - /** + /** * Returns a diagnostic describing the errors and warnings listed in the resource * and the specified exception (if any). * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { + public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) { if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) { BasicDiagnostic basicDiagnostic = new BasicDiagnostic @@ -1005,14 +1003,14 @@ public class ResourcetypeEditor } } - /** + /** * This is the method used by the framework to install your own controls. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void createPages() { + @Override + public void createPages() { // Creates the model from the editor input // createModel(); @@ -1253,14 +1251,14 @@ public class ResourcetypeEditor }); } - /** + /** * If there is just one page in the multi-page editor part, * this hides the single tab at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void hideTabs() { + protected void hideTabs() { if (getPageCount() <= 1) { setPageText(0, ""); if (getContainer() instanceof CTabFolder) { @@ -1271,14 +1269,14 @@ public class ResourcetypeEditor } } - /** + /** * If there is more than one page in the multi-page editor part, * this shows the tabs at the bottom. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void showTabs() { + protected void showTabs() { if (getPageCount() > 1) { setPageText(0, getString("_UI_SelectionPage_label")); if (getContainer() instanceof CTabFolder) { @@ -1289,14 +1287,14 @@ public class ResourcetypeEditor } } - /** + /** * This is used to track the active viewer. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - protected void pageChange(int pageIndex) { + @Override + protected void pageChange(int pageIndex) { super.pageChange(pageIndex); if (contentOutlinePage != null) { @@ -1304,15 +1302,15 @@ public class ResourcetypeEditor } } - /** + /** * This is how the framework determines which interfaces we implement. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class key) { + @SuppressWarnings("rawtypes") + @Override + public Object getAdapter(Class key) { if (key.equals(IContentOutlinePage.class)) { return showOutlineView() ? getContentOutlinePage() : null; } @@ -1327,13 +1325,13 @@ public class ResourcetypeEditor } } - /** + /** * This accesses a cached version of the content outliner. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IContentOutlinePage getContentOutlinePage() { + public IContentOutlinePage getContentOutlinePage() { if (contentOutlinePage == null) { // The content outline is just a tree. // @@ -1391,13 +1389,13 @@ public class ResourcetypeEditor return contentOutlinePage; } - /** + /** * This accesses a cached version of the property sheet. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IPropertySheetPage getPropertySheetPage() { + public IPropertySheetPage getPropertySheetPage() { if (propertySheetPage == null) { propertySheetPage = new ExtendedPropertySheetPage(editingDomain) { @@ -1419,13 +1417,13 @@ public class ResourcetypeEditor return propertySheetPage; } - /** + /** * This deals with how we want selection in the outliner to affect the other views. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void handleContentOutlineSelection(ISelection selection) { + public void handleContentOutlineSelection(ISelection selection) { if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator(); if (selectedElements.hasNext()) { @@ -1458,25 +1456,25 @@ public class ResourcetypeEditor } } - /** + /** * This is for implementing {@link IEditorPart} and simply tests the command stack. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isDirty() { + @Override + public boolean isDirty() { return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded(); } - /** + /** * This is for implementing {@link IEditorPart} and simply saves the model file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSave(IProgressMonitor progressMonitor) { + @Override + public void doSave(IProgressMonitor progressMonitor) { // Save only resources that have actually changed. // final Map<Object, Object> saveOptions = new HashMap<Object, Object>(); @@ -1531,14 +1529,14 @@ public class ResourcetypeEditor updateProblemIndication(); } - /** + /** * This returns whether something has been persisted to the URI of the specified resource. * The implementation uses the URI converter from the editor's resource set to try to open an input stream. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean isPersisted(Resource resource) { + protected boolean isPersisted(Resource resource) { boolean result = false; try { InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI()); @@ -1553,25 +1551,25 @@ public class ResourcetypeEditor return result; } - /** + /** * This always returns true because it is not currently supported. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public boolean isSaveAsAllowed() { + @Override + public boolean isSaveAsAllowed() { return true; } - /** + /** * This also changes the editor's input. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void doSaveAs() { + @Override + public void doSaveAs() { SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell()); saveAsDialog.open(); IPath path = saveAsDialog.getResult(); @@ -1583,12 +1581,12 @@ public class ResourcetypeEditor } } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected void doSaveAs(URI uri, IEditorInput editorInput) { + protected void doSaveAs(URI uri, IEditorInput editorInput) { (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1599,12 +1597,12 @@ public class ResourcetypeEditor doSave(progressMonitor); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void gotoMarker(IMarker marker) { + public void gotoMarker(IMarker marker) { try { if (marker.getType().equals(EValidator.MARKER)) { String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null); @@ -1622,14 +1620,14 @@ public class ResourcetypeEditor } } - /** + /** * This is called during startup. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void init(IEditorSite site, IEditorInput editorInput) { + @Override + public void init(IEditorSite site, IEditorInput editorInput) { setSite(site); setInputWithNotify(editorInput); setPartName(editorInput.getName()); @@ -1638,13 +1636,13 @@ public class ResourcetypeEditor ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void setFocus() { + @Override + public void setFocus() { if (currentViewerPane != null) { currentViewerPane.setFocus(); } @@ -1653,44 +1651,44 @@ public class ResourcetypeEditor } } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { + public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.add(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) { + public void removeSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.remove(listener); } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public ISelection getSelection() { + public ISelection getSelection() { return editorSelection; } - /** + /** * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection. * Calling this result will notify the listeners. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setSelection(ISelection selection) { + public void setSelection(ISelection selection) { editorSelection = selection; for (ISelectionChangedListener listener : selectionChangedListeners) { @@ -1699,12 +1697,12 @@ public class ResourcetypeEditor setStatusLineManager(selection); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void setStatusLineManager(ISelection selection) { + public void setStatusLineManager(ISelection selection) { IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager(); @@ -1733,70 +1731,70 @@ public class ResourcetypeEditor } } - /** + /** * This looks up a string in the plugin's plugin.properties file. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key) { + private static String getString(String key) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key); } - /** + /** * This looks up a string in plugin.properties, making a substitution. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - private static String getString(String key, Object s1) { + private static String getString(String key, Object s1) { return ResourcelandscapeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 }); } - /** + /** * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public void menuAboutToShow(IMenuManager menuManager) { + public void menuAboutToShow(IMenuManager menuManager) { ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public EditingDomainActionBarContributor getActionBarContributor() { + public EditingDomainActionBarContributor getActionBarContributor() { return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public IActionBars getActionBars() { + public IActionBars getActionBars() { return getActionBarContributor().getActionBars(); } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - public AdapterFactory getAdapterFactory() { + public AdapterFactory getAdapterFactory() { return adapterFactory; } - /** + /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - @Override - public void dispose() { + @Override + public void dispose() { updateProblemIndication = false; ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); @@ -1820,13 +1818,13 @@ public class ResourcetypeEditor super.dispose(); } - /** + /** * Returns whether the outline view should be presented to the user. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @generated */ - protected boolean showOutlineView() { + protected boolean showOutlineView() { return true; } } -- GitLab