Fix editors and views icons

diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index cbe401a23ff9004615fa0f26603801dda882391c..9ddb46aff5d59f395568d2e9a8cfd75c3188fa4d 100644 (file)
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -19,6 +19,7 @@
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
                        id="org.argeo.suite.workbench.rap.quickSearchView"
                        name="Search"
+               icon="platform:/plugin/org.argeo.connect.ui/icons/actions/search.png"
                        restorable="false">
                </view>
                
@@ -30,6 +31,7 @@
                <editor
                        id="org.argeo.suite.workbench.rap.defaultDashboardEditor"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
+               icon="platform:/plugin/org.argeo.connect.ui/icons/types/dashboard.png"
                        name="Dashboard">
                </editor>
        </extension>

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index 78f2f755e19441dfa7cd050ab57829503216a4b3..5156f1c5fdc2062086cfedfc604a2f1ec940e388 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -19,7 +19,6 @@ import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.connect.ConnectNames;
-import org.argeo.connect.ui.ConnectImages;
 import org.argeo.connect.ui.ConnectUiUtils;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.connect.workbench.Refreshable;
@@ -27,8 +26,8 @@ import org.argeo.connect.workbench.commands.OpenEntityEditor;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.NodeUtils;
-import org.argeo.suite.workbench.SuiteWorkbenchException;
 import org.argeo.suite.workbench.AsUiPlugin;
+import org.argeo.suite.workbench.SuiteWorkbenchException;
 import org.argeo.tracker.TrackerNames;
 import org.argeo.tracker.TrackerService;
 import org.argeo.tracker.TrackerTypes;
@@ -74,7 +73,6 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        @Override
        public void init(IEditorSite site, IEditorInput input) throws PartInitException {
                super.init(site, input);
-               setTitleImage(ConnectImages.DASHBOARD);
        }
 
        @Override
@@ -142,8 +140,6 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                        viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
                        final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getSession(),
                                        activitiesService) {
-                               private static final long serialVersionUID = 1640863021424194303L;
-
                                @Override
                                public boolean performAction(String actionId) {
                                        boolean hasChanged = super.performAction(actionId);

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
index 3064e272d1735cc59eb1c096dca0bd0dbb8bb8ae..50340be5afd7f50d679bbbb71754a57642365ba0 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
@@ -15,7 +15,6 @@ import org.argeo.activities.ActivitiesService;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.connect.ConnectTypes;
 import org.argeo.connect.resources.ResourcesService;
-import org.argeo.connect.ui.ConnectImages;
 import org.argeo.connect.ui.ConnectUiConstants;
 import org.argeo.connect.ui.util.BasicNodeListContentProvider;
 import org.argeo.connect.ui.widgets.DelayedText;
@@ -75,7 +74,6 @@ public class QuickSearchView extends ViewPart implements Refreshable {
 
        @Override
        public void createPartControl(Composite parent) {
-               setTitleImage(ConnectImages.SEARCH);
                session = ConnectJcrUtils.login(repository);
                // MainLayout
                parent.setLayout(new GridLayout());