You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/07/21 19:07:13 UTC
svn commit: r1505425 -
/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
Author: aadamchik
Date: Sun Jul 21 17:07:13 2013
New Revision: 1505425
URL: http://svn.apache.org/r1505425
Log:
CAY-1853 Drop java 1.5 support in Cayenne 3.2
1.6 "super-feature" - @Override annotation for implemented interface methods
Modified:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/BaseContext.java?rev=1505425&r1=1505424&r2=1505425&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/BaseContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/BaseContext.java Sun Jul 21 17:07:13 2013
@@ -177,12 +177,16 @@ public abstract class BaseContext implem
setEntityResolver(channel.getEntityResolver());
}
+ @Override
public abstract void commitChanges();
+ @Override
public abstract void commitChangesToParent();
+ @Override
public abstract Collection<?> deletedObjects();
+ @Override
public DataChannel getChannel() {
attachToRuntimeIfNeeded();
return channel;
@@ -197,6 +201,7 @@ public abstract class BaseContext implem
this.channel = channel;
}
+ @Override
public EntityResolver getEntityResolver() {
attachToRuntimeIfNeeded();
return entityResolver;
@@ -232,6 +237,7 @@ public abstract class BaseContext implem
/**
* @since 3.1
*/
+ @Override
public <T> T localObject(T objectFromAnotherContext) {
if (objectFromAnotherContext == null) {
@@ -274,24 +280,32 @@ public abstract class BaseContext implem
}
}
+ @Override
public abstract GraphManager getGraphManager();
+ @Override
public abstract Collection<?> modifiedObjects();
+ @Override
public abstract <T> T newObject(Class<T> persistentClass);
+ @Override
public abstract void registerNewObject(Object object);
+ @Override
public abstract Collection<?> newObjects();
+ @Override
public abstract QueryResponse performGenericQuery(Query query);
+ @Override
public abstract List performQuery(Query query);
/**
* @since 3.2
*/
@SuppressWarnings("unchecked")
+ @Override
public <T> List<T> select(Select<T> query) {
return performQuery(query);
}
@@ -299,6 +313,7 @@ public abstract class BaseContext implem
/**
* @since 3.2
*/
+ @Override
public <T> T selectOne(Select<T> query) {
List<T> objects = select(query);
@@ -314,6 +329,7 @@ public abstract class BaseContext implem
/**
* @since 3.2
*/
+ @Override
public <T> void iterate(Select<T> query, ResultIteratorCallback<T> callback) {
ResultIterator<T> it = iterator(query);
try {
@@ -323,8 +339,10 @@ public abstract class BaseContext implem
}
}
+ @Override
public abstract <T> ResultIterator<T> iterator(Select<T> query);
+ @Override
public void prepareForAccess(Persistent object, String property, boolean lazyFaulting) {
if (object.getPersistenceState() == PersistenceState.HOLLOW) {
@@ -381,19 +399,19 @@ public abstract class BaseContext implem
// Grab each of the declared properties.
final List<String> properties = new ArrayList<String>();
classDescriptor.visitProperties(new PropertyVisitor() {
-
+ @Override
public boolean visitAttribute(final AttributeProperty property) {
properties.add(property.getName());
return true;
}
-
+ @Override
public boolean visitToOne(final ToOneProperty property) {
properties.add(property.getName());
return true;
}
-
+ @Override
public boolean visitToMany(final ToManyProperty property) {
properties.add(property.getName());
@@ -422,16 +440,19 @@ public abstract class BaseContext implem
propertyDescriptor.readProperty(object);
}
}
-
+
+ @Override
public void propertyChanged(Persistent object, String property, Object oldValue, Object newValue) {
-
graphAction.handlePropertyChange(object, property, oldValue, newValue);
}
+ @Override
public abstract void rollbackChanges();
+ @Override
public abstract void rollbackChangesLocally();
+ @Override
public abstract Collection<?> uncommittedObjects();
public QueryCache getQueryCache() {
@@ -451,10 +472,12 @@ public abstract class BaseContext implem
*
* @since 1.2
*/
+ @Override
public EventManager getEventManager() {
return channel != null ? channel.getEventManager() : null;
}
+ @Override
public GraphDiff onSync(ObjectContext originatingContext, GraphDiff changes, int syncType) {
switch (syncType) {
case DataChannel.ROLLBACK_CASCADE_SYNC:
@@ -511,6 +534,7 @@ public abstract class BaseContext implem
}
}
+ @Override
public void invalidateObjects(Collection<?> objects) {
// don't allow null collections as a matter of coding discipline
@@ -526,6 +550,7 @@ public abstract class BaseContext implem
/**
* @since 3.1
*/
+ @Override
public <T> void invalidateObjects(T... objects) {
if (objects != null && objects.length > 0) {
performGenericQuery(new RefreshQuery(Arrays.asList(objects)));
@@ -560,6 +585,7 @@ public abstract class BaseContext implem
*
* @since 3.0
*/
+ @Override
public Object getUserProperty(String key) {
return getUserProperties().get(key);
}
@@ -570,6 +596,7 @@ public abstract class BaseContext implem
*
* @since 3.0
*/
+ @Override
public void setUserProperty(String key, Object value) {
getUserProperties().put(key, value);
}
@@ -615,6 +642,7 @@ public abstract class BaseContext implem
/**
* @since 3.1
*/
+ @Override
public <T> void deleteObjects(T... objects) throws DeleteDenyException {
if (objects == null || objects.length == 0) {
return;
@@ -627,6 +655,7 @@ public abstract class BaseContext implem
}
}
+ @Override
public void deleteObjects(Collection<?> objects) throws DeleteDenyException {
if (objects.isEmpty()) {
return;