notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2477 - in development/laboratory/users/niclas/processing: . controller controller/src/main/net/dpml/processing/controller nested-test test test/src/test/net/dpml/processing/controller/test

From: niclas AT hedhman.org
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2477 - in development/laboratory/users/niclas/processing: . controller controller/src/main/net/dpml/processing/controller nested-test test test/src/test/net/dpml/processing/controller/test
Date: Mon, 09 May 2005 14:40:02 -0400

Author: niclas AT hedhman.org
Date: Mon May 9 14:40:02 2005
New Revision: 2477

Modified:
development/laboratory/users/niclas/processing/controller/controller.iml

development/laboratory/users/niclas/processing/controller/src/main/net/dpml/processing/controller/NestedController.java
development/laboratory/users/niclas/processing/nested-test/nested-test.iml
development/laboratory/users/niclas/processing/processing.ipr
development/laboratory/users/niclas/processing/processing.iws

development/laboratory/users/niclas/processing/test/src/test/net/dpml/processing/controller/test/ExitPointTest.java
development/laboratory/users/niclas/processing/test/test.iml
Log:
Fixing up Processing.

Modified:
development/laboratory/users/niclas/processing/controller/controller.iml
==============================================================================
--- development/laboratory/users/niclas/processing/controller/controller.iml
(original)
+++ development/laboratory/users/niclas/processing/controller/controller.iml
Mon May 9 14:40:02 2005
@@ -12,8 +12,8 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="api" />
<orderEntry type="library" name="Metro Public" level="application" />
- <orderEntry type="library" name="Metro Protected" level="application" />
<orderEntry type="library" name="Clover" level="application" />
+ <orderEntry type="library" name="Metro Classic" level="application" />
<orderEntryProperties />
</component>
</module>

Modified:
development/laboratory/users/niclas/processing/controller/src/main/net/dpml/processing/controller/NestedController.java
==============================================================================
---
development/laboratory/users/niclas/processing/controller/src/main/net/dpml/processing/controller/NestedController.java
(original)
+++
development/laboratory/users/niclas/processing/controller/src/main/net/dpml/processing/controller/NestedController.java
Mon May 9 14:40:02 2005
@@ -18,9 +18,6 @@

package net.dpml.processing.controller;

-import java.util.Locale;
-import java.util.ResourceBundle;
-
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ModelException;
@@ -32,6 +29,9 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

