Revision 81d44c27

b/src/gr/ebs/gss/client/CellTreeViewUtils.java
56 56
		int count = node.getChildCount();
57 57
		for(int i=0;i<count;i++){
58 58
			if(node.getChildValue(i).equals(resource)){
59
				if(node.getChildValue(i) instanceof RestResourceWrapper && ((RestResourceWrapper)node.getChildValue(i)).getResource().getFolders().size()==0)
60
					return;
59 61
				node.setChildOpen(i, false, true);
60 62
				node.setChildOpen(i, true, true);
61 63
				return;
......
95 97
	private void openNodeContainingResource(TreeNode node, RestResource resource){
96 98
		int count = node.getChildCount();
97 99
		for(int i=0;i<count;i++){
100
			
98 101
				if(node.getChildValue(i).equals(resource)){
99
					//node.setChildOpen(i, false, true);
102
					if(node.getChildValue(i) instanceof RestResourceWrapper && ((RestResourceWrapper)node.getChildValue(i)).getResource().getFolders().size()==0)
103
						return;
100 104
					node.setChildOpen(i, true, true);
101 105
					return;
102 106
				}
......
118 122
	private void openNodeContainingResource(TreeNode node, RestResource resource, RefreshHandler handler){
119 123
		int count = node.getChildCount();
120 124
		for(int i=0;i<count;i++){
125
			if(node.getChildValue(i) instanceof RestResourceWrapper && ((RestResourceWrapper)node.getChildValue(i)).getResource().getFolders().size()==0)
126
				return;
121 127
				if(node.getChildValue(i).equals(resource)){
122 128
					//node.setChildOpen(i, false, true);
123 129
					node.setChildOpen(i, true, true);
......
199 205
				}
200 206
				else if(node.isChildOpen(i)){
201 207
					TreeNode n = node.setChildOpen(i, true);
202
					if(n!=null)
203
						return getNodeContainingResource(n,resource);
208
					if(n!=null){
209
						TreeNode result = getNodeContainingResource2(n,resource);
210
						if(result !=null)
211
							return result;
212
					}
204 213
				}
205 214
			
206 215
		}
......
212 221
			return null;
213 222
		int count = node.getChildCount();
214 223
		for(int i=0;i<count;i++){
215
			
216 224
				if(node.getChildValue(i) instanceof RestResource && ((RestResource)node.getChildValue(i)).getUri().equals(resource)){
217 225
					return node.setChildOpen(i, node.isChildOpen(i));
218 226
				}
219 227
				else if(node.isChildOpen(i)){
220 228
					TreeNode n = node.setChildOpen(i, true);
221
					if(n!=null)
222
						return getNodeContainingResource2(n,resource);
229
					if(n!=null){
230
						TreeNode result = getNodeContainingResource2(n,resource);
231
						if(result !=null)
232
							return result;
233
					}
223 234
				}
224 235
			
225 236
		}
b/src/gr/ebs/gss/client/DnDFolderPopupMenu.java
135 135

  
136 136
                        @Override
137 137
                        public void onComplete() {
138
                        		GSS.get().getTreeView().updateNodeChildren(target.getUri());
138
                        		GSS.get().getTreeView().updateNodeChildren(new RestResourceWrapper(target));
139 139
								GSS.get().getStatusPanel().updateStats();
140 140
                        }
141 141

  
......
170 170
                        @Override
171 171
                        public void onComplete() {
172 172
                        	GWT.log("[MOVE]"+target.getUri()+"   "+ toCopy.getParentURI());
173
                        	GSS.get().getTreeView().updateNodeChildren(target.getUri());
173
                        	GSS.get().getTreeView().updateNodeChildren(new RestResourceWrapper(target));
174 174
							GSS.get().getTreeView().updateNodeChildrenForRemove(toCopy.getParentURI());
175 175
							GSS.get().getStatusPanel().updateStats();
176 176
                        }

Also available in: Unified diff