projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major refactoring of Argeo CMS UI
[gpl/argeo-suite.git]
/
org.argeo.geo.ui
/
src
/
org
/
argeo
/
support
/
openlayers
/
OpenLayersMap.java
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 5357149c81e4dc5d3ec859ca5a2c925afef8559e..4803a8681ed33a55a7edbbfc707321646fa055e9 100644
(file)
--- a/
org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
+++ b/
org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
@@
-16,8
+16,8
@@
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.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.CmsUi
Utils;
+import org.argeo.
api.cms
.CmsView;
+import org.argeo.cms.
swt.CmsSwt
Utils;
import org.argeo.entity.EntityNames;
import org.argeo.entity.EntityType;
import org.argeo.suite.ui.SuiteEvent;
import org.argeo.entity.EntityNames;
import org.argeo.entity.EntityType;
import org.argeo.suite.ui.SuiteEvent;
@@
-51,11
+51,11
@@
public class OpenLayersMap extends Composite {
public OpenLayersMap(Composite parent, int style, URL mapHtml) {
super(parent, style);
public OpenLayersMap(Composite parent, int style, URL mapHtml) {
super(parent, style);
- cmsView = Cms
View
.getCmsView(parent);
+ cmsView = Cms
SwtUtils
.getCmsView(parent);
setLayout(new GridLayout());
browser = new Browser(this, SWT.BORDER);
setLayout(new GridLayout());
browser = new Browser(this, SWT.BORDER);
- browser.setLayoutData(Cms
Ui
Utils.fillAll());
+ browser.setLayoutData(Cms
Swt
Utils.fillAll());
String html;
try (InputStream in = mapHtml.openStream()) {
html = IOUtils.toString(in, StandardCharsets.UTF_8);
String html;
try (InputStream in = mapHtml.openStream()) {
html = IOUtils.toString(in, StandardCharsets.UTF_8);