Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 - Avoid to print one last empty line after each collection, since they are already separated by indentation.

This commit is contained in:
Simone Bordet 2012-09-14 18:15:13 +02:00
parent 4ffe66f899
commit ae9b32ba57
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java
View File

@ -49,7 +49,7 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
private boolean _started = false; private boolean _started = false;
enum Managed { MANAGED, UNMANAGED, AUTO }; enum Managed { MANAGED, UNMANAGED, AUTO };
private class Bean private class Bean
{ {
private final Object _bean; private final Object _bean;
@ -75,7 +75,7 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
{ {
// indicate that we are started, so that addBean will start other beans added. // indicate that we are started, so that addBean will start other beans added.
_started = true; _started = true;
// start our managed and auto beans // start our managed and auto beans
for (Bean b : _beans) for (Bean b : _beans)
{ {
@ -100,7 +100,7 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
} }
} }
} }
super.doStart(); super.doStart();
} }
@ -245,8 +245,8 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
} }
return true; return true;
} }
/** /**
* Manages a bean already contained by this aggregate, so that it is started/stopped/destroyed with this * Manages a bean already contained by this aggregate, so that it is started/stopped/destroyed with this
* aggregate. * aggregate.
@ -446,12 +446,12 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
else else
dumpObject(out, b._bean); dumpObject(out, b._bean);
break; break;
case UNMANAGED: case UNMANAGED:
out.append(indent).append(" +~ "); out.append(indent).append(" +~ ");
dumpObject(out, b._bean); dumpObject(out, b._bean);
break; break;
case AUTO: case AUTO:
out.append(indent).append(" += "); out.append(indent).append(" += ");
if (b._bean instanceof Dumpable) if (b._bean instanceof Dumpable)
@ -459,7 +459,7 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
else else
dumpObject(out, b._bean); dumpObject(out, b._bean);
break; break;
} }
} }
@ -490,9 +490,6 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable
else else
dumpObject(out, o); dumpObject(out, o);
} }
if (i != size)
out.append(indent).append(" |\n");
} }
} }
} }