private boolean featureTypesMatch() { // if the feature types are different we report a conflict and do not // try to perform automerge RevFeatureType oursft = mergeIntoDiff.getNewFeatureType(); RevFeatureType theirsft = toMergeDiff.getNewFeatureType(); return oursft.equals(theirsft); }
private boolean featureTypesMatch() { // if the feature types are different we report a conflict and do not // try to perform automerge RevFeatureType oursft = mergeIntoDiff.getNewFeatureType(); RevFeatureType theirsft = toMergeDiff.getNewFeatureType(); return oursft.equals(theirsft); }
/** * Adds an element to the list of modified ones * * @param diff */ public void addModifiedFeature(FeatureDiff diff) { modifiedFeatures.add(diff); addFeatureType(diff.getNewFeatureType()); addFeatureType(diff.getOldFeatureType()); }
/** * Adds an element to the list of modified ones * * @param diff */ public void addModifiedFeature(FeatureDiff diff) { modifiedFeatures.add(diff); addFeatureType(diff.getNewFeatureType()); addFeatureType(diff.getOldFeatureType()); }
static RevFeature merge(FeatureDiff mergeIntoDiff, FeatureDiff toMergeDiff) { if (!mergeIntoDiff.getNewFeatureType().equals(toMergeDiff.getNewFeatureType())) { throw new IllegalArgumentException( String.format("Non-matching feature types. Cannot merge. Left: %s, right: %s", mergeIntoDiff.getNewFeatureType().getId(), toMergeDiff.getNewFeatureType().getId())); RevFeatureType featureType = mergeIntoDiff.getNewFeatureType();
static RevFeature merge(FeatureDiff mergeIntoDiff, FeatureDiff toMergeDiff) { if (!mergeIntoDiff.getNewFeatureType().equals(toMergeDiff.getNewFeatureType())) { throw new IllegalArgumentException( String.format("Non-matching feature types. Cannot merge. Left: %s, right: %s", mergeIntoDiff.getNewFeatureType().getId(), toMergeDiff.getNewFeatureType().getId())); RevFeatureType featureType = mergeIntoDiff.getNewFeatureType();
+ "\t" + diff.getNewFeatureType().getId().toString() + "\n"); sb.append(diff.asText() + "\n");
+ "\t" + diff.getNewFeatureType().getId().toString() + "\n"); sb.append(diff.asText() + "\n");