diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ConflictItemProvider.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ConflictItemProvider.java | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ConflictItemProvider.java b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ConflictItemProvider.java index 846a4ae47..07b62a0ff 100644 --- a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ConflictItemProvider.java +++ b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ConflictItemProvider.java @@ -20,6 +20,8 @@ import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.compare.ComparePackage;
+import org.eclipse.emf.compare.Conflict;
+import org.eclipse.emf.compare.ConflictKind;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,7 +29,9 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
/**
* This is the item provider adapter for a {@link org.eclipse.emf.compare.Conflict} object.
@@ -66,12 +70,31 @@ public class ConflictItemProvider extends ItemProviderAdapter implements IEditin if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addKindPropertyDescriptor(object);
addDifferencesPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
+ * This adds a property descriptor for the Kind feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addKindPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_Conflict_kind_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_Conflict_kind_feature", "_UI_Conflict_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ ComparePackage.Literals.CONFLICT__KIND, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ }
+
+ /**
* This adds a property descriptor for the Differences feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -107,7 +130,10 @@ public class ConflictItemProvider extends ItemProviderAdapter implements IEditin */
@Override
public String getText(Object object) {
- return getString("_UI_Conflict_type"); //$NON-NLS-1$
+ ConflictKind labelValue = ((Conflict)object).getKind();
+ String label = labelValue == null ? null : labelValue.toString();
+ return label == null || label.length() == 0 ? getString("_UI_Conflict_type") : //$NON-NLS-1$
+ getString("_UI_Conflict_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -120,6 +146,13 @@ public class ConflictItemProvider extends ItemProviderAdapter implements IEditin @Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
+
+ switch (notification.getFeatureID(Conflict.class)) {
+ case ComparePackage.CONFLICT__KIND:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
+ true));
+ return;
+ }
super.notifyChanged(notification);
}
|