Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2014-02-10 06:42:31 +0000
committerEike Stepper2014-02-10 06:42:31 +0000
commitf9e41cf0b51195cb2abe324dda8757aeda9fee86 (patch)
treef4921af3598cf742e3fc4292fd074f8865fd7316 /plugins/org.eclipse.emf.cdo.edit
parent1d2d9606434f810077c14b97016703b166e8dce2 (diff)
downloadcdo-f9e41cf0b51195cb2abe324dda8757aeda9fee86.tar.gz
cdo-f9e41cf0b51195cb2abe324dda8757aeda9fee86.tar.xz
cdo-f9e41cf0b51195cb2abe324dda8757aeda9fee86.zip
Reformat
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.edit')
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/internal/edit/messages/Messages.java2
9 files changed, 34 insertions, 24 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
index bb5176bdcd..ad0c23a12e 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
index db0aea4237..f16cb671e0 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
@@ -36,7 +36,7 @@ import java.util.List;
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder} object. <!--
* begin-user-doc -->
- *
+ *
* @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
* @generated
* @since 2.0
@@ -116,7 +116,7 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
/**
* This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated NOT
*/
@Override
@@ -128,7 +128,7 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
/**
* Returns the parent of the folder. Might be another folder, or the root resource
- *
+ *
* @ADDED
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index a6b5301e8b..6894f8a83c 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -47,7 +47,7 @@ import java.util.List;
* factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
* also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
* begin-user-doc --> @since 2.0 <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory implements ComposeableAdapterFactory,
@@ -80,7 +80,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -131,7 +131,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOResource} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected CDOResourceItemProvider cdoResourceItemProvider;
@@ -156,7 +156,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOBinaryResource} instances.
* <!-- begin-user-doc -->
- *
+ *
* @since 4.1 <!-- end-user-doc -->
* @generated
*/
@@ -182,7 +182,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOTextResource} instances.
* <!-- begin-user-doc -->
- *
+ *
* @since 4.1 <!-- end-user-doc -->
* @generated
*/
@@ -257,7 +257,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -330,20 +330,28 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void dispose()
{
if (cdoResourceFolderItemProvider != null)
+ {
cdoResourceFolderItemProvider.dispose();
+ }
if (cdoResourceItemProvider != null)
+ {
cdoResourceItemProvider.dispose();
+ }
if (cdoBinaryResourceItemProvider != null)
+ {
cdoBinaryResourceItemProvider.dispose();
+ }
if (cdoTextResourceItemProvider != null)
+ {
cdoTextResourceItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
index 98fa5d6773..b40ac0d260 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/package-info.java
@@ -4,14 +4,14 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
/**
* The generated EMF edit support of the CDO repository file system.
- *
+ *
* @apiviz.exclude .*
*/
package org.eclipse.emf.cdo.eresource.provider;
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
index 45c2ed8085..0785c5a696 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.etypes.Annotation} object.
* <!-- begin-user-doc -->
- *
+ *
* @since 4.0 <!-- end-user-doc -->
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index 9683d7d6bd..09a8ed39da 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -47,7 +47,7 @@ import java.util.List;
* factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
* also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
* begin-user-doc -->
- *
+ *
* @since 4.0 <!-- end-user-doc -->
* @generated
*/
@@ -81,7 +81,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -108,7 +108,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.etypes.Annotation} instances. <!--
* begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
protected AnnotationItemProvider annotationItemProvider;
@@ -182,7 +182,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -255,14 +255,16 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void dispose()
{
if (annotationItemProvider != null)
+ {
annotationItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
index d683ad233c..fd1f30017a 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.etypes.ModelElement} object.
* <!-- begin-user-doc
* -->
- *
+ *
* @since 4.0 <!-- end-user-doc -->
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
index 8bbcaa9dc1..9ebd529304 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/package-info.java
@@ -4,14 +4,14 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
/**
* The generated EMF edit support of the CDO system data types and native annotations.
- *
+ *
* @apiviz.exclude .*
*/
package org.eclipse.emf.cdo.etypes.provider;
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/internal/edit/messages/Messages.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/internal/edit/messages/Messages.java
index 628b25e16a..20a5fa8e6c 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/internal/edit/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/internal/edit/messages/Messages.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Victor Roldan Betancort - initial API and implementation
* Eike Stepper - maintenance

Back to the top