portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 46116 - in portals/pluto/trunk: container/src/java/org/apache/pluto/core/impl container/src/java/org/apache/pluto/tags portal/src/java/org/apache/pluto/portalImpl/om/common/impl portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl testsuite/src/java/org/apache/pluto/core/impl testsuite/src/java/org/apache/pluto/portalImpl/portlet/test testsuite/src/java/org/apache/pluto/testsuite
Date Wed, 15 Sep 2004 13:15:08 GMT
Author: cziegeler
Date: Wed Sep 15 06:15:06 2004
New Revision: 46116

Modified:
   portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
   portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
   portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java
   portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
   portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceImpl.java
   portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/ServletDefinitionImpl.java
   portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/TagDefinitionSet.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/testsuite/ExpectedResults.java
Log:
Code cleanup

Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
(original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
Wed Sep 15 06:15:06 2004
@@ -20,7 +20,6 @@
 package org.apache.pluto.core.impl;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;

Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
(original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
Wed Sep 15 06:15:06 2004
@@ -28,7 +28,6 @@
 import javax.portlet.PortletResponse;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.core.InternalPortletResponse;
 import org.apache.pluto.om.window.PortletWindow;

Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java	(original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java	Wed Sep
15 06:15:06 2004
@@ -95,7 +95,7 @@
                     }
                     catch (IllegalAccessException e)
                     {
-                        ;
+                        
                     }
                 }
             }

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
(original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
Wed Sep 15 06:15:06 2004
@@ -60,28 +60,7 @@
     private Language createLanguage(Locale locale, ResourceBundle bundle)
     {
         LanguageImpl lang = new LanguageImpl(locale, bundle, title, shortTitle, castorKeywords);
-        return(Language)lang;
-    }
-
-    // creates a locale object from a string representation
-    private Locale createLocale(String locale)
-    {
-        // parse locale String
-        StringTokenizer tokenizer = new StringTokenizer(locale,"_");
-        String[] localeDef = new String[5]; // just in case we have more than one variant
-        for (int i = 0; i < localeDef.length; i++)
-        {
-            if (tokenizer.hasMoreTokens())
-            {
-                localeDef[i] = tokenizer.nextToken();
-            }
-            else
-            {
-                localeDef[i] = "";
-            }
-        }
-
-        return new java.util.Locale(localeDef[0], localeDef[1], localeDef[2]+localeDef[3]+localeDef[4]);
+        return lang;
     }
 
     // AbstractSupportSet implementation.

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceImpl.java
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceImpl.java
(original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceImpl.java
Wed Sep 15 06:15:06 2004
@@ -59,7 +59,7 @@
 
         // replace all NULL_ARRAYENTRY Strings by NULL
         for (int i = 0; i < returnValue.size(); i++) {
-            if (NULL_ARRAYENTRY.equals((String)returnValue.get(i))) {
+            if (NULL_ARRAYENTRY.equals(returnValue.get(i))) {
                 returnValue.set(i, null);
             }
         }

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/ServletDefinitionImpl.java
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/ServletDefinitionImpl.java
(original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/ServletDefinitionImpl.java
Wed Sep 15 06:15:06 2004
@@ -311,7 +311,7 @@
         if (servletMapping!=null) {
             StringUtils.newLine(buffer,indent);
             buffer.append("Linked ServletMapping:");
-            buffer.append(((ServletMappingImpl)servletMapping).toString(indent+2));
+            buffer.append(servletMapping.toString(indent+2));
         }
         StringUtils.newLine(buffer,indent);
         buffer.append("}");

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/TagDefinitionSet.java
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/TagDefinitionSet.java
(original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/TagDefinitionSet.java
Wed Sep 15 06:15:06 2004
@@ -19,12 +19,10 @@
 
 package org.apache.pluto.portalImpl.om.servlet.impl;
 
-import java.util.Iterator;
 import java.util.Locale;
 
 import org.apache.pluto.portalImpl.om.common.AbstractSupportSet;
 import org.apache.pluto.portalImpl.om.common.Support;
-import org.apache.pluto.util.StringUtils;
 
 public class TagDefinitionSet extends AbstractSupportSet implements java.io.Serializable,
Support {
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java
Wed Sep 15 06:15:06 2004
@@ -38,7 +38,6 @@
       String[] defValues = {"no values"};
       String[] values = null;
       String key = null;
-      boolean validationFailed = false;
 
       while (names.hasMoreElements())
       {

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java
Wed Sep 15 06:15:06 2004
@@ -21,8 +21,6 @@
 import javax.portlet.PortletResponse;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletContext;
-import javax.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
 
 /**
  * @author <a href="ddewolf@apache.org">David H. DeWolf</a>

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
Wed Sep 15 06:15:06 2004
@@ -19,7 +19,6 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import javax.portlet.PortletResponse;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
 import javax.portlet.PortletContext;

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
Wed Sep 15 06:15:06 2004
@@ -19,9 +19,6 @@
 import java.util.HashMap;
 import java.util.Enumeration;
 
-import javax.portlet.PortletContext;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 import javax.portlet.PortletRequest;
 
 /**

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/testsuite/ExpectedResults.java
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/testsuite/ExpectedResults.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/testsuite/ExpectedResults.java
Wed Sep 15 06:15:06 2004
@@ -35,17 +35,17 @@
 	private Properties properties;
 	
 	private ExpectedResults() throws IOException {
-		properties = new Properties();
+		this.properties = new Properties();
 		
 		InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(PROPERTY_FILENAME);
 		if (in == null) {
 			throw new IOException("Could not find " + PROPERTY_FILENAME);
 		}
-		properties.load(in);
+		this.properties.load(in);
 	}
 	
 	public Properties getProperties() {
-		return properties;
+		return this.properties;
 	}
 	
 	/**

Mime
View raw message