You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/05/18 13:08:57 UTC
svn commit: r407522 - in /cocoon/branches/BRANCH_2_1_X/src:
blocks/portal/java/org/apache/cocoon/portal/impl/
blocks/xsp/java/org/apache/cocoon/components/language/markup/
java/org/apache/cocoon/util/
Author: cziegeler
Date: Thu May 18 04:08:56 2006
New Revision: 407522
URL: http://svn.apache.org/viewvc?rev=407522&view=rev
Log:
Clean up
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelManager.java (contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashMap.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PropertySettings.java (contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/ReflectionUtils.java (contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Settings.java (props changed)
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java (contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SimpleSourceResolver.java (contents, props changed)
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelManager.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelManager.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelManager.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelManager.java Thu May 18 04:08:56 2006
@@ -16,6 +16,7 @@
package org.apache.cocoon.portal.impl;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -38,7 +39,6 @@
import org.apache.cocoon.portal.layout.Item;
import org.apache.cocoon.portal.layout.NamedItem;
import org.apache.cocoon.portal.event.impl.ChangeAspectDataEvent;
-import org.apache.cocoon.util.HashMap;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.components.ContextHelper;
@@ -53,7 +53,7 @@
* 'pageLabel'.
* @author Ralph Goers
*
- * @version CVS $Id: $
+ * @version CVS $Id$
*/
public class PageLabelManager
extends AbstractLogEnabled
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelManager.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java Thu May 18 04:08:56 2006
@@ -35,7 +35,6 @@
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.store.Store;
-import org.apache.cocoon.util.HashMap;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -43,6 +42,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -84,7 +84,7 @@
protected String name;
/** The supported language table */
- protected HashMap languages;
+ protected Map languages;
/** The code-generation logicsheet cache */
protected Store logicsheetCache;
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashMap.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashMap.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashMap.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashMap.java Thu May 18 04:08:56 2006
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,27 +21,26 @@
* Extended Version of {@link java.util.HashMap}.
*
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: HashMap.java,v 1.2 2004/03/05 13:03:00 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class HashMap extends java.util.HashMap {
public HashMap () {
- super();
+ super();
}
public HashMap ( int initialCapacity ) {
- super(initialCapacity);
+ super(initialCapacity);
}
public HashMap ( int initialCapacity, float loadFactor ) {
- super(initialCapacity, loadFactor);
+ super(initialCapacity, loadFactor);
}
public HashMap ( Map t) {
- super(t);
+ super(t);
}
-
/**
* Get method extended by default object to be returned when key
* is not found.
@@ -51,11 +50,10 @@
* @return value that is associated with key
*/
public Object get ( Object key, Object _default ) {
- if (this.containsKey(key)) {
- return this.get(key);
- } else {
- return _default;
- }
+ if (this.containsKey(key)) {
+ return this.get(key);
+ } else {
+ return _default;
+ }
}
-
}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PropertySettings.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PropertySettings.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PropertySettings.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PropertySettings.java Thu May 18 04:08:56 2006
@@ -39,8 +39,9 @@
* @version $Id$
*/
public class PropertySettings implements Settings {
+
/** The list of properties used to configure Cocoon. */
- private Map properties = new HashMap();
+ private Map properties = new java.util.HashMap();
/** Parameter map for the context protocol */
protected static final Map CONTEXT_PARAMETERS = Collections.singletonMap("force-traversable", Boolean.TRUE);
Propchange: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PropertySettings.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/ReflectionUtils.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/ReflectionUtils.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/ReflectionUtils.java Thu May 18 04:08:56 2006
@@ -20,7 +20,7 @@
import java.util.Map;
/**
- * @author tcurdt
+ * @version $Id$
*
*/
public final class ReflectionUtils {
Propchange: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/ReflectionUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Settings.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java Thu May 18 04:08:56 2006
@@ -25,7 +25,7 @@
* Helper class to create Stettings and for replacing property references with the value of the
* property
*
- * @version $Id: $
+ * @version $Id$
* @since 2.1.9
*/
public class SettingsHelper {
Propchange: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SimpleSourceResolver.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SimpleSourceResolver.java?rev=407522&r1=407521&r2=407522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SimpleSourceResolver.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SimpleSourceResolver.java Thu May 18 04:08:56 2006
@@ -49,8 +49,7 @@
* </ul>
* Relative URIs are resolved relatively to the context root, i.e. similarily to "<code>context:</code>".
*
- * @version $Id: SimpleSourceResolver.java 380191 2006-02-23 18:31:51Z cziegeler $
- * @since 2.2
+ * @version $Id$
*/
public final class SimpleSourceResolver extends AbstractLogEnabled
implements ThreadSafe, Contextualizable, SourceResolver {
Propchange: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SimpleSourceResolver.java
------------------------------------------------------------------------------
svn:keywords = Id