X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FDefaultLeadPane.java;h=9a2faf5da00f3edf98be96d551801bb1defdc805;hb=563457d2ad28f2587b0bc42a1153c9a5e5230ca6;hp=7b7a0319991f4fff4abb00037f2e19127509a29b;hpb=d917d2b10162a29cddaf8c81c362efa37abcaab9;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java
index 7b7a031..9a2faf5 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java
@@ -3,7 +3,6 @@ package org.argeo.app.ui;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -14,8 +13,11 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.ux.CmsView;
 import org.argeo.app.api.RankedObject;
 import org.argeo.app.core.SuiteUtils;
+import org.argeo.app.swt.ux.SwtAppLayer;
+import org.argeo.app.ux.SuiteIcon;
+import org.argeo.app.ux.SuiteStyle;
+import org.argeo.cms.CurrentUser;
 import org.argeo.cms.Localized;
-import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.eclipse.swt.SWT;
@@ -36,7 +38,7 @@ public class DefaultLeadPane implements CmsUiProvider {
 		defaultLayers, adminLayers;
 	}
 
-	private Map<String, RankedObject<SuiteLayer>> layers = Collections.synchronizedSortedMap(new TreeMap<>());
+	private Map<String, RankedObject<SwtAppLayer>> layers = Collections.synchronizedSortedMap(new TreeMap<>());
 	private List<String> defaultLayers;
 	private List<String> adminLayers = new ArrayList<>();
 
@@ -99,11 +101,11 @@ public class DefaultLeadPane implements CmsUiProvider {
 //					if (intersection.isEmpty())
 //						continue layers;// skip unauthorized layer
 				}
-				RankedObject<SuiteLayer> layerObj = layers.get(layerId);
+				RankedObject<SwtAppLayer> layerObj = layers.get(layerId);
 
 				Localized title = null;
 				if (!adminLayers.contains(layerId)) {
-					String titleStr = (String) layerObj.getProperties().get(SuiteLayer.Property.title.name());
+					String titleStr = (String) layerObj.getProperties().get(SwtAppLayer.Property.title.name());
 					if (titleStr != null) {
 						if (titleStr.startsWith("%")) {
 							// LocaleUtils.local(titleStr, getClass().getClassLoader());
@@ -114,7 +116,7 @@ public class DefaultLeadPane implements CmsUiProvider {
 					}
 				}
 
-				String iconName = (String) layerObj.getProperties().get(SuiteLayer.Property.icon.name());
+				String iconName = (String) layerObj.getProperties().get(SwtAppLayer.Property.icon.name());
 				SuiteIcon icon = null;
 				if (iconName != null)
 					icon = SuiteIcon.valueOf(iconName);
@@ -154,18 +156,18 @@ public class DefaultLeadPane implements CmsUiProvider {
 
 	}
 
-	public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
+	public void addLayer(SwtAppLayer layer, Map<String, Object> properties) {
 		if (properties.containsKey(Constants.SERVICE_PID)) {
 			String pid = (String) properties.get(Constants.SERVICE_PID);
 			RankedObject.putIfHigherRank(layers, pid, layer, properties);
 		}
 	}
 
-	public void removeLayer(SuiteLayer layer, Map<String, Object> properties) {
+	public void removeLayer(SwtAppLayer layer, Map<String, Object> properties) {
 		if (properties.containsKey(Constants.SERVICE_PID)) {
 			String pid = (String) properties.get(Constants.SERVICE_PID);
 			if (layers.containsKey(pid)) {
-				if (layers.get(pid).equals(new RankedObject<SuiteLayer>(layer, properties))) {
+				if (layers.get(pid).equals(new RankedObject<SwtAppLayer>(layer, properties))) {
 					layers.remove(pid);
 				}
 			}