From e773306e8f034f38e2aff6bae736682b3f56f103 Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Tue, 21 Jul 2020 10:11:44 +0200
Subject: [PATCH] YELLOW
Issue-Ref: 4043
Issue-Url: https://af3-developer.fortiss.org/issues/4043
Signed-off-by: Johannes Eder <eder@fortiss.org>
---
.../META-INF/MANIFEST.MF | 1 +
.../org/fortiss/tooling/kernel/ui/.ratings | 2 +-
.../tooling/kernel/ui/internal/views/.ratings | 2 +-
.../kernel/ui/internal/views/library/.ratings | 2 ++
.../library/LibraryTreeContentProvider.java | 4 +++-
.../views/library/LibraryViewPart.java | 24 ++++++-------------
6 files changed, 15 insertions(+), 20 deletions(-)
create mode 100644 org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/.ratings
diff --git a/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
index d97f76668..42452ac70 100644
--- a/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@ Export-Package: org.fortiss.tooling.kernel.ui,
org.fortiss.tooling.kernel.ui.internal.editor,
org.fortiss.tooling.kernel.ui.internal.properties,
org.fortiss.tooling.kernel.ui.internal.views,
+ org.fortiss.tooling.kernel.ui.internal.views.library,
org.fortiss.tooling.kernel.ui.listener,
org.fortiss.tooling.kernel.ui.presentation,
org.fortiss.tooling.kernel.ui.service,
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
index e5179fafc..1660ab56b 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
@@ -1,3 +1,3 @@
-ESharedImages.java dd65be1d1ee807db8460064d9b970847e6303ff0 GREEN
+ESharedImages.java d33fea62344c1654b5da296fb51a18098cb09eed YELLOW
ToolingKernelUI.java 250e5dde230272e286aa8d327fd597cf542774fe GREEN
ToolingKernelUIActivator.java fc281e60592e54bd606d0b6667168afdfde8389e GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/.ratings
index cde02f1cf..a841f867f 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/.ratings
@@ -1,4 +1,4 @@
-DoubleClick.java fd00e7737c0bad903433c0adb67dad92220ff451 GREEN
+DoubleClick.java a94d27299814a93b0d8914050a5da7378a7eccd1 YELLOW
GenericNewMenu.java 7e0dd435cb5ca6d4b486235ec17eef3e5c7aa5f6 GREEN
LibraryView.java 44107622da7bcf431e1177e462d711646488957f GREEN
LibraryViewDragSourceAdapter.java 56ef61b214ef5d6cb5b751791a92158bda0391ec GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/.ratings
new file mode 100644
index 000000000..70cb60bb7
--- /dev/null
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/.ratings
@@ -0,0 +1,2 @@
+LibraryTreeContentProvider.java dadf37cf8e54da481aac354d2c1b1360a018ea31 YELLOW
+LibraryViewPart.java 7bdae7fdacca2d3d21e619473a6aa18d171e6deb YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryTreeContentProvider.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryTreeContentProvider.java
index 0fe7da90d..dadf37cf8 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryTreeContentProvider.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryTreeContentProvider.java
@@ -26,10 +26,12 @@ import org.fortiss.tooling.kernel.model.ILibrary;
import org.fortiss.tooling.kernel.model.ILibraryElementReference;
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.internal.views.NavigatorTreeContentProvider;
import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
/**
- * Content provider for the model navigator tree viewer.
+ * Content provider for the library tree viewer. Reduced form of the
+ * {@link NavigatorTreeContentProvider}.
*
* @author eder
*/
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryViewPart.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryViewPart.java
index fb3daa8c6..7bdae7fda 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/views/library/LibraryViewPart.java
@@ -57,7 +57,7 @@ import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
import org.fortiss.tooling.kernel.ui.internal.NavigatorService;
import org.fortiss.tooling.kernel.ui.internal.views.DoubleClick;
import org.fortiss.tooling.kernel.ui.internal.views.NavigatorTreeContentComparator;
-import org.fortiss.tooling.kernel.ui.internal.views.NavigatorTreeContentProvider;
+import org.fortiss.tooling.kernel.ui.internal.views.NavigatorViewPart;
import org.fortiss.tooling.kernel.ui.presentation.TutorialDefinitionModelElementLabelProvider;
import org.fortiss.tooling.kernel.ui.service.IActionService;
import org.fortiss.tooling.kernel.ui.service.IContextMenuService;
@@ -66,15 +66,19 @@ import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
import org.fortiss.tooling.kernel.ui.util.SelectionUtils;
/**
- * {@link ViewPart} of the model navigator provided by the tooling kernel.
+ * {@link ViewPart} for the library view. Basically, a reduced form of the
+ * {@link NavigatorViewPart}.
*
* @author hoelzl
- * @authot eder
+ * @author eder
*/
public final class LibraryViewPart extends ViewPart implements ISelectionListener,
ISelectionChangedListener, ITabbedPropertySheetPageContributor, ContextMenuContextProvider,
ISaveablesSource, ISaveablePart {
+ /** The ID of this view. */
+ public static final String ID = LibraryViewPart.class.getName();
+
/** Stores the TreeViewer. */
private TreeViewer viewer;
@@ -155,21 +159,9 @@ public final class LibraryViewPart extends ViewPart implements ISelectionListene
getSelectionService().addSelectionListener(this);
- // getSite().getPage().addPartListener(partListener);
-
refreshPartTitleAndImage();
}
- /** Sets the library view to be active. */
- public void setLibraryViewActive() {
- NavigatorTreeContentProvider contentProvider =
- (NavigatorTreeContentProvider)viewer.getContentProvider();
- if(!contentProvider.isLibraryViewActive()) {
- contentProvider.toggleLibraryView();
- viewer.refresh();
- }
- }
-
/** Creates the context menu. */
private void createContextMenu() {
menuManager = IContextMenuService.getInstance().createDefaultContextMenu(this);
@@ -229,8 +221,6 @@ public final class LibraryViewPart extends ViewPart implements ISelectionListene
getSelectionService().removeSelectionListener(this);
getSite().setSelectionProvider(null);
- // getSite().getPage().removePartListener(partListener);
-
super.dispose();
}
--
GitLab