diff options
24 files changed, 31 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicCompartmentImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicCompartmentImpl.java index 38c240cc61..b542465d9a 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicCompartmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicCompartmentImpl.java @@ -300,6 +300,7 @@ public class BasicCompartmentImpl extends DecorationNodeImpl implements BasicCom * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") public boolean eIsSetGen(int featureID) { switch (featureID) diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java index 95b46eab92..530734ff0c 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java @@ -292,6 +292,7 @@ public class BasicDecorationNodeImpl extends org.eclipse.emf.cdo.ecore.impl.EMod eDynamicUnset(featureID); } + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicSemanticCompartmentImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicSemanticCompartmentImpl.java index 9e099076b9..60c993c521 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicSemanticCompartmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicSemanticCompartmentImpl.java @@ -313,6 +313,7 @@ public class BasicSemanticCompartmentImpl extends BasicDecorationNodeImpl implem * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") public boolean eIsSetGen(int featureID) { switch (featureID) diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/CompartmentImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/CompartmentImpl.java index 53628cfb57..e75b750b3c 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/CompartmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/CompartmentImpl.java @@ -349,6 +349,7 @@ public class CompartmentImpl extends BasicCompartmentImpl implements Compartment * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSetGen(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ConnectorImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ConnectorImpl.java index 232c0b42ca..f53d9d5104 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ConnectorImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ConnectorImpl.java @@ -652,6 +652,7 @@ public class ConnectorImpl extends EdgeImpl implements Connector * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DecorationNodeImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DecorationNodeImpl.java index 743f46113a..d7386d5795 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DecorationNodeImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DecorationNodeImpl.java @@ -195,6 +195,7 @@ public class DecorationNodeImpl extends BasicDecorationNodeImpl implements Decor eDynamicUnset(featureID); } + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DescriptionStyleImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DescriptionStyleImpl.java index 67d92b5b56..f87cc938c8 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DescriptionStyleImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DescriptionStyleImpl.java @@ -153,6 +153,7 @@ public class DescriptionStyleImpl extends CDOObjectImpl implements DescriptionSt * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramImpl.java index a2c4d1ece5..fc2b4cb06b 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramImpl.java @@ -411,6 +411,7 @@ public class DiagramImpl extends ViewImpl implements Diagram * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { @@ -517,7 +518,7 @@ public class DiagramImpl extends ViewImpl implements Diagram /** * Persist the view passed in and all its parent views if they are * transient. - * + * * @param view * the view to persist */ diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramStyleImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramStyleImpl.java index 47eae5137c..9e7b3098ed 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramStyleImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/DiagramStyleImpl.java @@ -239,6 +239,7 @@ public class DiagramStyleImpl extends PageStyleImpl implements DiagramStyle * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/EdgeImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/EdgeImpl.java index 1876e200c9..0c3b134174 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/EdgeImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/EdgeImpl.java @@ -554,6 +554,7 @@ public class EdgeImpl extends ViewImpl implements Edge * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/FontStyleImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/FontStyleImpl.java index a14968ae5c..81ec7e7263 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/FontStyleImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/FontStyleImpl.java @@ -377,6 +377,7 @@ public class FontStyleImpl extends CDOObjectImpl implements FontStyle * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/IdentityAnchorImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/IdentityAnchorImpl.java index fe12716492..a051e82223 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/IdentityAnchorImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/IdentityAnchorImpl.java @@ -153,6 +153,7 @@ public class IdentityAnchorImpl extends CDOObjectImpl implements IdentityAnchor * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ListCompartmentImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ListCompartmentImpl.java index 7ce3d8a9cc..23a9a82f6e 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ListCompartmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ListCompartmentImpl.java @@ -519,6 +519,7 @@ public class ListCompartmentImpl extends BasicCompartmentImpl implements ListCom * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSetGen(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/NodeImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/NodeImpl.java index ad516acf1d..f32b709a2e 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/NodeImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/NodeImpl.java @@ -284,6 +284,7 @@ public class NodeImpl extends ViewImpl implements Node * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/SemanticListCompartmentImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/SemanticListCompartmentImpl.java index 542a977650..098e66240f 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/SemanticListCompartmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/SemanticListCompartmentImpl.java @@ -530,6 +530,7 @@ public class SemanticListCompartmentImpl extends BasicSemanticCompartmentImpl im * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSetGen(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeImpl.java index 4de709f61c..d47aeb2037 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeImpl.java @@ -781,6 +781,7 @@ public class ShapeImpl extends NodeImpl implements Shape * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeStyleImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeStyleImpl.java index a42a3c8464..26f2ff32d0 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeStyleImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ShapeStyleImpl.java @@ -449,6 +449,7 @@ public class ShapeStyleImpl extends FontStyleImpl implements ShapeStyle * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/StandardDiagramImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/StandardDiagramImpl.java index 828a083857..69157d798b 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/StandardDiagramImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/StandardDiagramImpl.java @@ -518,6 +518,7 @@ public class StandardDiagramImpl extends DiagramImpl implements StandardDiagram * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java index 1372bde6e3..c740ac6115 100644 --- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java +++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java @@ -160,7 +160,7 @@ public abstract class ViewImpl extends org.eclipse.emf.cdo.ecore.impl.EModelElem /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public void setType(String newType) @@ -245,7 +245,7 @@ public abstract class ViewImpl extends org.eclipse.emf.cdo.ecore.impl.EModelElem /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public EObject getElement() @@ -597,6 +597,7 @@ public abstract class ViewImpl extends org.eclipse.emf.cdo.ecore.impl.EModelElem * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java index e91d65f45b..4a98e032ab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java @@ -58,6 +58,7 @@ public class MysqlConfig extends AbstractSetupDBConfig return new MYSQLAdapter(); } + @SuppressWarnings("null") @Override protected DataSource createDataSourceForDB(String dbName) throws SQLException { diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java index a38d922d81..191e4fab16 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java @@ -53,6 +53,7 @@ public class PostgresqlConfig extends AbstractSetupDBConfig return new PostgreSQLAdapter(); } + @SuppressWarnings("null") @Override protected DataSource createDataSourceForDB(String dbName) throws SQLException { diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF index 6eb86f61a6..64b67ab189 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.hibernate;singleton:=true -Bundle-Version: 4.1.600.qualifier +Bundle-Version: 4.1.700.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -23,10 +23,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", javax.persistence;bundle-version="[2.0.0,3.0.0)", org.hibernate;bundle-version="[4.0.0,5.0.0)", org.slf4j.api;bundle-version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.emf.cdo.tests.hibernate;version="4.1.600";x-friends:="org.eclipse.emf.cdo.tests.hudson", - org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;version="4.1.600", - org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;version="4.1.600", - org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;version="4.1.600" +Export-Package: org.eclipse.emf.cdo.tests.hibernate;version="4.1.700";x-friends:="org.eclipse.emf.cdo.tests.hudson", + org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;version="4.1.700", + org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;version="4.1.700", + org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;version="4.1.700" Import-Package: org.hibernate.cfg;version="[4.0.0,5.0.0)", org.eclipse.emf.teneo;version="[2.0.1,3.0.0)", org.eclipse.emf.cdo.server.hibernate;version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml b/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml index f6513cd7dc..9d71d35ec7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/pom.xml @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.tests.hibernate</artifactId> - <version>4.1.600-SNAPSHOT</version> + <version>4.1.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java index db6f32c0b8..25027f6eb9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java @@ -397,6 +397,7 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("null") @Override public boolean eIsSet(int featureID) { |