Task #8070: added file version in grid colum
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@146817 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
0fdfd5da49
commit
f7c3220623
|
@ -1,8 +1,13 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-2"
|
||||||
|
date="2017-04-12">
|
||||||
|
<Change>Task #8070: file versiong shown in workspace grid column </Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-1"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-1"
|
||||||
date="2017-04-11">
|
date="2017-04-11">
|
||||||
<Change>Quick fix to set folder as public</Change>
|
<Change>Quick fix to set folder as public</Change>
|
||||||
<Change>Updated messages to history including version of file if it is present</Change>
|
<Change>Updated messages to history including version of file if it is
|
||||||
|
present</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-0"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-16-0"
|
||||||
date="2017-03-03">
|
date="2017-03-03">
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>workspace-tree-widget</artifactId>
|
<artifactId>workspace-tree-widget</artifactId>
|
||||||
<version>6.16.1-SNAPSHOT</version>
|
<version>6.16.2-SNAPSHOT</version>
|
||||||
<name>gCube Workspace Tree Widget</name>
|
<name>gCube Workspace Tree Widget</name>
|
||||||
<description>
|
<description>
|
||||||
gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace
|
gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace
|
||||||
|
|
|
@ -21,6 +21,7 @@ public class FileGridModel extends FileModel {
|
||||||
public static final String SIZE = "Size";
|
public static final String SIZE = "Size";
|
||||||
public static final String GRIDCOLUMNCREATIONDATE = "Creation Date";
|
public static final String GRIDCOLUMNCREATIONDATE = "Creation Date";
|
||||||
public static final String EMPTY = "EMPTY";
|
public static final String EMPTY = "EMPTY";
|
||||||
|
public static final String VERSION = "Version";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instantiates a new file grid model.
|
* Instantiates a new file grid model.
|
||||||
|
@ -123,6 +124,25 @@ public class FileGridModel extends FileModel {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the version name.
|
||||||
|
*
|
||||||
|
* @param version the new version name
|
||||||
|
*/
|
||||||
|
public void setVersionName(String version){
|
||||||
|
set(FileGridModel.VERSION, version);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the version name.
|
||||||
|
*
|
||||||
|
* @return the version name
|
||||||
|
*/
|
||||||
|
public String getVersionName(){
|
||||||
|
return (String) get(FileGridModel.VERSION);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* (non-Javadoc)
|
* (non-Javadoc)
|
||||||
*
|
*
|
||||||
|
|
|
@ -883,6 +883,15 @@ public class GWTWorkspaceBuilder {
|
||||||
FolderItem folderItem = (FolderItem) item;
|
FolderItem folderItem = (FolderItem) item;
|
||||||
fileGridModel = new FileGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, folderItem.getLength(), false, false);
|
fileGridModel = new FileGridModel(item.getId(), item.getName(), toDate(item.getLastModificationTime()), parentFileModel, folderItem.getLength(), false, false);
|
||||||
fileGridModel = (FileGridModel) setFolderItemType(fileGridModel, folderItem);
|
fileGridModel = (FileGridModel) setFolderItemType(fileGridModel, folderItem);
|
||||||
|
|
||||||
|
//ADDING VERSION NAME
|
||||||
|
// if (folderItem instanceof ExternalFile){
|
||||||
|
//
|
||||||
|
// ExternalFile extFile = (ExternalFile) folderItem;
|
||||||
|
// WorkspaceVersion version = extFile.getCurrentVersion();
|
||||||
|
// fileGridModel.setVersionName(version!=null?version.getName():null);
|
||||||
|
// }
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SHARED_FOLDER:
|
case SHARED_FOLDER:
|
||||||
|
|
Loading…
Reference in New Issue