You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/05/06 11:09:20 UTC
svn commit: r772105 -
/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
Author: woonsan
Date: Wed May 6 09:09:20 2009
New Revision: 772105
URL: http://svn.apache.org/viewvc?rev=772105&view=rev
Log:
Removes unused utility method and deprecated marks on delegating utility methods of AdminPortletWebPage.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java?rev=772105&r1=772104&r2=772105&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java Wed May 6 09:09:20 2009
@@ -17,8 +17,6 @@
package org.apache.jetspeed.portlets;
-import java.util.HashMap;
-
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
@@ -27,8 +25,6 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.StringResourceModel;
/**
@@ -94,26 +90,8 @@
}
/**
- * Please use {@link StringResourceModel} instead.
- * @deprecated
- */
- public String messageSubstition(String resource, String[]keys, Object[]values)
- {
- HashMap<String, Object> vars = new HashMap<String, Object>(keys.length);
- for (int ix = 0; ix < keys.length; ix++)
- {
- if (values[ix] == null)
- vars.put(keys[ix], "");
- else
- vars.put(keys[ix], values[ix]);
- }
- return getString(resource, new Model<HashMap<String, Object>>(vars));
- }
-
- /**
* Delegates the invocation to {@link AbstractAdminWebApplication#getServiceLocator()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public JetspeedServiceLocator getServiceLocator()
{
@@ -123,7 +101,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getInitParam(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getInitParam(String paramKey)
{
@@ -133,7 +110,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getInitParamAsInteger(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public int getInitParamAsInteger(String paramKey)
{
@@ -143,7 +119,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getInitParamAsBoolean(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public boolean getInitParamAsBoolean(String paramKey)
{
@@ -153,7 +128,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValue(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getPreference(String key)
{
@@ -163,7 +137,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValueAsInteger(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public int getPreferenceAsInteger(String key)
{
@@ -173,7 +146,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValueAsBoolean(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public boolean getPreferenceAsBoolean(String key)
{
@@ -183,7 +155,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValue(String, String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getPreference(String key,String defaultValue)
{
@@ -193,7 +164,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPreferenceValues(String, String[])}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String [] getPreference(String key,String [] values)
{
@@ -203,7 +173,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPortletRequest()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public PortletRequest getPortletRequest()
{
@@ -213,7 +182,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#setTitle(String)}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public void setTitle(String title)
{
@@ -223,7 +191,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getTitle()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getTitle()
{
@@ -233,7 +200,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPortletName()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getPortletName()
{
@@ -243,7 +209,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getPortletResponse()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public PortletResponse getPortletResponse()
{
@@ -253,7 +218,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getIPAddress()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getIPAddress()
{
@@ -263,7 +227,6 @@
/**
* Delegates the invocation to {@link AbstractAdminWebApplication#getUserPrincipalName()}.
* Please use the corresponding method of {@link AbstractAdminWebApplication} directly.
- * @deprecated
*/
public String getAuthenticatedUsername()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org