Author: adrianc
Date: Tue Jan 19 16:13:57 2010
New Revision: 900830
URL: http://svn.apache.org/viewvc?rev=900830&view=rev
Log:
Reverted the encapsulation code because it was preventing compilation on a
fresh checkout. The encapsulation idea is a good one, and it really needs to be
in here, but I don't have time to work on it right now. I will put it back in
later.
Modified:
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ThreadContext.java
Modified:
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java?rev=900830&r1=900829&r2=900830&view=diff
==============================================================================
---
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java
(original)
+++
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java
Tue Jan 19 16:13:57 2010
@@ -147,15 +147,6 @@
this.timeZone = TimeZone.getDefault();
}
- public void runExecutionArtifact(ExecutionArtifact artifact) throws
Throwable {
- pushExecutionArtifact(artifact);
- try {
- artifact.run();
- } finally {
- popExecutionArtifact();
- }
- }
-
public void setCurrencyUom(String currencyUom) {
if (currencyUom != null) {
this.currencyUom = currencyUom;
Modified:
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java?rev=900830&r1=900829&r2=900830&view=diff
==============================================================================
---
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java
(original)
+++
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java
Tue Jan 19 16:13:57 2010
@@ -37,9 +37,4 @@
* @return Name of this artifact
*/
String getName();
-
- /**
- * Run this artifact's protected code.
- */
- void run() throws Throwable;
}
Modified:
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java?rev=900830&r1=900829&r2=900830&view=diff
==============================================================================
---
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java
(original)
+++
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java
Tue Jan 19 16:13:57 2010
@@ -140,18 +140,9 @@
*/
void reset();
- /** Run an <code>ExecutionArtifact</code>'s protected code.
- *
- *
- * @param artifact
- */
- void runExecutionArtifact(ExecutionArtifact artifact) throws Throwable;
-
- /**
+ /**
* Replaces the current <code>AuthorizationManager</code> instance
* with one that allows unrestricted use of all artifacts.
- *
- * @param artifact
*/
void runUnprotected();
Modified:
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java?rev=900830&r1=900829&r2=900830&view=diff
==============================================================================
---
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java
(original)
+++
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java
Tue Jan 19 16:13:57 2010
@@ -29,20 +29,15 @@
this.name = name;
}
- @Override
public String getLocation() {
return this.location;
}
- @Override
public String getName() {
return this.name;
}
@Override
- public void run() throws Throwable {}
-
- @Override
public String toString() {
return "GenericExecutionArtifact: location = " + this.location + ",
name = " + this.name;
}
Modified:
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ThreadContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ThreadContext.java?rev=900830&r1=900829&r2=900830&view=diff
==============================================================================
---
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ThreadContext.java
(original)
+++
ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ThreadContext.java
Tue Jan 19 16:13:57 2010
@@ -115,10 +115,6 @@
executionContext.get().reset();
}
- public void runExecutionArtifact(ExecutionArtifact artifact) throws
Throwable {
- executionContext.get().runExecutionArtifact(artifact);
- }
-
public static void runUnprotected() {
executionContext.get().runUnprotected();
}
