You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2008/05/03 04:30:00 UTC
svn commit: r652975 -
/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
Author: ate
Date: Fri May 2 19:30:00 2008
New Revision: 652975
URL: http://svn.apache.org/viewvc?rev=652975&view=rev
Log:
Deriving applicationId directly from contained PortletApp
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java?rev=652975&r1=652974&r2=652975&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java Fri May 2 19:30:00 2008
@@ -53,14 +53,12 @@
// Private Member Variables ------------------------------------------------
- /** Portlet Descriptor */
- private Portlet portletDD = null;
+ /** Portlet */
+ private Portlet portlet = null;
-
- private final String applicationId;
- private String applicationName;
-
- private final PortletApp portletAppDD;
+ private String applicationName;
+
+ private final PortletApp portletApp;
private final ServletContext servletContext;
private ClassLoader contextClassLoader;
@@ -72,29 +70,26 @@
* @param servletContext the servlet context in which we are contained.
* @param portletAppDD the portlet application descriptor.
*/
- public PortletContextImpl(String portletApplicationId,
- ServletContext servletContext,
- PortletApp portletAppDD) {
+ public PortletContextImpl(ServletContext servletContext,
+ PortletApp portletApp) {
this.servletContext = servletContext;
- this.portletAppDD = portletAppDD;
- this.applicationId = portletApplicationId;
+ this.portletApp = portletApp;
this.applicationName = servletContext.getServletContextName();
if(applicationName == null) {
- applicationName = applicationId;
+ applicationName = portletApp.getId();
}
init();
}
-
private void init() {
setContextClassLoader(Thread.currentThread().getContextClassLoader());
}
public String getApplicationId() {
- return applicationId;
+ return portletApp.getId();
}
-
+
public String getApplicationName() {
return applicationName;
}
@@ -281,14 +276,14 @@
}
public PortletApp getPortletApplicationDefinition() {
- return portletAppDD;
+ return portletApp;
}
public Map<String, String[]> getApplicationRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
- if (portletAppDD.getContainerRuntimeOption() != null){
- for (ContainerRuntimeOption option : portletAppDD.getContainerRuntimeOption()) {
+ if (portletApp.getContainerRuntimeOption() != null){
+ for (ContainerRuntimeOption option : portletApp.getContainerRuntimeOption()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
List<String> values = option.getValue();
String [] tempValues = new String[values.size()];
@@ -304,8 +299,8 @@
public Map<String, String[]> getPortletRuntimeOptions() {
Map<String, String[]> resultMap = new HashMap<String, String[]>();
- if (portletDD.getContainerRuntimeOption() != null) {
- for (ContainerRuntimeOption option : portletDD.getContainerRuntimeOption()) {
+ if (portlet.getContainerRuntimeOption() != null) {
+ for (ContainerRuntimeOption option : portlet.getContainerRuntimeOption()) {
if (Configuration.getSupportedContainerRuntimeOptions().contains(option.getName())){
List<String> values = option.getValue();
String [] tempValues = new String[values.size()];