X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fmaintenance%2FBrowse.java;h=eea27478ab5694870544161551affacd44c98354;hb=2f7e4652af30d568491041ca2bed1c54b3246766;hp=2195e571c0cffb2aea55f90f12ec69dbafcac534;hpb=b5a45cd0f6a753c25d72d6e8df1ce5fdb7e6651d;p=lgpl%2Fargeo-commons.git 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 2195e571c..eea27478a 100644 --- 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; @@ -57,7 +57,7 @@ import org.eclipse.swt.widgets.Text; public class Browse implements CmsUiProvider { // Some local constants to experiment. should be cleaned - private final static String BROWSE_PREFIX = "#browse"; + private final static String BROWSE_PREFIX = "browse#"; private final static int THUMBNAIL_WIDTH = 400; private final static int COLUMN_WIDTH = 160; @@ -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) {