From ecfdf3e710446b16722abcae24c6b78340a3de4e Mon Sep 17 00:00:00 2001
From: Daniel Ratiu <ratiu@fortiss.org>
Date: Mon, 14 Jan 2013 14:18:15 +0000
Subject: [PATCH] a better solution refs 1153
---
.../tooling/kernel/ui/extension/base/EditorBase.java | 5 +++--
.../tooling/kernel/ui/internal/views/LibraryView.java | 11 ++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java
index ab6107b18..6105973a0 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.EditorPart;
import org.fortiss.tooling.kernel.service.ICommandStackService;
+import org.fortiss.tooling.kernel.service.ILibraryService;
import org.fortiss.tooling.kernel.ui.extension.IModelEditor;
import org.fortiss.tooling.kernel.ui.extension.IModelEditorBinding;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
@@ -40,7 +41,7 @@ import org.fortiss.tooling.kernel.ui.internal.editor.ModelElementEditorInput;
* @author hoelzlf
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 2E53286498C8CAEC1E65A31557449118
+ * @ConQAT.Rating YELLOW Hash: 9788EE38CFBA0BEE3DC10A60A374AF25
*/
public abstract class EditorBase<T extends EObject> extends EditorPart implements
IActionContributingEditor, IModelEditor<T> {
@@ -162,6 +163,6 @@ public abstract class EditorBase<T extends EObject> extends EditorPart implement
/** {@inheritDoc} */
@Override
public boolean enableLibraryView() {
- return true;
+ return !ILibraryService.INSTANCE.isLibraryElementShadow(editedObject);
}
}
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
index d953a08f4..1ac0f433c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
@@ -39,7 +39,6 @@ import org.eclipse.ui.dialogs.PatternFilter;
import org.eclipse.ui.part.ViewPart;
import org.fortiss.tooling.kernel.extension.data.Prototype;
import org.fortiss.tooling.kernel.extension.data.PrototypeCategory;
-import org.fortiss.tooling.kernel.service.ILibraryService;
import org.fortiss.tooling.kernel.service.IPrototypeService;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.EditorBase;
@@ -54,7 +53,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author eder
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: 5BA45B05325FF0C8C955FD593072FF56
+ * @ConQAT.Rating YELLOW Hash: 39E9DA9C8ED720A9B2BF2E8CF1F59132
*/
public class LibraryView extends ViewPart {
@@ -134,11 +133,9 @@ public class LibraryView extends ViewPart {
EditorBase<? extends EObject> editorBase = (EditorBase<? extends EObject>)editor;
containerObject = editorBase.getEditedObject();
- if(!ILibraryService.INSTANCE.isLibraryElementShadow(containerObject)) {
- for(Class<? extends EObject> clazz : editorBase.getVisibleEObjectTypes()) {
- supportedBaseClasses.addAll(IPrototypeService.INSTANCE
- .getComposablePrototypes(clazz));
- }
+ for(Class<? extends EObject> clazz : editorBase.getVisibleEObjectTypes()) {
+ supportedBaseClasses.addAll(IPrototypeService.INSTANCE
+ .getComposablePrototypes(clazz));
}
} else {
containerObject = null;
--
GitLab