[Aplaws-commit] r775 - in ccm-cms/trunk/src/com/arsdigita/cms/ui: . revision

[<fa...@vh...>]

Author: fabrice
Date: 2005-09-12 16:55:15 +0200 (Mon, 12 Sep 2005)
New Revision: 775

Modified:
   ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties
   ccm-cms/trunk/src/com/arsdigita/cms/ui/revision/DifferencePane.java
Log:
Fix direction of diffs



Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties	2005-09-12 14:54:39 UTC (rev 774)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties	2005-09-12 14:55:15 UTC (rev 775)
@@ -408,7 +408,7 @@
 cms.ui.item.lifecycles=Publishing
 cms.ui.item.preview=Preview
 cms.ui.item.reapply_a_lifecycle=Re-apply a Lifecycle 
-cms.ui.item.revision.added=Added
+cms.ui.item.revision.added=Added To
 cms.ui.item.revision.current=Current revision
 cms.ui.item.revision.difference.show=Show difference
 cms.ui.item.revision.first=Initial revision
@@ -425,7 +425,7 @@
 cms.ui.item.revision.operation.value=Value
 cms.ui.item.revision.operation=Operation
 cms.ui.item.revision.operations=Operations
-cms.ui.item.revision.removed=Removed
+cms.ui.item.revision.removed=Removed From
 cms.ui.item.revision.return=Return to revisions
 cms.ui.item.revision.rollback=Rollback
 cms.ui.item.revision.rolled_back=Rolled back

Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/revision/DifferencePane.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/revision/DifferencePane.java	2005-09-12 14:54:39 UTC (rev 774)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/revision/DifferencePane.java	2005-09-12 14:55:15 UTC (rev 775)
@@ -117,8 +117,8 @@
                 final GridPanel result = new GridPanel(1);
 
                 if (((Boolean) change[0]).booleanValue()) {
-                    final String adds = (String) change[3];
-                    final String removes = (String) change[4];
+                    final String adds = (String) change[4];
+                    final String removes = (String) change[3];
 
                     if (!adds.equals("")) {
                         final Label addedLabel = new Label
@@ -155,6 +155,7 @@
     private class ModelBuilder extends AbstractTableModelBuilder {
         public final TableModel makeModel(final Table table,
                                           final PageState state) {
+
             final Difference diff = Versions.diff
                 (m_item.getContentItem(state).getOID(),
                  m_from.getTransaction(state),