Clean up and re-organise CMS

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / maintenance / Browse.java

diff --git a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java
index 2195e571c0cffb2aea55f90f12ec69dbafcac534..e3561e104777b9be7e26107c3c153060a2c5f044 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java
+++ b/org.argeo.cms/src/org/argeo/cms/maintenance/Browse.java
@@ -18,11 +18,11 @@ import javax.jcr.Value;
 
 import org.argeo.ArgeoException;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.CmsLink;
 import org.argeo.cms.CmsTypes;
 import org.argeo.cms.CmsUiProvider;
-import org.argeo.cms.CmsUtils;
 import org.argeo.cms.text.Img;
+import org.argeo.cms.util.CmsLink;
+import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.widgets.EditableImage;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -264,6 +264,7 @@ public class Browse implements CmsUiProvider {
                                boolean leaveOpened = path.startsWith(currNodePath);
 
                                // workaround for same name siblings
+                               // fix me weird side effect when we go left or click on anb already selected, unfocused node
                                if (leaveOpened
                                                && (path.lastIndexOf("/") == 0
                                                                && currNodePath.lastIndexOf("/") == 0 || JcrUtils
@@ -505,6 +506,7 @@ public class Browse implements CmsUiProvider {
                                        });
 
                        table.addKeyListener(new KeyListener() {
+                               private static final long serialVersionUID = -330694313896036230L;
 
                                @Override
                                public void keyReleased(KeyEvent e) {
@@ -526,8 +528,9 @@ public class Browse implements CmsUiProvider {
                                                        }
                                                } else if (e.keyCode == SWT.ARROW_LEFT) {
                                                        try {
-                                                               String newPath = getNode().getParent()
-                                                                               .getPath();
+                                                               selected = getNode().getParent();
+                                                               String newPath = selected.getPath(); //getNode().getParent()
+                                                               setEdited(selected);
                                                                if (browserCols.containsKey(newPath))
                                                                        browserCols.get(newPath).setFocus();
                                                        } catch (ItemNotFoundException ie) {