Author: mcombellack
Date: Sat Apr 12 02:09:13 2008
New Revision: 647406
URL: http://svn.apache.org/viewvc?rev=647406&view=rev
Log:
Made placement of { and } code block markers consistent throughout the project
as there were a few places that they were inconsistent
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java?rev=647406&r1=647405&r2=647406&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
Sat Apr 12 02:09:13 2008
@@ -153,9 +153,8 @@
}
}
}
-
- public void stop(Component component, ComponentReference reference)
- {
+
+ public void stop(Component component, ComponentReference reference) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("Starting component reference: " + component.getURI()
+ "#" + reference.getName());
}
@@ -166,7 +165,7 @@
bindingProvider.stop();
}
}
- }
+ }
public void deactivate(RuntimeComponent component,
RuntimeComponentReference ref) {
if (logger.isLoggable(Level.FINE)) {
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java?rev=647406&r1=647405&r2=647406&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
Sat Apr 12 02:09:13 2008
@@ -127,11 +127,10 @@
*
* @see #getProperty(Class, String)
*/
- public void setPropertyValueFactory(PropertyValueFactory factory)
- {
+ public void setPropertyValueFactory(PropertyValueFactory factory) {
propertyFactory = factory;
}
-
+
/**
* Gets the value for the specified property with the specified type.
*
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java?rev=647406&r1=647405&r2=647406&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
Sat Apr 12 02:09:13 2008
@@ -67,8 +67,7 @@
/**
* constructor
*/
- public ConversationManagerImpl()
- {
+ public ConversationManagerImpl() {
long mit = DEFAULT_MAX_IDLE_TIME;
long ma = DEFAULT_MAX_AGE;
@@ -202,16 +201,15 @@
* return the default max idle time
* @param impProvider the implementation Provider to extract any
ConversationAttribute details
*/
- public long getMaxIdleTime()
- {
+ public long getMaxIdleTime() {
return maxIdleTime;
}
-
+
/**
* returns the default max age
* @param impProvider the implementation Provider to extract any
ConversationAttribute details
*/
public long getMaxAge(){
return maxAge;
- }
+ }
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java?rev=647406&r1=647405&r2=647406&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
Sat Apr 12 02:09:13 2008
@@ -130,12 +130,10 @@
/**
* schedule next expiry time
*/
- public void scheduleNextExpiryTime(long currentTime)
- {
+ public void scheduleNextExpiryTime(long currentTime) {
if ((lastReferencedTime + maxIdleTime) < expirationTime){
manager.scheduleConversation(this, (lastReferencedTime +
maxIdleTime) - currentTime);
- }
- else{
+ } else {
manager.scheduleConversation(this, expirationTime -
currentTime);
}
}
@@ -207,8 +205,7 @@
* return the max idle time
* @param impProvider the implementation Provider to extract any
ConversationAttribute details
*/
- private long getMaxIdleTime(ImplementationProvider impProvider)
- {
+ private long getMaxIdleTime(ImplementationProvider impProvider) {
// Check to see if the maxIdleTime has been specified using
@ConversationAttributes.
// Implementation annotated attributes are honoured first.
if ((impProvider != null) &&
@@ -248,8 +245,7 @@
/**
* called when expiring
*/
- public void run()
- {
+ public void run() {
synchronized (stateSync){
if (!expired){
if (isExpired()) {
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?rev=647406&r1=647405&r2=647406&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
Sat Apr 12 02:09:13 2008
@@ -80,8 +80,7 @@
}
public void addWrapperReference(KEY existingContextId, KEY newContextId)
- throws TargetResolutionException
- {
+ throws TargetResolutionException {
// do nothing here. the conversational scope container implements this
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java?rev=647406&r1=647405&r2=647406&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
Sat Apr 12 02:09:13 2008
@@ -235,8 +235,7 @@
Object conversationId = conversation.getConversationID();
InstanceLifeCycleWrapper ilcw =
instanceLifecycleCollection.get(conversationId);
- if (ilcw != null)
- {
+ if (ilcw != null) {
// cycle through all the references to this instance and
// remove them from the underlying wrappers collection and
// from the lifecycle wrappers collection
@@ -245,8 +244,7 @@
try{
ilcw.removeInstanceWrapper(conversationID);
remove(conversationID);
- }
- catch(TargetDestructionException tde){
+ } catch(TargetDestructionException tde) {
System.out.println("Could not remove
conversation id " + conversationID);
}
}
@@ -256,8 +254,7 @@
try{
ilcw.removeInstanceWrapper(ilcw.clientConversationId);
remove(ilcw.clientConversationId);
- }
- catch(TargetDestructionException tde){
+ } catch(TargetDestructionException tde) {
System.out.println("Could not remove
conversation id " + ilcw.clientConversationId);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
