From 467484c3e974f9ff6a05d4a44bddd1ebe62b8bb9 Mon Sep 17 00:00:00 2001
From: Julian Hyde <julianhyde@gmail.com>
Date: Wed, 9 Jan 2008 08:34:03 +0000
Subject: [PATCH] Enable keyword substitution for some source files.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@58 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 src/org/olap4j/impl/Olap4jUtil.java                |  2 +-
 src/org/olap4j/impl/Olap4jUtilCompatible.java      |  4 ++--
 src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java | 11 +++--------
 src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java | 10 +++++-----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/org/olap4j/impl/Olap4jUtil.java b/src/org/olap4j/impl/Olap4jUtil.java
index f92563e..9273ec0 100644
--- a/src/org/olap4j/impl/Olap4jUtil.java
+++ b/src/org/olap4j/impl/Olap4jUtil.java
@@ -26,7 +26,7 @@
  * to use classes in this package, but not writers of applications.</p>
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Dec 12, 2007
  */
 public class Olap4jUtil {
diff --git a/src/org/olap4j/impl/Olap4jUtilCompatible.java b/src/org/olap4j/impl/Olap4jUtilCompatible.java
index 45b1a46..adf889c 100644
--- a/src/org/olap4j/impl/Olap4jUtilCompatible.java
+++ b/src/org/olap4j/impl/Olap4jUtilCompatible.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/mondrian/util/UtilCompatible.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -23,7 +23,7 @@
  * which have different implementations in different environments.</p>
  *
  * @author jhyde
- * @version $Id: //open/mondrian/src/main/mondrian/util/UtilCompatible.java#3 $
+ * @version $Id$
  * @since Feb 5, 2007
  */
 public interface Olap4jUtilCompatible {
diff --git a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java
index eda6e03..90f5c9f 100644
--- a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java
+++ b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk14.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/mondrian/util/UtilCompatibleJdk14.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -10,16 +10,11 @@
 package org.olap4j.impl;
 
 /**
- * Implementation of {@link mondrian.util.UtilCompatible} which runs in
+ * Implementation of {@link Olap4jUtilCompatible} which runs in
  * JDK 1.4.
  *
- * <p>The code uses JDK 1.5 constructs such as generics and for-each loops,
- * but retroweaver can convert these. It does not use
- * <code>java.util.EnumSet</code>, which is important, because retroweaver has
- * trouble with this.
- *
  * @author jhyde
- * @version $Id: //open/mondrian/src/main/mondrian/util/UtilCompatibleJdk14.java#3 $
+ * @version $Id$
  * @since Feb 5, 2007
  */
 public class Olap4jUtilCompatibleJdk14 implements Olap4jUtilCompatible {
diff --git a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java
index bdd37b8..4493060 100644
--- a/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java
+++ b/src/org/olap4j/impl/Olap4jUtilCompatibleJdk15.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/mondrian/util/UtilCompatibleJdk15.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -12,15 +12,15 @@
 import java.util.regex.Pattern;
 
 /**
- * Implementation of {@link mondrian.util.UtilCompatible} which runs in
- * JDK 1.5.
+ * Implementation of {@link Olap4jUtilCompatible} which runs in
+ * JDK 1.5 and later.
  *
  * <p>Prior to JDK 1.5, this class should never be loaded. Applications should
  * instantiate this class via {@link Class#forName(String)} or better, use
- * methods in {@link mondrian.olap.Util}, and not instantiate it at all.
+ * methods in {@link Olap4jUtil}, and not instantiate it at all.
  *
  * @author jhyde
- * @version $Id: //open/mondrian/src/main/mondrian/util/UtilCompatibleJdk15.java#3 $
+ * @version $Id$
  * @since Feb 5, 2007
  */
 public class Olap4jUtilCompatibleJdk15 implements Olap4jUtilCompatible {