projects
/
gpl
/
argeo-jcr.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
073d598
)
Adapt to changes in Argeo Build and Argeo Commons
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 7 Mar 2024 15:23:35 +0000
(16:23 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 7 Mar 2024 15:23:35 +0000
(16:23 +0100)
sdk/argeo-build
patch
|
blob
|
history
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java
patch
|
blob
|
history
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
patch
|
blob
|
history
diff --git
a/sdk/argeo-build
b/sdk/argeo-build
index 6f8e29e850f9fcfa5149e296e650355fab930752..e021d17c09f8586a68177e9eb40d9caa088c37b1 160000
(submodule)
--- 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 613134b65fbb32d5f5ba49ba122a1cbdc6624f4e..a25db2331382389bb453948e67b6dda080e58da1 100644
(file)
--- 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;
package org.argeo.cms.e4.monitoring;
-import jakarta.annotation.PostConstruct;
-
import org.argeo.eclipse.ui.ColumnViewerComparator;
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;
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 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.
/**
* 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);
viewer.setContentProvider(new BundleContentProvider());
viewer.getTable().setHeaderVisible(true);
- EclipseUiSpecificUtils.enableToolTipSupport(viewer);
+
//
EclipseUiSpecificUtils.enableToolTipSupport(viewer);
// ID
TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
// 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 d1376ae51722ac675ed3d707eabbb8465aa31e0a..b83d9276a38771e3f95adb11095fbffc7c8a8bf2 100644
(file)
--- 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 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.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;
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 org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+import jakarta.annotation.PostConstruct;
+
/**
* Overview of the active CMS sessions.
*/
/**
* Overview of the active CMS sessions.
*/
@@
-41,7
+40,7
@@
public class CmsSessionsView {
viewer.setContentProvider(new CmsSessionContentProvider());
viewer.getTable().setHeaderVisible(true);
viewer.setContentProvider(new CmsSessionContentProvider());
viewer.getTable().setHeaderVisible(true);
- EclipseUiSpecificUtils.enableToolTipSupport(viewer);
+
//
EclipseUiSpecificUtils.enableToolTipSupport(viewer);
int longColWidth = 150;
int smallColWidth = 100;
int longColWidth = 150;
int smallColWidth = 100;