+import java.util.Locale;
+import java.util.ResourceBundle;
+
/**
* This ProcessActivity is also a controller for <code>ProcessActivity</code>
* instances.

Modified:
development/laboratory/users/niclas/processing/nested-test/nested-test.iml
==============================================================================
---
development/laboratory/users/niclas/processing/nested-test/nested-test.iml
(original)
+++
development/laboratory/users/niclas/processing/nested-test/nested-test.iml
Mon May 9 14:40:02 2005
@@ -14,13 +14,13 @@
<orderEntry type="module" module-name="api" />
<orderEntry type="module" module-name="controller" />
<orderEntry type="library" name="Metro Public" level="application" />
- <orderEntry type="library" name="Metro Protected" level="application" />
<orderEntry type="library" name="Metro Unit" level="application" />
<orderEntry type="module" module-name="test" />
<orderEntry type="library" name="junit" level="application" />
<orderEntry type="library" name="Clover" level="application" />
<orderEntry type="library" name="Transit" level="application" />
<orderEntry type="library" name="Metro Private" level="application" />
+ <orderEntry type="library" name="Metro Classic" level="application" />
<orderEntryProperties />
</component>
</module>

Modified: development/laboratory/users/niclas/processing/processing.ipr
==============================================================================
--- development/laboratory/users/niclas/processing/processing.ipr
(original)
+++ development/laboratory/users/niclas/processing/processing.ipr Mon
May 9 14:40:02 2005
@@ -202,7 +202,7 @@
<module fileurl="file://$PROJECT_DIR$/test/test.iml"
filepath="$PROJECT_DIR$/test/test.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="false"
jdk-15="false" project-jdk-name="java version "1.4.2_08"" />
+ <component name="ProjectRootManager" version="2" assert-keyword="false"
jdk-15="false" project-jdk-name="Java 1.4" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />

Modified: development/laboratory/users/niclas/processing/processing.iws
==============================================================================
--- development/laboratory/users/niclas/processing/processing.iws
(original)
+++ development/laboratory/users/niclas/processing/processing.iws Mon
May 9 14:40:02 2005
@@ -146,19 +146,28 @@
<option name="HIDE_WARNINGS" value="false" />
</component>
<component name="FileEditorManager" split-orientation="vertical"
split-proportion="0.5">
- <first-group
selected-file="file:///home/gondor/dev/dpml/development/main/metro/classic/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java">
+ <first-group
selected-file="file://$PROJECT_DIR$/nested-test/src/test/net/dpml/processing/controller/test/NestedProcessTest.java">
<entry
file="file://$PROJECT_DIR$/controller/src/main/net/dpml/processing/controller/NestedController.java"
pinned="false">
<provider selected="true" editor-type-id="text-editor">
- <state line="149" column="13" selection-start="5625"
selection-end="5625" vertical-scroll-proportion="-1.3695238">
+ <state line="200" column="57" selection-start="7924"
selection-end="7924" vertical-scroll-proportion="0.43781096">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry
file="file:///home/gondor/dev/dpml/development/main/metro/classic/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java"
pinned="false">
+ <entry
file="file://$PROJECT_DIR$/test/src/test/net/dpml/processing/controller/test/ExitPointTest.java"
pinned="false">
<provider selected="true" editor-type-id="text-editor">
- <state line="113" column="15" selection-start="3606"
selection-end="3606" vertical-scroll-proportion="0.028571429">
+ <state line="38" column="35" selection-start="1053"
selection-end="1053" vertical-scroll-proportion="0.41825095">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/nested-test/src/test/net/dpml/processing/controller/test/NestedProcessTest.java"
pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="29" selection-start="691"
selection-end="691" vertical-scroll-proportion="0.09328358">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -184,23 +193,23 @@
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
- <expanded_node url="net.dpml.processing.controller" module="nested-test"
type="package" />
- <expanded_node url="net.dpml.processing" module="nested-test"
type="package" />
- <expanded_node url="net.dpml.processing" module="controller"
type="package" />
- <expanded_node url="net.dpml.processing.controller.test"
module="nested-test" type="package" />
- <expanded_node url="" module="test" type="module" />
+ <expanded_node url="net" module="test" type="package" />
+ <expanded_node url="net.dpml" module="test" type="package" />
+ <expanded_node url="" module="nested-test" type="module" />
<expanded_node url="net" module="nested-test" type="package" />
+ <expanded_node url="net.dpml.processing" module="test" type="package" />
+ <expanded_node url="net.dpml" module="nested-test" type="package" />
<expanded_node url="net.dpml.processing.controller" module="test"
type="package" />
- <expanded_node url="" module="nested-test" type="module" />
+ <expanded_node url="net.dpml.processing.controller.test"
module="nested-test" type="package" />
<expanded_node url="net.dpml.processing.controller.test" module="test"
type="package" />
- <expanded_node url="net" module="test" type="package" />
- <expanded_node url="net.dpml" module="test" type="package" />
- <expanded_node url="net" module="controller" type="package" />
+ <expanded_node url="net.dpml.processing" module="controller"
type="package" />
<expanded_node url="net.dpml.processing.controller" module="controller"
type="package" />
- <expanded_node url="net.dpml" module="nested-test" type="package" />
- <expanded_node url="net.dpml.processing" module="test" type="package" />
- <expanded_node url="" module="controller" type="module" />
+ <expanded_node url="net.dpml.processing" module="nested-test"
type="package" />
+ <expanded_node url="" module="test" type="module" />
+ <expanded_node url="net.dpml.processing.controller" module="nested-test"
type="package" />
<expanded_node url="net.dpml" module="controller" type="package" />
+ <expanded_node url="net" module="controller" type="package" />
+ <expanded_node url="" module="controller" type="module" />
</component>
<component name="ProjectPane">
<expanded_node url="" module="controller" type="module" />
@@ -228,7 +237,7 @@
<component name="RunManager">
<activeType name="JUnit" />
<tempConfiguration selected="true" default="false"
name="net.dpml.processing.controller.test" type="JUnit" factoryName="JUnit">
- <module name="" />
+ <module name="docs" />
<option name="PACKAGE_NAME"
value="net.dpml.processing.controller.test" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
@@ -243,6 +252,27 @@
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</tempConfiguration>
+ <configuration selected="false" default="true" type="JUnit"
factoryName="JUnit">
+ <module name="" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ </configuration>
+ <configuration selected="false" default="true" type="Application"
factoryName="Application">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <module name="" />
+ </configuration>
<configuration selected="false" default="true" type="Remote"
factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -260,27 +290,6 @@
<option name="POLICY_FILE"
value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
</configuration>
- <configuration selected="false" default="true" type="Application"
factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <module name="" />
- </configuration>
- <configuration selected="false" default="true" type="JUnit"
factoryName="JUnit">
- <module name="" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- </configuration>
</component>
<component name="SelectInManager" />
<component name="StarteamConfiguration">
@@ -328,27 +337,27 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="-6" width="1288" height="987" extended-state="6" />
+ <frame x="0" y="0" width="1279" height="977" extended-state="1" />
<editor active="false" />
<layout>
- <window_info id="CheckStyle" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="-1" />
+ <window_info id="CheckStyle" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="8"
/>
- <window_info id="XPTask View" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="-1" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="7" />
<window_info id="SvgViewer" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
- <window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.23941368" order="0" />
+ <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.23669124" order="0" />
<window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="1" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.3302217" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.32978722" order="8" />
<window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.4" order="6" />
<window_info id="Dependency Viewer" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="Ant Build" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="1" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="true" weight="0.3302217"
order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.3302217"
order="2" />
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="2" />
<window_info id="Clover" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
- <window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="sliding" type="sliding" visible="false"
weight="0.4" order="0" />
<window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.4" order="4" />
<window_info id="simpleUML" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
+ <window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="sliding" type="sliding" visible="false"
weight="0.4" order="0" />
+ <window_info id="XPTask View" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
<window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2"
/>
<window_info id="Message" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="0" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="3"
/>
@@ -423,15 +432,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/nested-test/src/test/net/dpml/processing/controller/test/NestedProcessTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="21" column="34" selection-start="696"
selection-end="696" vertical-scroll-proportion="0.1494024">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/test/src/main/net/dpml/processing/controller/test/ExceptionGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="48" column="24" selection-start="1436"
selection-end="1436" vertical-scroll-proportion="0.5976096">
@@ -452,7 +452,7 @@
</entry>
<entry
file="file://$PROJECT_DIR$/test/src/test/net/dpml/processing/controller/test/ExitPointTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="26" selection-start="1045"
selection-end="1045" vertical-scroll-proportion="0.41875">
+ <state line="38" column="35" selection-start="1053"
selection-end="1053" vertical-scroll-proportion="0.41825095">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -461,16 +461,16 @@
</entry>
<entry
file="file://$PROJECT_DIR$/controller/src/main/net/dpml/processing/controller/NestedController.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="149" column="13" selection-start="5625"
selection-end="5625" vertical-scroll-proportion="-1.3695238">
+ <state line="200" column="57" selection-start="7924"
selection-end="7924" vertical-scroll-proportion="0.43781096">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry
file="file:///home/gondor/dev/dpml/development/main/metro/classic/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java">
+ <entry
file="file://$PROJECT_DIR$/nested-test/src/test/net/dpml/processing/controller/test/NestedProcessTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="113" column="15" selection-start="3606"
selection-end="3606" vertical-scroll-proportion="0.028571429">
+ <state line="21" column="29" selection-start="691"
selection-end="691" vertical-scroll-proportion="0.09328358">
<folding>
<element signature="imports" expanded="true" />
</folding>

Modified:
development/laboratory/users/niclas/processing/test/src/test/net/dpml/processing/controller/test/ExitPointTest.java
==============================================================================
---
development/laboratory/users/niclas/processing/test/src/test/net/dpml/processing/controller/test/ExitPointTest.java
(original)
+++
development/laboratory/users/niclas/processing/test/src/test/net/dpml/processing/controller/test/ExitPointTest.java
Mon May 9 14:40:02 2005
@@ -18,13 +18,12 @@

package net.dpml.processing.controller.test;

-import java.util.Locale;
-
import junit.framework.TestCase;
-
import net.dpml.metro.unit.TestContext;
import net.dpml.processing.controller.ExitPoint;

+import java.util.Locale;
+
public class ExitPointTest extends TestCase
{
private ExitPoint m_comp;

Modified: development/laboratory/users/niclas/processing/test/test.iml
==============================================================================
--- development/laboratory/users/niclas/processing/test/test.iml
(original)
+++ development/laboratory/users/niclas/processing/test/test.iml Mon
May 9 14:40:02 2005
@@ -17,10 +17,10 @@
<orderEntry type="library" name="junit" level="application" />
<orderEntry type="library" name="Metro Public" level="application" />
<orderEntry type="library" name="Metro Unit" level="application" />
- <orderEntry type="library" name="Metro Protected" level="application" />
<orderEntry type="library" name="Metro Private" level="application" />
<orderEntry type="library" name="Clover" level="application" />
<orderEntry type="library" name="Transit" level="application" />
+ <orderEntry type="library" name="Metro Classic" level="application" />
<orderEntryProperties />
</component>
</module>

svn commit: r2477 - in development/laboratory/users/niclas/processing: . controller controller/src/main/net/dpml/processing/controller nested-test test test/src/test/net/dpml/processing/controller/test, niclas, 05/09/2005