/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision adacf42f

Fix NPE for editing newly added feature nodes

                 MessagingUtils.warningDialog(Messages.FeatureNodeDropAdapter_INVALID_TARGET, this, Messages.FeatureNodeDropAdapter_INVALID_TARGET_MESSAGE);
                 return false;
+            }
     		Collection<Object> droppedObjects = Collections.emptyList();
     		if(data instanceof Object[]){
     		    droppedObjects = Arrays.asList((Object[])data);
-...
     		// cannot drop a feature node onto itself
     		for (Object droppedObject : droppedObjects) {
     		    if(droppedObject==null){
     		        MessagingUtils.warningDialog("Move failed", this.getClass(),
     		                "Moving the feature node failed. Try saving before.");
     		        return false;
+    		    }
     			if (droppedObject.equals(target)) {
     				return false;
+    			}

             operations.forEach(operation->AbstractUtility.executeOperation(operation, sync));
             operations.clear();
     //        List<FeatureTree> trees = (List<FeatureTree>) viewer.getInput();
     //        CdmStore.getService(IFeatureTreeService.class).merge(trees);
             /*
              * reload feature trees is needed to update i.e.
              * temporarily created feature nodes by adding features.
              * This is related to the current saving strategy which
              * emulates all changes on the visible feature tree but
              * the actual change is done when saving via executeOperation()
              */
             Object[] expandedElements = viewer.getExpandedElements();
             viewer.getTree().removeAll();
             List<FeatureTree> trees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
             viewer.setInput(trees);
             viewer.setExpandedElements(expandedElements);
             this.setDirty(false);
+    	}

Also available in: Unified diff