remm 01/09/23 18:44:35
Modified: src/share/org/apache/slide/common Domain.java
EmbeddedDomain.java
Log:
- Add compatibility code to allow to expose the embedded domain through
the static domain.
Revision Changes Path
1.30 +34 -6 jakarta-slide/src/share/org/apache/slide/common/Domain.java
Index: Domain.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Domain.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Domain.java 2001/08/29 13:03:16 1.29
+++ Domain.java 2001/09/24 01:44:35 1.30
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Domain.java,v
1.29 2001/08/29 13:03:16 juergen Exp $
- * $Revision: 1.29 $
- * $Date: 2001/08/29 13:03:16 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Domain.java,v
1.30 2001/09/24 01:44:35 remm Exp $
+ * $Revision: 1.30 $
+ * $Date: 2001/09/24 01:44:35 $
*
* ====================================================================
*
@@ -91,16 +91,27 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.29 $
+ * @version $Revision: 1.30 $
*/
public final class Domain {
-
+
+
+ // -------------------------------------------------------------- Constants
+
+
private final static String LOG_CHANNEL = Domain.class.getName();
+
// ----------------------------------------------------- Instance Variables
/**
+ * Compatibility with the new embedded domain.
+ */
+ private static EmbeddedDomain domain;
+
+
+ /**
* Namespaces hashtable.
*/
private static Hashtable namespaces;
@@ -134,7 +145,7 @@
*/
public static boolean isInitialized() {
- return (namespaces != null);
+ return ((domain != null) || (namespaces != null));
}
@@ -171,6 +182,9 @@
if (!isInitialized())
selfInit();
+ if (domain != null)
+ return domain.getDefaultNamespace();
+
return defaultNamespace;
}
@@ -189,6 +203,9 @@
if (!isInitialized())
selfInit();
+ if (domain != null)
+ return domain.getNamespaceToken(namespaceName);
+
Namespace namespace = (Namespace) namespaces.get(namespaceName);
if (namespace == null)
return null;
@@ -206,6 +223,9 @@
if (!isInitialized())
return (new Vector()).elements();
+ if (domain != null)
+ return domain.enumerateNamespaces();
+
return (namespaces.keys());
}
@@ -521,6 +541,14 @@
// -------------------------------------------------------- Package Methods
+
+
+ /**
+ * Set the embedded domain field.
+ */
+ static void setDomain(EmbeddedDomain domain) {
+ Domain.domain = domain;
+ }
/**
1.3 +19 -4
jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java
Index: EmbeddedDomain.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmbeddedDomain.java 2001/09/08 19:45:45 1.2
+++ EmbeddedDomain.java 2001/09/24 01:44:35 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java,v 1.2
2001/09/08 19:45:45 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/09/08 19:45:45 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java,v 1.3
2001/09/24 01:44:35 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/09/24 01:44:35 $
*
* ====================================================================
*
@@ -75,9 +75,24 @@
* Alternate domain designed to ease embedding.
*
* @author Remy Maucherat
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class EmbeddedDomain {
+
+
+ // ------------------------------------------------------------ Constructor
+
+
+ /**
+ * Default constructor.
+ */
+ public EmbeddedDomain() {
+
+ // Compatibility with the static domain
+ if (!Domain.isInitialized())
+ Domain.setDomain(this);
+
+ }
// ----------------------------------------------------- Instance Variables
