You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/03/02 19:31:45 UTC
svn commit: r1854667 -
/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/
Author: mthl
Date: Sat Mar 2 19:31:44 2019
New Revision: 1854667
URL: http://svn.apache.org/viewvc?rev=1854667&view=rev
Log:
Improved: Use ‘FlexibleLocation#resolveLocation(String)’ when possible (OFBIZ-10821)
Previously the artifact info classes were using the
‘FlexibleLocation#resolveLocation(String, ClassLoader)’ method by
passing ‘null’ as the second argument which is equivalent to calling
the more specific ‘FlexibleLocation#resolveLocation(String)’ method
with the same first argument.
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java?rev=1854667&r1=1854666&r2=1854667&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java Sat Mar 2 19:31:44 2019
@@ -84,7 +84,7 @@ public class EntityArtifactInfo extends
@Override
public URL getLocationURL() throws MalformedURLException {
- return FlexibleLocation.resolveLocation(this.modelEntity.getLocation(), null);
+ return FlexibleLocation.resolveLocation(modelEntity.getLocation());
}
@Override
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java?rev=1854667&r1=1854666&r2=1854667&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java Sat Mar 2 19:31:44 2019
@@ -205,7 +205,7 @@ public class FormWidgetArtifactInfo exte
@Override
public URL getLocationURL() throws MalformedURLException {
- return FlexibleLocation.resolveLocation(this.formLocation, null);
+ return FlexibleLocation.resolveLocation(formLocation);
}
@Override
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=1854667&r1=1854666&r2=1854667&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Sat Mar 2 19:31:44 2019
@@ -184,7 +184,7 @@ public class ScreenWidgetArtifactInfo ex
@Override
public URL getLocationURL() throws MalformedURLException {
- return FlexibleLocation.resolveLocation(this.screenLocation, null);
+ return FlexibleLocation.resolveLocation(screenLocation);
}
@Override
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1854667&r1=1854666&r2=1854667&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Sat Mar 2 19:31:44 2019
@@ -262,11 +262,11 @@ public class ServiceArtifactInfo extends
@Override
public URL getLocationURL() throws MalformedURLException {
- return FlexibleLocation.resolveLocation(this.modelService.definitionLocation, null);
+ return FlexibleLocation.resolveLocation(modelService.definitionLocation);
}
public URL getImplementationLocationURL() throws MalformedURLException {
- return FlexibleLocation.resolveLocation(this.modelService.location, null);
+ return FlexibleLocation.resolveLocation(modelService.location);
}
public Set<EntityArtifactInfo> getEntitiesUsedByService() {
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java?rev=1854667&r1=1854666&r2=1854667&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java Sat Mar 2 19:31:44 2019
@@ -85,7 +85,7 @@ public class ServiceEcaArtifactInfo exte
@Override
public URL getLocationURL() throws MalformedURLException {
- return FlexibleLocation.resolveLocation(this.serviceEcaRule.getDefinitionLocation(), null);
+ return FlexibleLocation.resolveLocation(serviceEcaRule.getDefinitionLocation());
}
public ServiceEcaRule getServiceEcaRule() {