diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java index 63c5999d53..7e20f9cadf 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java @@ -116,37 +116,15 @@ public class RollbackTransactionDialog extends TitleAreaDialog protected String formatMessage() { - int newResources = transaction.getNewResources().size(); int newObjects = transaction.getNewObjects().size(); int dirtyObjects = transaction.getDirtyObjects().size(); - int count = (newResources > 0 ? 1 : 0) + (newObjects > 0 ? 1 : 0) + (dirtyObjects > 0 ? 1 : 0); + int count = (newObjects > 0 ? 1 : 0) + (dirtyObjects > 0 ? 1 : 0); StringBuilder builder = new StringBuilder(); builder.append("This transaction contains "); - if (newResources > 0) - { - builder.append(newResources); - builder.append(" new resource"); - if (newResources > 1) - { - builder.append("s"); - } - } if (newObjects > 0) { - if (newResources > 0) - { - if (count > 2) - { - builder.append(", "); - } - else - { - builder.append(" and "); - } - } - builder.append(newObjects); builder.append(" new object"); if (newObjects > 1) @@ -157,7 +135,7 @@ public class RollbackTransactionDialog extends TitleAreaDialog if (dirtyObjects > 0) { - if (count > 1) + if (count > 0) { builder.append(" and "); } |