X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2Fgcr%2FGcrContentTreeView.java;h=ba6d7b477eca446a2e5b9625704e01fda5e6b9a0;hb=e5a22cdc7d0f4918f2740c626e1ab6384bd5ee44;hp=354be53532261a9d80a1b71a0ec13a1ad0b0cd2c;hpb=8767858f1fca02ea7c53ca244f6c1fa745d91ac4;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java b/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java index 354be5353..ba6d7b477 100644 --- a/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java +++ b/org.argeo.cms.swt/src/org/argeo/cms/swt/gcr/GcrContentTreeView.java @@ -3,8 +3,10 @@ package org.argeo.cms.swt.gcr; import java.nio.file.Path; import java.nio.file.Paths; +import javax.xml.namespace.QName; + import org.argeo.api.gcr.Content; -import org.argeo.cms.gcr.fs.FsContentSession; +import org.argeo.cms.gcr.fs.FsContentProvider; import org.argeo.cms.swt.CmsSwtUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -36,7 +38,7 @@ public class GcrContentTreeView extends Composite { treeGd.widthHint = 300; tree.setLayoutData(treeGd); initTable(); - + table.setLayoutData(CmsSwtUtils.fillAll()); } @@ -44,7 +46,7 @@ public class GcrContentTreeView extends Composite { tree = new Tree(this, 0); for (Content c : rootContent) { TreeItem root = new TreeItem(tree, 0); - root.setText(c.getName()); + root.setText(c.getName().toString()); root.setData(c); new TreeItem(root, 0); } @@ -59,7 +61,7 @@ public class GcrContentTreeView extends Composite { Content content = (Content) root.getData(); for (Content c : content) { TreeItem item = new TreeItem(root, 0); - item.setText(c.getName()); + item.setText(c.getName().toString()); item.setData(c); boolean hasChildren = true; if (hasChildren) { @@ -91,9 +93,9 @@ public class GcrContentTreeView extends Composite { for (TableItem item : table.getItems()) { item.dispose(); } - for (String key : selected.keySet()) { + for (QName key : selected.keySet()) { TableItem item = new TableItem(table, 0); - item.setText(0, key); + item.setText(0, key.toString()); Object value = selected.get(key); item.setText(1, value.toString()); } @@ -114,8 +116,8 @@ public class GcrContentTreeView extends Composite { shell.setText(basePath.toString()); shell.setLayout(new FillLayout()); - FsContentSession contentSession = new FsContentSession(basePath); - GcrContentTreeView treeView = new GcrContentTreeView(shell, 0, contentSession.get()); + FsContentProvider contentSession = new FsContentProvider(basePath); +// GcrContentTreeView treeView = new GcrContentTreeView(shell, 0, contentSession.get("/")); shell.setSize(shell.computeSize(800, 600)); shell.open();