Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-02-23 06:09:34 +0000
committerEike Stepper2015-02-23 07:30:59 +0000
commit061576bcf891c0d48e1c624118b0d7584f4ff59a (patch)
tree3fee9bd68e7b77562abddcfd1746e66cd7489bcb /plugins
parent9c12b9143fadefb1fe0543d6615a55a5807c0c1a (diff)
downloadcdo-061576bcf891c0d48e1c624118b0d7584f4ff59a.tar.gz
cdo-061576bcf891c0d48e1c624118b0d7584f4ff59a.tar.xz
cdo-061576bcf891c0d48e1c624118b0d7584f4ff59a.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java1025
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java68
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java10
9 files changed, 361 insertions, 799 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
index c3ef0f6812..ca20e57117 100644
--- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true
-Bundle-Version: 4.3.100.qualifier
+Bundle-Version: 4.4.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="4.3.100",
+Export-Package: org.eclipse.emf.cdo.edit;version="4.4.0",
org.eclipse.emf.cdo.eresource.provider;version="4.2.100",
org.eclipse.emf.cdo.etypes.provider;version="4.2.100",
- org.eclipse.emf.cdo.internal.edit.messages;version="4.3.100";x-internal:=true
+ org.eclipse.emf.cdo.internal.edit.messages;version="4.4.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
index 41af2b94d7..7145c16700 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
@@ -15,17 +15,17 @@ import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.internal.edit.messages.Messages;
-import org.eclipse.emf.cdo.util.CDOUtil;
-import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
import org.eclipse.emf.cdo.view.CDOView;
+import org.eclipse.emf.internal.cdo.object.ObjectProperties;
+
+import org.eclipse.net4j.util.properties.Property;
+
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -88,117 +88,149 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
if (itemPropertyDescriptors == null)
{
super.getPropertyDescriptors(object);
- addIDDescriptor(object);
- addVersionDescriptor(object);
- addStateDescriptor(object);
- addViewDescriptor(object);
- addContainerDescriptor(object);
- addDirectResourceDescriptor(object);
- addReadLockedDescriptor(object);
- addWriteLockedDescriptor(object);
- addWriteOptionDescriptor(object);
- addAdaptersDescriptor(object);
- addChangeSubscriptionPoliciesDescriptor(object);
- addURIDescriptor(object);
+
+ if (object instanceof EObject)
+ {
+ EObject eObject = (EObject)object;
+ for (Property<EObject> property : ObjectProperties.INSTANCE.getProperties())
+ {
+ if (property.getLabel() != null)
+ {
+ addCDOPropertyDescriptor(eObject, property);
+ }
+ }
+ }
}
return itemPropertyDescriptors;
}
/**
- * @since 2.0
+ * @since 4.4
*/
+ protected void addCDOPropertyDescriptor(EObject object, Property<EObject> property)
+ {
+ itemPropertyDescriptors.add(new CDOPropertyDescriptor(property));
+ }
+
+ /**
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addIDDescriptor(Object object)
{
- itemPropertyDescriptors.add(new IDDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addVersionDescriptor(Object object)
{
- itemPropertyDescriptors.add(new VersionDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addStateDescriptor(Object object)
{
- itemPropertyDescriptors.add(new StateDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addViewDescriptor(Object object)
{
- itemPropertyDescriptors.add(new ViewDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addContainerDescriptor(Object object)
{
- itemPropertyDescriptors.add(new ContainerDescriptor(adapterFactory));
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addDirectResourceDescriptor(Object object)
{
- itemPropertyDescriptors.add(new DirectResourceDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addReadLockedDescriptor(Object object)
{
- itemPropertyDescriptors.add(new ReadLockedDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addWriteLockedDescriptor(Object object)
{
- itemPropertyDescriptors.add(new WriteLockedDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 4.3
- */
+ * @since 4.3
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addWriteOptionDescriptor(Object object)
{
- itemPropertyDescriptors.add(new WriteOptionDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addAdaptersDescriptor(Object object)
{
- itemPropertyDescriptors.add(new AdaptersDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addChangeSubscriptionPoliciesDescriptor(Object object)
{
- itemPropertyDescriptors.add(new ChangeSubscriptionPoliciesDescriptor());
+ throw new UnsupportedOperationException();
}
/**
- * @since 2.0
- */
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
protected void addURIDescriptor(Object object)
{
- itemPropertyDescriptors.add(new URIDescriptor());
+ throw new UnsupportedOperationException();
}
/**
@@ -208,7 +240,7 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
* @since 2.0
* @author Victor Roldan Betancort
*/
- public static abstract class CDOPropertyDescriptor implements IItemPropertyDescriptor
+ public static class CDOPropertyDescriptor implements IItemPropertyDescriptor, IItemLabelProvider
{
/**
* The filter id for expert properties
@@ -220,24 +252,89 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
*/
public static final String CDO_CATEGORY = Messages.getString("CDOItemProviderAdapter.0"); //$NON-NLS-1$
+ private final Property<EObject> property;
+
+ /**
+ * @deprecated as of 4.4. use {@link #CDOPropertyDescriptor(Property)}.
+ */
+ @Deprecated
public CDOPropertyDescriptor()
{
+ this(null);
}
- public boolean canSetProperty(Object object)
+ /**
+ * @since 4.4
+ */
+ public CDOPropertyDescriptor(Property<EObject> property)
{
- return false;
+ this.property = property;
+ }
+
+ /**
+ * @since 4.4
+ */
+ public final Property<EObject> getProperty()
+ {
+ return property;
+ }
+
+ /**
+ * @since 4.4
+ */
+ public String getId(Object object)
+ {
+ return "___CDO___" + property.getName();
+ }
+
+ /**
+ * @since 4.4
+ */
+ public Object getFeature(Object object)
+ {
+ return getId(object);
+ }
+
+ /**
+ * @since 4.4
+ */
+ public String getDisplayName(Object object)
+ {
+ return property.getLabel();
+ }
+
+ /**
+ * @since 4.4
+ */
+ public String getDescription(Object object)
+ {
+ return property.getDescription();
+ }
+
+ public boolean isPropertySet(Object object)
+ {
+ return true;
+ }
+
+ /**
+ * @since 4.4
+ */
+ public Object getPropertyValue(Object object)
+ {
+ return property.getValue((EObject)object);
}
public void setPropertyValue(Object object, Object value)
{
+ // Do nothing.
}
public void resetPropertyValue(Object object)
{
+ // Do nothing.
}
- public boolean isPropertySet(Object object)
+ public boolean canSetProperty(Object object)
{
return false;
}
@@ -285,14 +382,32 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
public IItemLabelProvider getLabelProvider(Object object)
{
- return new DefaultLabelProvider();
+ return this;
+ }
+
+ /**
+ * @since 4.4
+ */
+ public Object getImage(Object object)
+ {
+ return null;
+ }
+
+ /**
+ * @since 4.4
+ */
+ public String getText(Object object)
+ {
+ return object.toString();
}
/**
* A default implementation of {@link IItemLabelProvider}.
*
* @author Eike Stepper
+ * @deprecated as of 4.4 not used any more.
*/
+ @Deprecated
public static class DefaultLabelProvider implements IItemLabelProvider
{
public DefaultLabelProvider()
@@ -312,779 +427,149 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
}
/**
- * Adds the {@link CDOID} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link CDOID} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class IDDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.1"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.2"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.3"); //$NON-NLS-1$
-
- public IDDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- return CDOUtil.getCDOObject((EObject)object).cdoID();
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
}
/**
- * Adds the version of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the version of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class VersionDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.4"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.5"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.6"); //$NON-NLS-1$
-
- public VersionDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof CDOObject)
- {
- return CDOUtil.getCDOObject((EObject)object).cdoRevision();
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof CDORevision)
- {
- return String.valueOf(((CDORevision)object).getVersion());
- }
-
- return null;
- }
- };
- }
}
/**
- * Adds the {@link CDOState state} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link CDOState state} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class StateDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.7"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.8"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.9"); //$NON-NLS-1$
-
- public StateDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof CDOObject)
- {
- return CDOUtil.getCDOObject((EObject)object).cdoState();
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
}
/**
- * Adds the associate {@link CDOView view} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the associate {@link CDOView view} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class ViewDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.10"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.11"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.12"); //$NON-NLS-1$
-
- public ViewDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- return CDOUtil.getCDOObject((EObject)object).cdoView();
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
}
/**
- * Adds the {@link EObject#eContainer() eContainer} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link EObject#eContainer() eContainer} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class ContainerDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.13"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.14"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.15"); //$NON-NLS-1$
-
- private static AdapterFactory adapterFactory;
-
public ContainerDescriptor(AdapterFactory adapterFactory)
{
- ContainerDescriptor.adapterFactory = adapterFactory;
- }
-
- public Object getPropertyValue(Object object)
- {
- return CDOUtil.getCDOObject((EObject)object).eContainer();
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- // Needs a wrapped delegator to IItemLabelProvider since eContainer might be null for top level CDOObjects
- // and we can't return a null IItemLabelProvider
- return new IItemLabelProvider()
- {
- public Object getImage(Object object)
- {
- if (object != null)
- {
- IItemLabelProvider itemLabelProvider = (IItemLabelProvider)ContainerDescriptor.adapterFactory.adapt(object,
- IItemLabelProvider.class);
- if (itemLabelProvider != null)
- {
- return itemLabelProvider.getImage(object);
- }
- }
-
- return null;
- }
-
- public String getText(Object object)
- {
- if (object != null)
- {
- IItemLabelProvider itemLabelProvider = (IItemLabelProvider)ContainerDescriptor.adapterFactory.adapt(object,
- IItemLabelProvider.class);
- if (itemLabelProvider != null)
- {
- return itemLabelProvider.getText(object);
- }
- }
-
- return null;
- }
- };
}
}
/**
- * Adds the {@link InternalEObject#eDirectResource() direct resource} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link InternalEObject#eDirectResource() direct resource} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class DirectResourceDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.16"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.17"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.18"); //$NON-NLS-1$
-
- public DirectResourceDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof InternalEObject)
- {
- return ((InternalEObject)object).eDirectResource();
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof CDOResource)
- {
- return ((Resource)object).getURI().toString();
- }
-
- return null;
- }
- };
- }
}
/**
- * Adds the {@link CDOLock read lock} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link CDOLock read lock} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class ReadLockedDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.19"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.20"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.21"); //$NON-NLS-1$
-
- public ReadLockedDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- CDOObject cdoObject = CDOUtil.getCDOObject((EObject)object);
- if (cdoObject.cdoView() != null)
- {
- return cdoObject.cdoReadLock();
- }
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof CDOLock)
- {
- return String.valueOf(((CDOLock)object).isLocked());
- }
-
- return null;
- }
- };
- }
}
/**
- * Adds the {@link CDOLock write lock} of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link CDOLock write lock} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class WriteLockedDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.22"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.23"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.24"); //$NON-NLS-1$
-
- public WriteLockedDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- CDOObject cdoObject = CDOUtil.getCDOObject((EObject)object);
- if (cdoObject.cdoView() != null)
- {
- return cdoObject.cdoWriteLock();
- }
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof CDOLock)
- {
- return String.valueOf(((CDOLock)object).isLocked());
- }
-
- return null;
- }
- };
- }
}
/**
- * Adds the {@link CDOLock write option} of a {@link CDOObject} to the Properties view.
- *
- * @since 4.3
- * @author Eike Stepper
- */
+ * Adds the {@link CDOLock write option} of a {@link CDOObject} to the Properties view.
+ *
+ * @author Eike Stepper
+ * @since 4.3
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class WriteOptionDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.34"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.35"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.36"); //$NON-NLS-1$
-
- public WriteOptionDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- CDOObject cdoObject = CDOUtil.getCDOObject((EObject)object);
- if (cdoObject.cdoView() != null)
- {
- return cdoObject.cdoWriteOption();
- }
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof CDOLock)
- {
- return String.valueOf(((CDOLock)object).isLocked());
- }
-
- return null;
- }
- };
- }
}
/**
- * Adds the {@link EObject#eAdapters() eAdapters} list of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the {@link EObject#eAdapters() eAdapters} list of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class AdaptersDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.25"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.26"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.27"); //$NON-NLS-1$
-
- public AdaptersDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- return CDOUtil.getCDOObject((EObject)object).eAdapters();
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
}
/**
- * Adds the change subscription policies list of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the change subscription policies list of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class ChangeSubscriptionPoliciesDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.28"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.29"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.30"); //$NON-NLS-1$
-
- public ChangeSubscriptionPoliciesDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- CDOView cdoView = CDOUtil.getCDOObject((EObject)object).cdoView();
- if (cdoView != null)
- {
- return cdoView.options().getChangeSubscriptionPolicies();
- }
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof CDOAdapterPolicy[])
- {
- StringBuilder builder = new StringBuilder();
- CDOAdapterPolicy[] policies = (CDOAdapterPolicy[])object;
- for (CDOAdapterPolicy policy : policies)
- {
- builder.append(policy.toString());
- builder.append(", "); //$NON-NLS-1$
- }
-
- return builder.toString();
- }
-
- return null;
- }
- };
- }
}
/**
- * Adds the URI of a {@link CDOObject} to the Properties view.
- *
- * @since 2.0
- * @author Victor Roldan Betancort
- */
+ * Adds the URI of a {@link CDOObject} to the Properties view.
+ *
+ * @author Victor Roldan Betancort
+ * @since 2.0
+ * @deprecated as of 4.4 not used any more.
+ */
+ @Deprecated
public static class URIDescriptor extends CDOPropertyDescriptor
{
- private static final String FEATURE_ID = Messages.getString("CDOItemProviderAdapter.31"); //$NON-NLS-1$
-
- private static final String DISPLAY_NAME = Messages.getString("CDOItemProviderAdapter.32"); //$NON-NLS-1$
-
- private static final String DESCRIPTION = Messages.getString("CDOItemProviderAdapter.33"); //$NON-NLS-1$
-
- public URIDescriptor()
- {
- }
-
- public Object getPropertyValue(Object object)
- {
- if (object instanceof EObject)
- {
- CDOObject cdoObject = CDOUtil.getCDOObject((EObject)object);
- Resource resource = cdoObject.eResource();
- if (resource != null)
- {
- CDOID id = cdoObject.cdoID();
- String fragment = id != null ? id.toURIFragment() : resource.getURIFragment(cdoObject);
- return resource.getURI().appendFragment(fragment).toString();
- }
- }
-
- return null;
- }
-
- public String getDescription(Object object)
- {
- return DESCRIPTION;
- }
-
- public String getDisplayName(Object object)
- {
- return DISPLAY_NAME;
- }
-
- public Object getFeature(Object object)
- {
- return FEATURE_ID;
- }
-
- public String getId(Object object)
- {
- return FEATURE_ID;
- }
-
- @Override
- public IItemLabelProvider getLabelProvider(Object object)
- {
- return new DefaultLabelProvider()
- {
- @Override
- public String getText(Object object)
- {
- if (object instanceof String)
- {
- return (String)object;
- }
-
- return null;
- }
- };
- }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java
index a7d5ae581f..42e862e0b8 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java
@@ -29,7 +29,9 @@ import org.eclipse.core.runtime.IAdapterFactory;
@SuppressWarnings("rawtypes")
public class CDOExplorerAdapterFactory implements IAdapterFactory
{
- private static final Class[] CLASSES = { CDORepositoryElement.class };
+ private static final Class<CDORepositoryElement> CLASS_CDOREPOSITORYELEMENT = CDORepositoryElement.class;
+
+ private static final Class[] CLASSES = { CLASS_CDOREPOSITORYELEMENT };
public CDOExplorerAdapterFactory()
{
@@ -42,7 +44,7 @@ public class CDOExplorerAdapterFactory implements IAdapterFactory
public Object getAdapter(Object adaptableObject, Class adapterType)
{
- if (adapterType == CLASSES[0])
+ if (adapterType == CLASS_CDOREPOSITORYELEMENT)
{
if (adaptableObject instanceof CDOBranch)
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
index 81c5a8bd9d..1215c997de 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
@@ -75,7 +75,7 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
{
private InternalRepository repository;
- private Map<String, InternalView> openViews = new HashMap<String, InternalView>();
+ private Map<String, InternalView> openDurableViews = new HashMap<String, InternalView>();
private Map<String, DurableView> durableViews = new HashMap<String, DurableView>();
@@ -97,13 +97,13 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
String durableLockingID = view.getDurableLockingID();
if (durableLockingID == null)
{
- unlock(view);
+ repository.unlock((InternalView)view, null, null, false);
}
else
{
DurableView durableView = new DurableView(durableLockingID);
changeContext(view, durableView);
- unregisterOpenView(durableLockingID);
+ unregisterOpenDurableView(durableLockingID);
durableViews.put(durableLockingID, durableView);
}
}
@@ -368,9 +368,9 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
Map<CDOID, LockGrade> locks = getLocks(view);
LockArea area = createLockArea(userID, branchPoint, readOnly, locks, lockAreaID);
- synchronized (openViews)
+ synchronized (openDurableViews)
{
- openViews.put(area.getDurableLockingID(), view);
+ openDurableViews.put(area.getDurableLockingID(), view);
}
return area;
@@ -397,14 +397,14 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
{
DurableLocking accessor = getDurableLocking();
accessor.deleteLockArea(durableLockingID);
- unregisterOpenView(durableLockingID);
+ unregisterOpenDurableView(durableLockingID);
}
public IView openView(ISession session, int viewID, boolean readOnly, final String durableLockingID)
{
- synchronized (openViews)
+ synchronized (openDurableViews)
{
- InternalView view = openViews.get(durableLockingID);
+ InternalView view = openDurableViews.get(durableLockingID);
if (view != null)
{
throw new IllegalStateException("Durable view is already open: " + view);
@@ -445,14 +445,14 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
@Override
protected void onDeactivated(ILifecycle lifecycle)
{
- synchronized (openViews)
+ synchronized (openDurableViews)
{
- openViews.remove(durableLockingID);
+ openDurableViews.remove(durableLockingID);
}
}
});
- openViews.put(durableLockingID, view);
+ openDurableViews.put(durableLockingID, view);
return view;
}
}
@@ -526,11 +526,11 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
}
}
- private void unregisterOpenView(String durableLockingID)
+ private void unregisterOpenDurableView(String durableLockingID)
{
- synchronized (openViews)
+ synchronized (openDurableViews)
{
- InternalView view = openViews.remove(durableLockingID);
+ InternalView view = openDurableViews.remove(durableLockingID);
if (view != null)
{
view.setDurableLockingID(null);
@@ -737,7 +737,7 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
private IView getView(String lockAreaID)
{
- IView view = openViews.get(lockAreaID);
+ IView view = openDurableViews.get(lockAreaID);
if (view == null)
{
view = durableViews.get(lockAreaID);
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java
index ccf375fc6e..aa286491f7 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java
@@ -19,7 +19,9 @@ import org.eclipse.team.ui.history.IHistoryPageSource;
@SuppressWarnings("rawtypes")
public class CDOHistoryAdapterFactory implements IAdapterFactory
{
- private static final Class[] ADAPTER_TYPES = { IHistoryPageSource.class };
+ private static final Class<IHistoryPageSource> CLASS_IHISTORYPAGESOURCE = IHistoryPageSource.class;
+
+ private static final Class[] ADAPTER_TYPES = { CLASS_IHISTORYPAGESOURCE };
public CDOHistoryAdapterFactory()
{
@@ -32,7 +34,7 @@ public class CDOHistoryAdapterFactory implements IAdapterFactory
public Object getAdapter(Object adaptableObject, Class adapterType)
{
- if (adapterType == IHistoryPageSource.class)
+ if (adapterType == CLASS_IHISTORYPAGESOURCE)
{
return CDOHistoryPageSource.INSTANCE;
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
index a6f2b92535..9d95a040df 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
@@ -81,13 +81,13 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
{
EObject eObject = (EObject)object;
- final Map<String, Object> propertyValues = new HashMap<String, Object>();
+ final Map<String, Object> emfProperties = new HashMap<String, Object>();
DefaultPropertySource<EObject> result = new DefaultPropertySource<EObject>(eObject, ObjectProperties.INSTANCE)
{
@Override
public Object getPropertyValue(Object id)
{
- Object value = propertyValues.get(id);
+ Object value = emfProperties.get(id);
if (value != null)
{
return value;
@@ -128,7 +128,7 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
PropertyDescriptor descriptor = result.addDescriptor(category, id, displayName, description);
Object value = propertyDescriptor.getPropertyValue(eObject);
- propertyValues.put(id, value);
+ emfProperties.put(id, value);
final String text = labelProvider.getText(value);
descriptor.setLabelProvider(new LabelProvider()
diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 2c98dc1c7c..357c90d91f 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -40,7 +40,8 @@ Export-Package: org.eclipse.emf.cdo;version="4.4.0",
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.explorer,
- org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.explorer.ui,
+ org.eclipse.emf.cdo.edit",
org.eclipse.emf.internal.cdo.query;version="4.4.0";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
index f7e875096f..60ff526f9c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
@@ -13,7 +13,9 @@ package org.eclipse.emf.internal.cdo.object;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
+import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.lock.CDOLockState;
+import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.common.security.CDOPermission;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.view.CDOView;
@@ -55,6 +57,50 @@ public class ObjectProperties extends Properties<EObject>
}
});
+ add(new Property<EObject>("version", //$NON-NLS-1$
+ "Version", "The version of this object.", CATEGORY_CDO)
+ {
+ @Override
+ protected Object eval(EObject object)
+ {
+ CDOObject cdoObject = CDOUtil.getCDOObject(object);
+ if (cdoObject == null)
+ {
+ return 0;
+ }
+
+ CDORevision revision = cdoObject.cdoRevision();
+ if (revision == null)
+ {
+ return 0;
+ }
+
+ return revision.getVersion();
+ }
+ });
+
+ add(new Property<EObject>("branch", //$NON-NLS-1$
+ "Branch", "The branch of this object.", CATEGORY_CDO)
+ {
+ @Override
+ protected Object eval(EObject object)
+ {
+ CDOObject cdoObject = CDOUtil.getCDOObject(object);
+ if (cdoObject == null)
+ {
+ return null;
+ }
+
+ CDORevision revision = cdoObject.cdoRevision();
+ if (revision == null)
+ {
+ return null;
+ }
+
+ return revision.getBranch().getPathName();
+ }
+ });
+
add(new Property<EObject>("state", //$NON-NLS-1$
"State", "The current state of this object.", CATEGORY_CDO)
{
@@ -299,6 +345,28 @@ public class ObjectProperties extends Properties<EObject>
}
});
+ add(new Property<EObject>("uri", "URI", "The URI of this object.", CATEGORY_CDO) //$NON-NLS-1$
+ {
+ @Override
+ protected Object eval(EObject object)
+ {
+ CDOObject cdoObject = CDOUtil.getCDOObject(object);
+ if (cdoObject == null)
+ {
+ return null;
+ }
+
+ Resource resource = cdoObject.eResource();
+ if (resource == null)
+ {
+ return null;
+ }
+
+ CDOID id = cdoObject.cdoID();
+ String fragment = id != null ? id.toURIFragment() : resource.getURIFragment(cdoObject);
+ return resource.getURI().appendFragment(fragment).toString();
+ }
+ });
}
public static void main(String[] args)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java
index 109c090c43..7132d44b5f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java
@@ -22,7 +22,11 @@ import org.eclipse.ui.views.properties.IPropertySourceProvider;
@SuppressWarnings("rawtypes")
public abstract class AbstractPropertyAdapterFactory implements IAdapterFactory
{
- private static final Class[] CLASSES = { IPropertySourceProvider.class, IActionFilter.class };
+ private static final Class<IPropertySourceProvider> CLASS_IPROPERTYSOURCEPROVIDER = IPropertySourceProvider.class;
+
+ private static final Class<IActionFilter> CLASS_IACTIONFILTER = IActionFilter.class;
+
+ private static final Class[] CLASSES = { CLASS_IPROPERTYSOURCEPROVIDER, CLASS_IACTIONFILTER };
public AbstractPropertyAdapterFactory()
{
@@ -35,7 +39,7 @@ public abstract class AbstractPropertyAdapterFactory implements IAdapterFactory
public Object getAdapter(Object adaptableObject, Class adapterType)
{
- if (adapterType == CLASSES[0])
+ if (adapterType == CLASS_IPROPERTYSOURCEPROVIDER)
{
final IPropertySource propertySource = createPropertySource(adaptableObject);
if (propertySource != null)
@@ -50,7 +54,7 @@ public abstract class AbstractPropertyAdapterFactory implements IAdapterFactory
}
}
- if (adapterType == CLASSES[1])
+ if (adapterType == CLASS_IACTIONFILTER)
{
return createActionFilter(adaptableObject);
}

Back to the top