.iterator(); iterator.hasNext();) { Entry<PropertyDescriptor, AttributeDiff> entry = iterator.next(); if (entry.getValue().getType() == TYPE.REMOVED) { removed.add(entry.getKey().getName().getLocalPart()); } else if (entry.getValue().getType() == TYPE.ADDED) { PropertyDescriptor pd = entry.getKey(); added.add((AttributeDescriptor) pd);
@Override public boolean conflicts(AttributeDiff ad) { if (!(ad instanceof GeometryAttributeDiff)) { return true; } final GeometryAttributeDiff gad = (GeometryAttributeDiff) ad; final TYPE myType = getType(); final TYPE otherType = ad.getType(); // if either side of the diff is a no change, then there's no conflict, regardless of the // type of the other side if (NO_CHANGE == myType || NO_CHANGE == otherType) { return false; } if (REMOVED == myType && REMOVED == otherType) { return false; } if (MODIFIED == myType && MODIFIED == otherType) { if (gad.diff.equals(diff)) { return false; } else { return true; } } if (ADDED == myType && ADDED == otherType) { return !gad.newGeometry.equalsExact(newGeometry); } return true; }
@Override public boolean conflicts(AttributeDiff ad) { if (!(ad instanceof GeometryAttributeDiff)) { return true; } final GeometryAttributeDiff gad = (GeometryAttributeDiff) ad; final TYPE myType = getType(); final TYPE otherType = ad.getType(); // if either side of the diff is a no change, then there's no conflict, regardless of the // type of the other side if (NO_CHANGE == myType || NO_CHANGE == otherType) { return false; } if (REMOVED == myType && REMOVED == otherType) { return false; } if (MODIFIED == myType && MODIFIED == otherType) { if (gad.diff.equals(diff)) { return false; } else { return true; } } if (ADDED == myType && ADDED == otherType) { return !gad.newGeometry.equalsExact(newGeometry); } return true; }
.iterator(); iterator.hasNext();) { Entry<PropertyDescriptor, AttributeDiff> entry = iterator.next(); if (entry.getValue().getType() == TYPE.REMOVED) { removed.add(entry.getKey().getName().getLocalPart()); } else if (entry.getValue().getType() == TYPE.ADDED) { PropertyDescriptor pd = entry.getKey(); added.add((AttributeDescriptor) pd);
writeElement("changetype", entry.getValue().getType().toString()); if (entry.getValue().getOldValue() != null) { writeElement("oldvalue", entry.getValue().getOldValue().toString()); && !entry.getValue().getType().equals(TYPE.NO_CHANGE)) { writeElement("newvalue", entry.getValue().getNewValue().toString());
if (diffs.containsKey(descriptor)) { AttributeDiff ad = diffs.get(descriptor); sb.append(ad.getType().toString().charAt(0) + " " + descriptor.getName().toString() + LINE_BREAK); if (!ad.getType().equals(TYPE.ADDED)) { Object value = ad.getOldValue(); sb.append(TextValueSerializer.asString(value)); sb.append(LINE_BREAK); if (!ad.getType().equals(TYPE.REMOVED)) { Object value = ad.getNewValue(); sb.append(TextValueSerializer.asString(value)); sb.append(ad.getType().toString().charAt(0) + " " + descriptor.getName().toString() + LINE_BREAK); if (!ad.getType().equals(TYPE.ADDED)) { Object value = ad.getOldValue(); sb.append(TextValueSerializer.asString(value)); sb.append(LINE_BREAK); if (!ad.getType().equals(TYPE.REMOVED)) { Object value = ad.getNewValue(); sb.append(TextValueSerializer.asString(value));
AttributeDiff ad = entry.getValue(); if (ad instanceof GeometryAttributeDiff && ad.getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.MODIFIED && !noGeom) { GeometryAttributeDiff gd = (GeometryAttributeDiff) ad; } else { ansi.fg(ad .getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.ADDED ? GREEN : (ad.getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.REMOVED ? RED : YELLOW)); ansi.a(pd.getName()).a(": ").a(ad.toString());
AttributeDiff ad = entry.getValue(); if (ad instanceof GeometryAttributeDiff && ad.getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.MODIFIED && !noGeom) { GeometryAttributeDiff gd = (GeometryAttributeDiff) ad; } else { ansi.fg(ad .getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.ADDED ? GREEN : (ad.getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.REMOVED ? RED : YELLOW)); ansi.a(pd.getName()).a(": ").a(ad.toString());
AttributeDiff ad = entry.getValue(); if (ad instanceof GeometryAttributeDiff && ad.getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.MODIFIED && !noGeom) { GeometryAttributeDiff gd = (GeometryAttributeDiff) ad; } else { ansi.fg(ad .getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.ADDED ? GREEN : (ad.getType() == org.locationtech.geogig.plumbing.diff.AttributeDiff.TYPE.REMOVED ? RED : YELLOW)); ansi.a(pd.getName()).a(": ").a(ad.toString());
.iterator(); iterator.hasNext();) { Entry<PropertyDescriptor, AttributeDiff> entry = iterator.next(); if (!entry.getValue().getType().equals(TYPE.REMOVED)) { Object oldValue = attrs.get(entry.getKey().getName()); attrs.put(entry.getKey().getName(), entry.getValue().applyOn(oldValue));
.iterator(); iterator.hasNext();) { Entry<PropertyDescriptor, AttributeDiff> entry = iterator.next(); if (!entry.getValue().getType().equals(TYPE.REMOVED)) { Object oldValue = attrs.get(entry.getKey().getName()); attrs.put(entry.getKey().getName(), entry.getValue().applyOn(oldValue));
@Test public void testAttributeDiffRemoved() { Integer oldValue = 1; Integer newValue = null; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.REMOVED, diff.getType()); assertEquals(oldValue, diff.getOldValue()); assertNull(diff.getNewValue()); }
@Test public void testAttributeDiffModified() { Integer oldValue = 1; Integer newValue = 2; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.MODIFIED, diff.getType()); assertEquals(oldValue, diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); }
@Test public void testAttributeDiffRemoved() { Integer oldValue = 1; Integer newValue = null; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.REMOVED, diff.getType()); assertEquals(oldValue, diff.getOldValue()); assertNull(diff.getNewValue()); }
@Test public void testAttributeDiffModified() { Integer oldValue = 1; Integer newValue = 2; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.MODIFIED, diff.getType()); assertEquals(oldValue, diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); }
@Test public void testAttributeDiffAdded() { Integer oldValue = null; Integer newValue = 1; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.ADDED, diff.getType()); assertNull(diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); oldValue = null; diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.ADDED, diff.getType()); assertNull(diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); }
@Test public void testAttributeDiffAdded() { Integer oldValue = null; Integer newValue = 1; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.ADDED, diff.getType()); assertNull(diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); oldValue = null; diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.ADDED, diff.getType()); assertNull(diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); }
AttributeDiff attrDiff = entry.getValue(); PropertyDescriptor descriptor = entry.getKey(); switch (attrDiff.getType()) { case ADDED: if (descriptors.contains(descriptor)) {
@Test public void testAttributeDiffNoChange() { Integer oldValue = 1; Integer newValue = 1; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.NO_CHANGE, diff.getType()); assertEquals(oldValue, diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); oldValue = null; newValue = null; diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.NO_CHANGE, diff.getType()); assertNull(diff.getOldValue()); assertNull(diff.getNewValue()); oldValue = null; newValue = null; diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.NO_CHANGE, diff.getType()); assertNull(diff.getOldValue()); assertNull(diff.getNewValue()); } }
@Test public void testAttributeDiffNoChange() { Integer oldValue = 1; Integer newValue = 1; AttributeDiff diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.NO_CHANGE, diff.getType()); assertEquals(oldValue, diff.getOldValue()); assertEquals(newValue, diff.getNewValue()); oldValue = null; newValue = null; diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.NO_CHANGE, diff.getType()); assertNull(diff.getOldValue()); assertNull(diff.getNewValue()); oldValue = null; newValue = null; diff = new GenericAttributeDiffImpl(oldValue, newValue); assertEquals(AttributeDiff.TYPE.NO_CHANGE, diff.getType()); assertNull(diff.getOldValue()); assertNull(diff.getNewValue()); } }