Author: jverhaeg(a)redhat.com Date: 2008-10-29 16:37:59 -0400 (Wed, 29 Oct 2008) New Revision: 600 Modified: trunk/extensions/dna-sequencer-xml/src/main/java/org/jboss/dna/sequencer/xml/XmlSequencer.java trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerTest.java Log: Undid DNA-186 in lieu of better solution to come involving execution context progress monitor, and renamed ProgressMonitor and ProgressStatus to ActivityMonitor and ActivityStatus, respectively, since the monitor is about more than just progress (such as collecting problems that occur during an activity) Modified: trunk/extensions/dna-sequencer-xml/src/main/java/org/jboss/dna/sequencer/xml/XmlSequencer.java =================================================================== --- trunk/extensions/dna-sequencer-xml/src/main/java/org/jboss/dna/sequencer/xml/XmlSequencer.java 2008-10-29 20:09:42 UTC (rev 599) +++ trunk/extensions/dna-sequencer-xml/src/main/java/org/jboss/dna/sequencer/xml/XmlSequencer.java 2008-10-29 20:37:59 UTC (rev 600) @@ -27,7 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.jboss.dna.common.monitor.ProgressMonitor; +import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.common.util.StringUtil; import org.jboss.dna.graph.JcrLexicon; import org.jboss.dna.graph.properties.Name; @@ -63,12 +63,12 @@ * {@inheritDoc} * * @see org.jboss.dna.graph.sequencers.StreamSequencer#sequence(InputStream, SequencerOutput, SequencerContext, - * ProgressMonitor) + * ActivityMonitor) */ public void sequence( InputStream stream, SequencerOutput output, SequencerContext context, - ProgressMonitor monitor ) { + ActivityMonitor monitor ) { monitor.beginTask(100.0, XmlSequencerI18n.sequencingXmlDocument); XMLReader reader; try { @@ -120,7 +120,7 @@ private final SequencerOutput output; private final SequencerContext context; - private final ProgressMonitor monitor; + private final ActivityMonitor monitor; private double progress; @@ -151,7 +151,7 @@ Handler( SequencerOutput output, SequencerContext context, - ProgressMonitor monitor ) { + ActivityMonitor monitor ) { assert output != null; assert monitor != null; assert context != null; Modified: trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerTest.java =================================================================== --- trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerTest.java 2008-10-29 20:09:42 UTC (rev 599) +++ trunk/extensions/dna-sequencer-xml/src/test/java/org/jboss/dna/sequencer/xml/XmlSequencerTest.java 2008-10-29 20:37:59 UTC (rev 600) @@ -28,13 +28,12 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import org.jboss.dna.common.monitor.ProgressMonitor; -import org.jboss.dna.common.monitor.SimpleProgressMonitor; +import org.jboss.dna.common.i18n.MockI18n; +import org.jboss.dna.common.monitor.ActivityMonitor; import org.jboss.dna.graph.properties.Name; import org.jboss.dna.graph.sequencers.MockSequencerContext; import org.jboss.dna.graph.sequencers.MockSequencerOutput; import org.jboss.dna.graph.sequencers.SequencerContext; -import org.jboss.dna.sequencer.xml.XmlSequencer; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -62,7 +61,7 @@ private XmlSequencer sequencer; private InputStream stream; private MockSequencerOutput output; - private ProgressMonitor monitor; + private ActivityMonitor monitor; private URL xml1; private URL xml2; private URL xml3; @@ -75,7 +74,7 @@ sequencer = new XmlSequencer(); context = new MockSequencerContext(); output = new MockSequencerOutput(context); - monitor = new SimpleProgressMonitor("Test activity"); + monitor = context.createActivityMonitor(MockI18n.passthrough, "Test activity"); xml1 = this.getClass().getClassLoader().getResource("jackrabbitInMemoryTestRepositoryConfig.xml"); assertThat(xml1, is(notNullValue())); xml2 = this.getClass().getClassLoader().getResource("master.xml");