From 9f91ada8a503a5202088770d6aa66adadce9ca93 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Mar 2024 16:23:35 +0100 Subject: [PATCH] Adapt to changes in Argeo Build and Argeo Commons --- sdk/argeo-build | 2 +- .../src/org/argeo/cms/e4/monitoring/BundlesView.java | 7 +++---- .../src/org/argeo/cms/e4/monitoring/CmsSessionsView.java | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sdk/argeo-build b/sdk/argeo-build index 6f8e29e..e021d17 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 6f8e29e850f9fcfa5149e296e650355fab930752 +Subproject commit e021d17c09f8586a68177e9eb40d9caa088c37b1 diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java index 613134b..a25db23 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java @@ -3,10 +3,7 @@ package org.argeo.cms.e4.monitoring; -import jakarta.annotation.PostConstruct; - import org.argeo.eclipse.ui.ColumnViewerComparator; -import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils; import org.eclipse.e4.ui.di.Focus; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.IStructuredContentProvider; @@ -19,6 +16,8 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; +import jakarta.annotation.PostConstruct; + /** * Overview of the bundles as a table. Equivalent to Equinox 'ss' console * command. @@ -33,7 +32,7 @@ public class BundlesView { viewer.setContentProvider(new BundleContentProvider()); viewer.getTable().setHeaderVisible(true); - EclipseUiSpecificUtils.enableToolTipSupport(viewer); + //EclipseUiSpecificUtils.enableToolTipSupport(viewer); // ID TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE); diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java index d1376ae..b83d927 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java @@ -7,13 +7,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jakarta.annotation.PostConstruct; - import org.argeo.api.cms.CmsSession; import org.argeo.cms.RoleNameUtils; import org.argeo.cms.util.LangUtils; import org.argeo.eclipse.ui.ColumnViewerComparator; -import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils; import org.eclipse.e4.ui.di.Focus; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.IStructuredContentProvider; @@ -27,6 +24,8 @@ import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; +import jakarta.annotation.PostConstruct; + /** * Overview of the active CMS sessions. */ @@ -41,7 +40,7 @@ public class CmsSessionsView { viewer.setContentProvider(new CmsSessionContentProvider()); viewer.getTable().setHeaderVisible(true); - EclipseUiSpecificUtils.enableToolTipSupport(viewer); + //EclipseUiSpecificUtils.enableToolTipSupport(viewer); int longColWidth = 150; int smallColWidth = 100; -- 2.30.2