You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/03/02 12:53:58 UTC
svn commit: r513717 - in /tiles/framework/trunk:
tiles-api/src/main/assembly/ tiles-core/src/main/assembly/
tiles-core/src/main/java/org/apache/tiles/locale/
tiles-core/src/main/java/org/apache/tiles/locale/impl/
Author: apetrelli
Date: Fri Mar 2 03:53:57 2007
New Revision: 513717
URL: http://svn.apache.org/viewvc?view=rev&rev=513717
Log:
Fixed svn properties.
Modified:
tiles/framework/trunk/tiles-api/src/main/assembly/src.xml (props changed)
tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml (props changed)
tiles/framework/trunk/tiles-core/src/main/assembly/src.xml (props changed)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java (contents, props changed)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java (contents, props changed)
Propchange: tiles/framework/trunk/tiles-api/src/main/assembly/src.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Mar 2 03:53:57 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Mar 2 03:53:57 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: tiles/framework/trunk/tiles-core/src/main/assembly/src.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Mar 2 03:53:57 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java?view=diff&rev=513717&r1=513716&r2=513717
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java Fri Mar 2 03:53:57 2007
@@ -1,48 +1,48 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.tiles.locale;
-
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.DefinitionsFactoryException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface LocaleResolver {
-
- /**
- * Initializes the <code>LocaleResolver</code> object. <p/> This method
- * must be called before the {@link #resolveLocale(TilesRequestContext)}
- * method is called.
- *
- * @param params A map of properties used to set up the resolver.
- * @throws DefinitionsFactoryException if required properties are not passed
- * in or the initialization fails.
- */
- public void init(Map<String, String> params) throws TilesException;
-
- public Locale resolveLocale(TilesRequestContext request);
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.tiles.locale;
+
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.tiles.TilesException;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface LocaleResolver {
+
+ /**
+ * Initializes the <code>LocaleResolver</code> object. <p/> This method
+ * must be called before the {@link #resolveLocale(TilesRequestContext)}
+ * method is called.
+ *
+ * @param params A map of properties used to set up the resolver.
+ * @throws DefinitionsFactoryException if required properties are not passed
+ * in or the initialization fails.
+ */
+ public void init(Map<String, String> params) throws TilesException;
+
+ public Locale resolveLocale(TilesRequestContext request);
+}
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java?view=diff&rev=513717&r1=513716&r2=513717
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java Fri Mar 2 03:53:57 2007
@@ -1,54 +1,54 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.tiles.locale.impl;
-
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.taglib.ComponentConstants;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DefaultLocaleResolver implements LocaleResolver {
-
- public void init(Map<String, String> params)
- throws TilesException {
- // Does nothing.
- }
-
- public Locale resolveLocale(TilesRequestContext request) {
- Locale retValue = null;
- Map session = request.getSessionScope();
- if (session != null) {
- retValue = (Locale) session.get(ComponentConstants.LOCALE_KEY);
- }
- if (retValue == null) {
- retValue = request.getRequestLocale();
- }
-
- return retValue;
- }
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.tiles.locale.impl;
+
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.tiles.TilesException;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.taglib.ComponentConstants;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DefaultLocaleResolver implements LocaleResolver {
+
+ public void init(Map<String, String> params)
+ throws TilesException {
+ // Does nothing.
+ }
+
+ public Locale resolveLocale(TilesRequestContext request) {
+ Locale retValue = null;
+ Map session = request.getSessionScope();
+ if (session != null) {
+ retValue = (Locale) session.get(ComponentConstants.LOCALE_KEY);
+ }
+ if (retValue == null) {
+ retValue = request.getRequestLocale();
+ }
+
+ return retValue;
+ }
+}
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL