[jsword-svn] common/java/core/org/crosswire/common/activate s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/common/java/core/org/crosswire/common/activate
In directory www.crosswire.org:/tmp/cvs-serv10693/java/core/org/crosswire/common/activate

Modified Files:
	Activator.java 
Log Message:
Made Book the primary interface to a module and put BookMetaData within it. All of BookMetaData is accessible through the Book interface.

Index: Activator.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/activate/Activator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Activator.java	16 Aug 2004 22:07:35 -0000	1.2
--- Activator.java	19 Mar 2005 01:57:01 -0000	1.3
***************
*** 49,53 ****
      public static void activate(Activatable subject)
      {
!         if (!activated.contains(subject))
          {
              subject.activate(lock);
--- 49,53 ----
      public static void activate(Activatable subject)
      {
!         if (!activated.contains(subject) && subject != null)
          {
              subject.activate(lock);
***************
*** 109,113 ****
      public static void deactivate(Activatable subject)
      {
!         if (activated.contains(subject))
          {
              subject.deactivate(lock);
--- 109,113 ----
      public static void deactivate(Activatable subject)
      {
!         if (activated.contains(subject) && subject != null)
          {
              subject.deactivate(lock);