bloritsch 2002/08/07 06:20:25
Modified:
fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing
Main.java
Log:
resolve conflicts
Revision Changes Path
1.7 +2 -2
jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/examples/src/java/org/apache/excalibur/fortress/examples/swing/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Main.java 7 Aug 2002 13:19:13 -0000 1.6
+++ Main.java 7 Aug 2002 13:20:25 -0000 1.7
@@ -48,7 +48,7 @@
contextBuilder.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.roles"
);
contextBuilder.setInstrumentManagerConfiguration(
"resource://org/apache/excalibur/fortress/examples/swing/SwingContainer.instruments"
);
- ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
+ ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext());
cm.initialize();
m_container = ( Container ) cm.getContainer();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
