git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated coding rules.
[utils]
/
system
/
general
/
src
/
main
/
java
/
org
/
wamblee
/
system
/
core
/
AbstractComponent.java
diff --git
a/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
index d2cf69fe76f3b1039133debdc726ae88857a927d..579fd27435907d4ee9c0db8466fb1bb12db71270 100644
(file)
--- a/
system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
+++ b/
system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
@@
-30,12
+30,12
@@
public abstract class AbstractComponent<Type> implements Component<Type> {
private static final Log LOG = LogFactory.getLog(AbstractComponent.class);
private static final Log LOG = LogFactory.getLog(AbstractComponent.class);
- private ThreadLocal<List<ProvidedInterface>>
_
remaining;
+ private ThreadLocal<List<ProvidedInterface>> remaining;
- private String
_
context;
- private String
_
name;
- private List<ProvidedInterface>
_
provided;
- private List<RequiredInterface>
_
required;
+ private String context;
+ private String name;
+ private List<ProvidedInterface> provided;
+ private List<RequiredInterface> required;
/**
* Constructs the subsystem.
/**
* Constructs the subsystem.
@@
-49,11
+49,11
@@
public abstract class AbstractComponent<Type> implements Component<Type> {
*/
protected AbstractComponent(String aName, List<ProvidedInterface> aProvided,
List<RequiredInterface> aRequired) {
*/
protected AbstractComponent(String aName, List<ProvidedInterface> aProvided,
List<RequiredInterface> aRequired) {
-
_
remaining = new ThreadLocal<List<ProvidedInterface>>();
-
_
context = null;
-
_
name = aName;
-
_
provided = new ArrayList<ProvidedInterface>(aProvided);
-
_
required = new ArrayList<RequiredInterface>(aRequired);
+ remaining = new ThreadLocal<List<ProvidedInterface>>();
+ context = null;
+ name = aName;
+ provided = new ArrayList<ProvidedInterface>(aProvided);
+ required = new ArrayList<RequiredInterface>(aRequired);
}
/**
}
/**
@@
-76,71
+76,71
@@
public abstract class AbstractComponent<Type> implements Component<Type> {
}
public AbstractComponent<Type> addProvidedInterface(ProvidedInterface aProvided) {
}
public AbstractComponent<Type> addProvidedInterface(ProvidedInterface aProvided) {
-
_
provided.add(aProvided);
+ provided.add(aProvided);
return this;
}
public AbstractComponent<Type> addRequiredInterface(RequiredInterface aRequired) {
return this;
}
public AbstractComponent<Type> addRequiredInterface(RequiredInterface aRequired) {
-
_
required.add(aRequired);
+ required.add(aRequired);
return this;
}
@Override
public final String getName() {
return this;
}
@Override
public final String getName() {
- return
_
name;
+ return name;
}
@Override
public void addContext(String aContext) {
}
@Override
public void addContext(String aContext) {
- if (
_
context == null) {
-
_
context = aContext;
+ if (context == null) {
+ context = aContext;
} else {
} else {
-
_context = aContext + "." + _
context;
+
context = aContext + "." +
context;
}
}
@Override
public String getContext() {
}
}
@Override
public String getContext() {
- return
_
context;
+ return context;
}
@Override
public String getQualifiedName() {
}
@Override
public String getQualifiedName() {
- if (
_
context == null) {
+ if (context == null) {
return getName();
}
return getName();
}
- return
_
context + "." + getName();
+ return context + "." + getName();
}
@Override
public final List<ProvidedInterface> getProvidedInterfaces() {
}
@Override
public final List<ProvidedInterface> getProvidedInterfaces() {
- return Collections.unmodifiableList(
_
provided);
+ return Collections.unmodifiableList(provided);
}
@Override
public final List<RequiredInterface> getRequiredInterfaces() {
}
@Override
public final List<RequiredInterface> getRequiredInterfaces() {
- return Collections.unmodifiableList(
_
required);
+ return Collections.unmodifiableList(required);
}
@Override
public final Type start(Scope aScope) {
LOG.info("Initialization starting '" + getQualifiedName() + "'");
}
@Override
public final Type start(Scope aScope) {
LOG.info("Initialization starting '" + getQualifiedName() + "'");
- List<ProvidedInterface> oldRemaining =
_
remaining.get();
-
_
remaining.set(new ArrayList<ProvidedInterface>(getProvidedInterfaces()));
+ List<ProvidedInterface> oldRemaining = remaining.get();
+ remaining.set(new ArrayList<ProvidedInterface>(getProvidedInterfaces()));
try {
Type runtime = doStart(aScope);
checkNotStartedInterfaces();
LOG.info("Initialization finished '" + getQualifiedName() + "'");
return runtime;
} finally {
try {
Type runtime = doStart(aScope);
checkNotStartedInterfaces();
LOG.info("Initialization finished '" + getQualifiedName() + "'");
return runtime;
} finally {
-
_
remaining.set(oldRemaining);
+ remaining.set(oldRemaining);
}
}
private void checkNotStartedInterfaces() {
}
}
private void checkNotStartedInterfaces() {
- if (
_
remaining.get().size() > 0) {
+ if (remaining.get().size() > 0) {
String notProvided = "";
String notProvided = "";
- for (ProvidedInterface provided :
_
remaining.get()) {
+ for (ProvidedInterface provided : remaining.get()) {
notProvided += "\nComponent " + getQualifiedName()
+ " did not start interface " + provided;
}
notProvided += "\nComponent " + getQualifiedName()
+ " did not start interface " + provided;
}
@@
-171,7
+171,7
@@
public abstract class AbstractComponent<Type> implements Component<Type> {
Object aService, Scope aScope) {
LOG.info("Interface '" + getQualifiedName() + "."
+ aDescriptor.getName() + "' started.");
Object aService, Scope aScope) {
LOG.info("Interface '" + getQualifiedName() + "."
+ aDescriptor.getName() + "' started.");
- if ( !
_
remaining.get().remove(aDescriptor) ) {
+ if ( !remaining.get().remove(aDescriptor) ) {
throw new SystemAssemblyException("Component '" + getQualifiedName() + "' started an unexpected interface '" +
aDescriptor + "' that was not registerd as a provided interface before");
}
throw new SystemAssemblyException("Component '" + getQualifiedName() + "' started an unexpected interface '" +
aDescriptor + "' that was not registerd as a provided interface before");
}