Revision cde22209 src/gr/grnet/pithos/web/client/FileList.java

b/src/gr/grnet/pithos/web/client/FileList.java
54 54 
import com.google.gwt.core.client.GWT;
55 55 
import com.google.gwt.event.dom.client.ContextMenuEvent;
56 56 
import com.google.gwt.event.dom.client.ContextMenuHandler;
57 
import com.google.gwt.http.client.URL;
58 57 
import com.google.gwt.i18n.client.DateTimeFormat;
59 58 
import com.google.gwt.resources.client.ImageResource;
60 
import com.google.gwt.resources.client.ClientBundle.Source;
61 59 
import com.google.gwt.resources.client.ImageResource.ImageOptions;
62 60 
import com.google.gwt.resources.client.ImageResource.RepeatStyle;
63 61 
import com.google.gwt.safehtml.client.SafeHtmlTemplates;
......
290 288 
				sb.append(Templates.INSTANCE.filenameSpan(object.getName()));
291 289 
				if (object.getContentType() != null && (object.getContentType().endsWith("png") || object.getContentType().endsWith("gif") || object.getContentType().endsWith("jpeg"))) {
292 290 
        			sb.appendHtmlConstant(" ")
293 
                      .append(Templates.INSTANCE.viewLink(app.getApiPath() + object.getOwner() + object.getUri(), object.getName()));
291 
                      .append(Templates.INSTANCE.viewLink(app.getApiPath() + object.getOwnerID() + object.getUri(), object.getName()));
294 292 
				}
295 293
296 294 
				return sb.toSafeHtml();
......
417 415 
		if (DOM.eventGetType(event) == Event.ONDBLCLICK)
418 416 
			if (getSelectedFiles().size() == 1) {
419 417 
				File file = getSelectedFiles().get(0);
420 
				Window.open(app.getApiPath() + file.getOwner() + file.getUri(), "_blank", "");
418 
				Window.open(app.getApiPath() + file.getOwnerID() + file.getUri(), "_blank", "");
421 419 
				event.preventDefault();
422 420 
				return;
423 421 
			}
......
547 545 
                            if (sortingProperty.equals("version")) {
548 546 
                                    return arg0.getVersion() - arg1.getVersion();
549 547 
                            } else if (sortingProperty.equals("owner")) {
550 
                                    return arg0.getOwner().compareTo(arg1.getOwner());
548 
                                    return arg0.getOwnerID().compareTo(arg1.getOwnerID());
551 549 
                            } else if (sortingProperty.equals("date")) {
552 550 
                            		if (arg0.getLastModified() != null && arg1.getLastModified() != null)
553 551 
                            			return arg0.getLastModified().compareTo(arg1.getLastModified());
......
567 565 
                            return arg1.getVersion() - arg0.getVersion();
568 566 
                    } else if (sortingProperty.equals("owner")) {
569 567
570 
                            return arg1.getOwner().compareTo(arg0.getOwner());
568 
                            return arg1.getOwnerID().compareTo(arg0.getOwnerID());
571 569 
                    } else if (sortingProperty.equals("date")) {
572 570
573 571 
                            return arg1.getLastModified().compareTo(arg0.getLastModified());
......
649 647 
		int i = 0;
650 648 
		boolean scrolled = false;
651 649 
		for (File f : files) {
652 
			if (selectedUrls.contains(app.getApiPath() + f.getOwner() + f.getUri())) {
650 
			if (selectedUrls.contains(app.getApiPath() + f.getOwnerID() + f.getUri())) {
653 651 
				selectionModel.setSelected(f, true);
654 652 
				if (!scrolled) {
655 653 
					celltable.getRowElement(i).getCells().getItem(0).scrollIntoView();

Also available in: Unified diff