X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.geo.ui%2Fsrc%2Forg%2Fargeo%2Fsupport%2Fopenlayers%2FOpenLayersMap.java;h=dac7bea8da28265ce70cc69ff02dde7a49a222a1;hb=41e9998f7f1c87c747c57f60c6bec65fa20757a6;hp=5357149c81e4dc5d3ec859ca5a2c925afef8559e;hpb=3440f51df3e4c015972c7b6a0efb3ce16188b89b;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java b/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
index 5357149..dac7bea 100644
--- a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
+++ b/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
@@ -13,11 +13,10 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
-import org.argeo.cms.ui.CmsView;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.entity.EntityNames;
 import org.argeo.entity.EntityType;
 import org.argeo.suite.ui.SuiteEvent;
@@ -31,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
 public class OpenLayersMap extends Composite {
 	private static final long serialVersionUID = 1055893020490283622L;
 
-	private final static Log log = LogFactory.getLog(OpenLayersMap.class);
+	private final static CmsLog log = CmsLog.getLog(OpenLayersMap.class);
 
 	private Browser browser;
 	private boolean renderCompleted = false;
@@ -51,11 +50,11 @@ public class OpenLayersMap extends Composite {
 
 	public OpenLayersMap(Composite parent, int style, URL mapHtml) {
 		super(parent, style);
-		cmsView = CmsView.getCmsView(parent);
+		cmsView = CmsSwtUtils.getCmsView(parent);
 		setLayout(new GridLayout());
 
 		browser = new Browser(this, SWT.BORDER);
-		browser.setLayoutData(CmsUiUtils.fillAll());
+		browser.setLayoutData(CmsSwtUtils.fillAll());
 		String html;
 		try (InputStream in = mapHtml.openStream()) {
 			html = IOUtils.toString(in, StandardCharsets.UTF_8);
@@ -269,7 +268,7 @@ public class OpenLayersMap extends Composite {
 			String path = arguments[0].toString();
 			Map<String, Object> properties = new HashMap<>();
 			properties.put(SuiteEvent.NODE_PATH, path);
-			properties.put(SuiteEvent.WORKSPACE, NodeConstants.SYS_WORKSPACE);
+			properties.put(SuiteEvent.WORKSPACE, CmsConstants.SYS_WORKSPACE);
 			cmsView.sendEvent(SuiteEvent.refreshPart.topic(), properties);
 			return null;
 		}