Revision 4686

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/LocalChangesController.java
559 559
                    && !isSelectionFromEntitiesEmpty
560 560
            );
561 561
            this.btnLocalRevert.setVisible(true);
562
            this.btnLocalCommit.setEnabled(ws != null
562
            if (ws != null
563 563
                    && !context.processing
564 564
                    && changes != null
565 565
                    && !this.changes.isSelectionEmpty()
566 566
                    && CollectionUtils.isNotEmpty(checkedEntities)
567 567
                    && entitiesWithSelectedChanges != null
568 568
                    && !entitiesWithSelectedChanges.isEmpty()
569
                    && !isSelectionFromEntitiesEmpty
570
                    && ws.canCommit(null, getEntityCodes(checkedEntities))
571
            );
569
                    && !isSelectionFromEntitiesEmpty) {
570
                MutableObject<String> msg = new MutableObject<>();
571
                if (ws.canCommit(msg, getEntityCodes(checkedEntities))) {
572
                    this.btnLocalCommit.setEnabled(true);
573
                } else {
574
                    context.message(msg.getValue());
575
                    this.btnLocalCommit.setEnabled(false);
576
                }
577

  
578
            } else {
579
                this.btnLocalCommit.setEnabled(false);
580
            }
572 581
            //Show form
573 582
            boolean enableShowForm = false;
574 583

  

Also available in: Unified diff