Revision 555e8e59 gss/src/gr/ebs/gss/client/dnd/DnDFolderPopupMenu.java

b/gss/src/gr/ebs/gss/client/dnd/DnDFolderPopupMenu.java
70 70

  
71 71
				public void execute() {
72 72
					if (toCopy instanceof FolderResource){
73
						List<TreeItem> treeItems = folders.getItemsOfTreeForPath(((RestResource) toCopy).getPath());
73
						List<TreeItem> treeItems = folders.getItemsOfTreeForPath(((RestResource) toCopy).getUri());
74 74
						List<TreeItem> parents = new ArrayList();
75 75
						for(TreeItem item : treeItems)
76 76
							if(item.getParentItem() != null)
......
100 100

  
101 101
			public void execute() {
102 102
				if (toCopy instanceof FolderResource){
103
					final List<TreeItem> treeItems = folders.getItemsOfTreeForPath(((RestResource) toCopy).getPath());
103
					final List<TreeItem> treeItems = folders.getItemsOfTreeForPath(((RestResource) toCopy).getUri());
104 104
					List<TreeItem> parents = new ArrayList();
105 105
					for(TreeItem item : treeItems)
106 106
						if(item.getParentItem() != null)
......
120 120
	}
121 121

  
122 122
	private void copyFolder(final FolderResource target, FolderResource toCopy) {
123
		String atarget = target.getPath();
123
		String atarget = target.getUri();
124 124
		atarget = atarget.endsWith("/") ? atarget : atarget + '/';
125 125
		atarget = atarget + toCopy.getName();
126
		ExecutePost cf = new ExecutePost(toCopy.getPath() + "?copy=" + atarget, "", 200) {
126
		ExecutePost cf = new ExecutePost(toCopy.getUri() + "?copy=" + atarget, "", 200) {
127 127

  
128 128
			public void onComplete() {
129 129
				final TreeItem folder;
......
156 156
	}
157 157

  
158 158
	private void moveFolder(final FolderResource target, final FolderResource toCopy, final List<TreeItem> items) {
159
		String atarget = target.getPath();
159
		String atarget = target.getUri();
160 160
		atarget = atarget.endsWith("/") ? atarget : atarget + '/';
161 161
		atarget = atarget + toCopy.getName();
162 162

  
163
		ExecutePost cf = new ExecutePost(toCopy.getPath() + "?move=" + atarget, "", 200) {
163
		ExecutePost cf = new ExecutePost(toCopy.getUri() + "?move=" + atarget, "", 200) {
164 164

  
165 165
			public void onComplete() {
166 166
				final TreeItem folder;
......
203 203

  
204 204
	private void copyFiles(final FolderResource ftarget, List<FileResource> files) {
205 205
		List<String> fileIds = new ArrayList<String>();
206
		String target = ftarget.getPath();
206
		String target = ftarget.getUri();
207 207
		target = target.endsWith("/") ? target : target + '/';
208 208
		for (FileResource fileResource : files) {
209 209
			String fileTarget = target + fileResource.getName();
210
			fileIds.add(fileResource.getPath() + "?copy=" + fileTarget);
210
			fileIds.add(fileResource.getUri() + "?copy=" + fileTarget);
211 211
		}
212 212
		int index = 0;
213 213
		executeCopyOrMoveFiles(index, fileIds);
......
216 216

  
217 217
	private void moveFiles(final FolderResource ftarget, List<FileResource> files) {
218 218
		List<String> fileIds = new ArrayList<String>();
219
		String target = ftarget.getPath();
219
		String target = ftarget.getUri();
220 220
		target = target.endsWith("/") ? target : target + '/';
221 221
		for (FileResource fileResource : files) {
222 222
			String fileTarget = target + fileResource.getName();
223
			fileIds.add(fileResource.getPath() + "?move=" + fileTarget);
223
			fileIds.add(fileResource.getUri() + "?move=" + fileTarget);
224 224
		}
225 225
		int index = 0;
226 226
		executeCopyOrMoveFiles(index, fileIds);
......
228 228
	}
229 229

  
230 230
	private void trashFolder(final FolderResource folder, final List<TreeItem> items){
231
		ExecutePost tot = new ExecutePost(folder.getPath()+"?trash=","",200){
231
		ExecutePost tot = new ExecutePost(folder.getUri()+"?trash=","",200){
232 232

  
233 233
			public void onComplete() {
234 234
				for(TreeItem item : items)
......
258 258
	private void trashFiles(List<FileResource> files){
259 259
		final List<String> fileIds = new ArrayList<String>();
260 260
		for(FileResource f : files)
261
			fileIds.add(f.getPath()+"?trash=");
261
			fileIds.add(f.getUri()+"?trash=");
262 262
		ExecuteMultiplePost tot = new ExecuteMultiplePost(fileIds.toArray(new String[0]),200){
263 263

  
264 264
			public void onComplete() {

Also available in: Unified diff