Introduce Makefile for Java build

[lgpl/argeo-commons.git] / org.argeo.cms.e4 / src / org / argeo / cms / e4 / monitoring / CmsSessionsView.java

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
index a85d27bf7b92df6c46ba151bd47887232ab255ff..8a360509527e41ac4eb3a562498d3fe4784e757b 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
@@ -1,21 +1,6 @@
 //package org.argeo.eclipse.ui.workbench.osgi;
 //public class BundlesView {}
 
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.cms.e4.monitoring;
 
 import java.util.ArrayList;
@@ -25,8 +10,7 @@ import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
 import org.argeo.eclipse.ui.ColumnViewerComparator;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.argeo.util.LangUtils;
@@ -70,7 +54,7 @@ public class CmsSessionsView {
                        private static final long serialVersionUID = -5234573509093747505L;
 
                        public String getText(Object element) {
-                               return ((CmsSession) element).getAuthorization().toString();
+                               return ((CmsSession) element).getDisplayName();
                        }
 
                        public String getToolTipText(Object element) {
@@ -169,7 +153,7 @@ public class CmsSessionsView {
                                try {
                                        srs = bc.getServiceReferences(CmsSession.class, null);
                                } catch (InvalidSyntaxException e) {
-                                       throw new CmsException("Cannot retrieve CMS sessions", e);
+                                       throw new IllegalArgumentException("Cannot retrieve CMS sessions", e);
                                }
                                List<CmsSession> res = new ArrayList<>();
                                for (ServiceReference<CmsSession> sr : srs) {